4:37 p.m.
Branch: refs/heads/HWKMETRICS-523
Home: https://github.com/hawkular/hawkular-metrics
Commit: 9ffa83a388635f8e49ac6c82547bc9cdabf3c896
https://github.com/hawkular/hawkular-metrics/commit/9ffa83a388635f8e49ac6...
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: 2016-12-15 (Thu, 15 Dec 2016)
Changed paths:
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricsServiceHandler.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/param/TagsConverter.java
M
api/metrics-api-jaxrs/src/test/java/org/hawkular/metrics/api/jaxrs/param/TagsConverterTest.java
M
core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/JsonTagQueryParser.java
M
core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/MetricsService.java
M
core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/MetricsServiceImpl.java
M
core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/SimpleTagQueryParser.java
M
core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/transformers/TaggedBucketPointTransformer.java
M
core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/BaseITest.java
M
core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/CounterITest.java
M
core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/GaugeITest.java
M
core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/JsonTagsITest.java
M
core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/TagsITest.java
M core/metrics-model/src/main/java/org/hawkular/metrics/model/param/Tags.java
M
integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/JsonTagsITest.groovy
Log Message:
-----------
[HWKMETRICS-523] The comma (,) is an and operator, if both regex and JsonPath tag query
expressions are sent then take the intersection of both sets and return only metrics that
match all tag queries.
Also, allow a tag key to be sent multiple times in the tag query. This allows splitting
complex large tag queries for a single key/value pair to be broken into smaller
expressions.