[Hawkular-commits] [hawkular/hawkular-metrics] 15904f: [HWKMETRICS-113] Introduce Metric and DataPoint in...
Thomas Segismont
tsegismo at redhat.com
Tue Jun 9 09:50:03 EDT 2015
Branch: refs/heads/master
Home: https://github.com/hawkular/hawkular-metrics
Commit: 15904fb8449546b12923f39721c4d89189eb57e2
https://github.com/hawkular/hawkular-metrics/commit/15904fb8449546b12923f39721c4d89189eb57e2
Author: John Sanda <jsanda at redhat.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/AvailabilityMetric.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/GaugeMetric.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MixedMetricsRequest.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Availability.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityData.java
A core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityDataPoint.java
A core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/DataPoint.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Gauge.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeData.java
A core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeDataPoint.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Metric.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricData.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/AvailabilityBucketedOutputMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/BucketedOutputMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccess.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/Functions.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GaugeAndTTL.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GaugeBucketedOutputMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GaugeDataMapper.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricImpl.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsIndexMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TTLDataPoint.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedAvailabilityDataPointMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedAvailabilityMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedGaugeDataMapper.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedGaugeDataPointMapper.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/AvailabilityBucketedOutputMapperTest.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DataAccessITest.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DelegatingDataAccess.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy
M rest-tests/src/test/groovy/org/hawkular/metrics/rest/TagsITest.groovy
Log Message:
-----------
[HWKMETRICS-113] Introduce Metric and DataPoint interfaces
This commit remove the Metric and MetricData class hierarchies.
There is still refactoring/clean up to do, but this gets rid of those classes
and has all tests passing.
Commit: 6f2a5e9d38e059334bcc9cadc8a0102fdd2e785d
https://github.com/hawkular/hawkular-metrics/commit/6f2a5e9d38e059334bcc9cadc8a0102fdd2e785d
Author: John Sanda <jsanda at redhat.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/GaugeMetric.java
M core/metrics-core-api/pom.xml
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/DataType.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Metric.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricData.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Tag.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/TimeUUIDUtils.java
M core/metrics-core-impl/pom.xml
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/BucketedOutputMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/ComputeTTL.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TimeUUIDUtils.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
Log Message:
-----------
[HWKMETRICS-113] more clean up
Removing legacy class MetricData and moving TimeUUIDUtils into core-impl.
Commit: b93c516b89713a1a93625a00d8c3884882001300
https://github.com/hawkular/hawkular-metrics/commit/b93c516b89713a1a93625a00d8c3884882001300
Author: John Sanda <jsanda at redhat.com>
Date: 2015-06-01 (Mon, 01 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/DataPoint.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeDataPoint.java
Log Message:
-----------
[HWKMETRICS-113] more clean up, checkstyle fix
Commit: c2a4b768eb23afc1f9d953049ac907581378bc65
https://github.com/hawkular/hawkular-metrics/commit/c2a4b768eb23afc1f9d953049ac907581378bc65
Author: John Sanda <jsanda at redhat.com>
Date: 2015-06-02 (Tue, 02 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityDataPoint.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeDataPoint.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TTLDataPoint.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy
Log Message:
-----------
[HWKMETRICS-113] some more clean up based on review
Commit: 13cfcf3006491e321932a1c629faaebd253910cb
https://github.com/hawkular/hawkular-metrics/commit/13cfcf3006491e321932a1c629faaebd253910cb
Author: John Sanda <jsanda at redhat.com>
Date: 2015-06-03 (Wed, 03 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/Availability.java
R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/AvailabilityMetric.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/Gauge.java
R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/GaugeMetric.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/MetricDefinition.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MixedMetricsRequest.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/AvailabilityDataPointMixin.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/GaugeDataPointMixin.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/JacksonConfig.java
A api/metrics-api-jaxrs/src/main/resources/results.json
M core/metrics-core-api/pom.xml
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityDataPoint.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeDataPoint.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Metric.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricId.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/AvailabilityBucketedOutputMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/BucketedOutputMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccess.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricImpl.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedAvailabilityDataPointMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedGaugeDataPointMapper.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DataAccessITest.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DelegatingDataAccess.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy
Log Message:
-----------
[HWKMETRICS-113] remove jackson deps from core-api and make Metric concrete
Jackson depends are now gone from metrics-core and are only in the REST API. I
also decided to change Metric from an interface to a concrete type. I am not
sure that there is much to be gained from having it as an interface.
Commit: b350474022b59b3323d6cc978776ff9dbc8606bb
https://github.com/hawkular/hawkular-metrics/commit/b350474022b59b3323d6cc978776ff9dbc8606bb
Author: John Sanda <jsanda at redhat.com>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
Log Message:
-----------
return 400 when there is no data and fix checkstyle error
Commit: 7f4a889c46b5eb42119d5c9aae05a19e33f2a0ac
https://github.com/hawkular/hawkular-metrics/commit/7f4a889c46b5eb42119d5c9aae05a19e33f2a0ac
Author: John Sanda <jsanda at redhat.com>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
Log Message:
-----------
update api docs
Commit: 8937d3efa9ccba3901784b48cfa1cce418690d7f
https://github.com/hawkular/hawkular-metrics/commit/8937d3efa9ccba3901784b48cfa1cce418690d7f
Author: John Sanda <jsanda at redhat.com>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/Availability.java
R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/Gauge.java
R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/MetricDefinition.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/Availability.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/Gauge.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MetricDefinition.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MixedMetricsRequest.java
R api/metrics-api-jaxrs/src/main/resources/results.json
Log Message:
-----------
[HWKMETRICS-113] move classes into request package and add api docs
Commit: f51fc91c24a34afba9096a8e081bfb98cad887a7
https://github.com/hawkular/hawkular-metrics/commit/f51fc91c24a34afba9096a8e081bfb98cad887a7
Author: John Sanda <jsanda at redhat.com>
Date: 2015-06-04 (Thu, 04 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/Availability.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/Gauge.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MetricDefinition.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Metric.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricId.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DataAccessITest.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
Log Message:
-----------
[HWKMETRICS-113] make model classes immutable
Commit: 7c10fb48bca2077ab4503381a10e742e4a83f5c4
https://github.com/hawkular/hawkular-metrics/commit/7c10fb48bca2077ab4503381a10e742e4a83f5c4
Author: John Sanda <jsanda at redhat.com>
Date: 2015-06-07 (Sun, 07 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/TenantsHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/Availability.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/TenantParam.java
M core/metrics-core-api/pom.xml
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityBucketDataPoint.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityType.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeBucketDataPoint.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Tenant.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/Functions.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DataAccessITest.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
Log Message:
-----------
[HWKMETRICS-113] removing jackson and swagger deps from core
It turns out that we were still pulling in jackson transitively from
swagger-core. There were still some jackson annotation in AvailabilityType and
in Tenant that had to be dealt with.
I have removed the swagger annotations from classes in core-api because the
documentation was not generated any way. I will see if I can address that in
subsequent commits, or it may need to be done under a separate ticket.
Commit: 8022f70e146b57f924746f194ef8e672e62d8479
https://github.com/hawkular/hawkular-metrics/commit/8022f70e146b57f924746f194ef8e672e62d8479
Author: John Sanda <jsanda at redhat.com>
Date: 2015-06-08 (Mon, 08 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/Availability.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/AvailabilityDataPoint.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/Gauge.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/GaugeDataPoint.java
R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/Availability.java
R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/Gauge.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MixedMetricsRequest.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/ApiUtils.java
R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/AvailabilityDataPointMixin.java
R api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/GaugeDataPointMixin.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/JacksonConfig.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityDataPoint.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/DataPoint.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeDataPoint.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Metric.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/AvailabilityBucketedOutputMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/BucketedOutputMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccess.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/Functions.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GaugeAndTTL.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GaugeBucketedOutputMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TTLDataPoint.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedAvailabilityDataPointMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedGaugeDataPointMapper.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/AvailabilityBucketedOutputMapperTest.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DataAccessITest.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DelegatingDataAccess.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
Log Message:
-----------
[HWKMETRICS-113] make DataPoint a concrete class instead of an interface
This commit also moves what was formerly GaugeDataPoint and
AvailabilityDataPoint to the jax-rs module and adds swagger docs for them.
Commit: 82a624e1a64f92b886d8d76c066dab5646467657
https://github.com/hawkular/hawkular-metrics/commit/82a624e1a64f92b886d8d76c066dab5646467657
Author: Thomas Segismont <tsegismo at redhat.com>
Date: 2015-06-09 (Tue, 09 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/TenantsHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/Availability.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/AvailabilityDataPoint.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/Gauge.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/GaugeDataPoint.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MetricDefinition.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MixedMetricsRequest.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/TenantParam.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/ApiUtils.java
M core/metrics-core-api/pom.xml
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Availability.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityBucketDataPoint.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityData.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityType.java
A core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/DataPoint.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/DataType.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Gauge.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeBucketDataPoint.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeData.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Metric.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricData.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricId.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Tag.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Tenant.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/TimeUUIDUtils.java
M core/metrics-core-impl/pom.xml
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/AvailabilityBucketedOutputMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/BucketedOutputMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/ComputeTTL.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccess.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/Functions.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GaugeAndTTL.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GaugeBucketedOutputMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GaugeDataMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsIndexMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TTLDataPoint.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedAvailabilityDataPointMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedAvailabilityMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedGaugeDataMapper.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedGaugeDataPointMapper.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TimeUUIDUtils.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/AvailabilityBucketedOutputMapperTest.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DataAccessITest.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DelegatingDataAccess.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy
M rest-tests/src/test/groovy/org/hawkular/metrics/rest/TagsITest.groovy
Log Message:
-----------
Merge branch 'HWKMETRICS-113' of https://github.com/jsanda/hawkular-metrics into jsanda-HWKMETRICS-113
Conflicts:
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java
core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
Commit: 982c3aaf9fc5cf592c044025b3a63e83b4911af7
https://github.com/hawkular/hawkular-metrics/commit/982c3aaf9fc5cf592c044025b3a63e83b4911af7
Author: Thomas Segismont <tsegismo at redhat.com>
Date: 2015-06-09 (Tue, 09 Jun 2015)
Changed paths:
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/TenantsHandler.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/Availability.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/AvailabilityDataPoint.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/Gauge.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/model/GaugeDataPoint.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MetricDefinition.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/MixedMetricsRequest.java
A api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/request/TenantParam.java
M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/util/ApiUtils.java
M core/metrics-core-api/pom.xml
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Availability.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityBucketDataPoint.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityData.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityType.java
A core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/DataPoint.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/DataType.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Gauge.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeBucketDataPoint.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeData.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Metric.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricData.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricId.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Tag.java
M core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/Tenant.java
R core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/TimeUUIDUtils.java
M core/metrics-core-impl/pom.xml
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/AvailabilityBucketedOutputMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/BucketedOutputMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/ComputeTTL.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccess.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/DataAccessImpl.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/Functions.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GaugeAndTTL.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GaugeBucketedOutputMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/GaugeDataMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsIndexMapper.java
M core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TTLDataPoint.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedAvailabilityDataPointMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedAvailabilityMapper.java
R core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedGaugeDataMapper.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TaggedGaugeDataPointMapper.java
A core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/TimeUUIDUtils.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/AvailabilityBucketedOutputMapperTest.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DataAccessITest.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/DelegatingDataAccess.java
M core/metrics-core-impl/src/test/java/org/hawkular/metrics/core/impl/MetricsServiceITest.java
M rest-tests/src/test/groovy/org/hawkular/metrics/rest/CassandraBackendITest.groovy
M rest-tests/src/test/groovy/org/hawkular/metrics/rest/TagsITest.groovy
Log Message:
-----------
Merge branch 'jsanda-HWKMETRICS-113'
Compare: https://github.com/hawkular/hawkular-metrics/compare/77705777d5dd...982c3aaf9fc5
More information about the hawkular-commits
mailing list