Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-metrics Commit: 5a40c5dd956f5528882ba89250c2f9c84cbdeb4d https://github.com/hawkular/hawkular-metrics/commit/5a40c5dd956f5528882ba... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-20 (Fri, 20 Jan 2017) Changed paths: M core/metrics-core-service/pom.xml A core/metrics-core-service/src/main/antlr4/org/hawkular/metrics/core/service/tags/parser/TagQuery.g4 A core/metrics-core-service/src/main/java/TagQuery.tokens A core/metrics-core-service/src/main/java/TagQueryLexer.tokens A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/ExpressionTagQueryParser.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryBaseListener.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryBaseVisitor.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryLexer.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryListener.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryParser.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryVisitor.java A core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/ExpressionTagQueryITest.java M pom.xml Log Message: ----------- [HWKMETRICS-523] Add a new query syntax for tags, this includes a lexer + parser and query result aggregation. Commit: ece2e14c7e59f9f5c176a72c4dcf5b9f1602f96f https://github.com/hawkular/hawkular-metrics/commit/ece2e14c7e59f9f5c176a... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-20 (Fri, 20 Jan 2017) Changed paths: M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/MetricsServiceImpl.java R core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/TagQueryParser.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/SimpleTagQueryParser.java Log Message: ----------- [HWKMETRICS-523] Relocate the original tag parser to the new generic tag package. Commit: 98adbc8926f28043d25ca5b40ea2fbff7a75dc14 https://github.com/hawkular/hawkular-metrics/commit/98adbc8926f28043d25ca... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-20 (Fri, 20 Jan 2017) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/AggregatedStatsQueryRequest.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/QueryRequest.java 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/CounterHandler.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/MetricsServiceHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/StringHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/template/IMetricsHandler.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 Log Message: ----------- [HWKMETRICS-523] Connect the new expression tag query parser to the REST API. Commit: 0272d657cdd3c003379043e0b181294deb93f738 https://github.com/hawkular/hawkular-metrics/commit/0272d657cdd3c00337904... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-20 (Fri, 20 Jan 2017) Changed paths: M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/ExpressionTagQueryParser.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/ExpressionTagQueryITest.java Log Message: ----------- [HWKMETRICS-523] Handle situations where an expression might appear multiple times in the expression tree. Commit: ab72fcb37806d7b3d21994cfb322786394b6aff0 https://github.com/hawkular/hawkular-metrics/commit/ab72fcb37806d7b3d2199... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-20 (Fri, 20 Jan 2017) Changed paths: M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/ExpressionTagQueryParser.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/ExpressionTagQueryITest.java A integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/ExpressionTagsQueryITest.groovy Log Message: ----------- [HWKMETRICS-523] Add integration tests for the REST API. Also correct the OR operator to only take distinct values from the two sets of observables. Commit: 1ad2153725a88b1b64e611dbabc95ac59b0e86ed https://github.com/hawkular/hawkular-metrics/commit/1ad2153725a88b1b64e61... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-20 (Fri, 20 Jan 2017) Changed paths: M core/metrics-core-service/src/main/antlr4/org/hawkular/metrics/core/service/tags/parser/TagQuery.g4 M core/metrics-core-service/src/main/java/TagQuery.tokens M core/metrics-core-service/src/main/java/TagQueryLexer.tokens M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryLexer.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryParser.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/ExpressionTagQueryITest.java A integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/ExpressionTagQueryITest.groovy R integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/ExpressionTagsQueryITest.groovy Log Message: ----------- [HWKMETRICS-523] Update boolean (== to =) and array operators (NIN to NOTIN). Commit: 2cdad567ae7a9a6ef4a2aefb1023a6a7ad55e8a1 https://github.com/hawkular/hawkular-metrics/commit/2cdad567ae7a9a6ef4a2a... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-20 (Fri, 20 Jan 2017) Changed paths: M core/metrics-core-service/src/main/antlr4/org/hawkular/metrics/core/service/tags/parser/TagQuery.g4 M core/metrics-core-service/src/main/java/TagQuery.tokens M core/metrics-core-service/src/main/java/TagQueryLexer.tokens M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/ExpressionTagQueryParser.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryBaseListener.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryBaseVisitor.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryLexer.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryListener.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryParser.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryVisitor.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/ExpressionTagQueryITest.java M integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/ExpressionTagQueryITest.groovy Log Message: ----------- [HWKMETRICS-523] The expression now supports non-quoted text for simple tag value matching. Complex regex expressions are still required to be enclosed in single quotes. Also, query for the actual metric definitions only when the result is returned by the users. Use metric id definition up to that point. Commit: 35d82e949061eed84d82429916a72498e4da99a9 https://github.com/hawkular/hawkular-metrics/commit/35d82e949061eed84d824... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-20 (Fri, 20 Jan 2017) Changed paths: M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/ExpressionTagQueryITest.java M integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/ExpressionTagQueryITest.groovy Log Message: ----------- [HWKMETRICS-523] Change tests to avoid confusion due to integer as tag values. Commit: 90baec180b9d7270d94039141194627701bab8e4 https://github.com/hawkular/hawkular-metrics/commit/90baec180b9d7270d9403... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-24 (Tue, 24 Jan 2017) Changed paths: M core/metrics-core-service/src/main/antlr4/org/hawkular/metrics/core/service/tags/parser/TagQuery.g4 M core/metrics-core-service/src/main/java/TagQuery.tokens M core/metrics-core-service/src/main/java/TagQueryLexer.tokens M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/ExpressionTagQueryParser.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryLexer.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryParser.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/ExpressionTagQueryITest.java M integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/ExpressionTagQueryITest.groovy Log Message: ----------- [HWKMETRICS-523] Split NOTIN operator into two tokens to allow usage of the NOT operator for other purposes. Commit: 933ec5c33bddb5919ea8461f66a227625bf20920 https://github.com/hawkular/hawkular-metrics/commit/933ec5c33bddb5919ea84... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-24 (Tue, 24 Jan 2017) Changed paths: M core/metrics-core-service/src/main/antlr4/org/hawkular/metrics/core/service/tags/parser/TagQuery.g4 M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/ExpressionTagQueryParser.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryBaseListener.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryBaseVisitor.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryListener.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryParser.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryVisitor.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/transformers/MetricIdFromMetricIndexRowTransformer.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/ExpressionTagQueryITest.java Log Message: ----------- [HWKMETRICS-523] Add tag exists and not exists expression syntax and resolution. Also, avoid complex set operations by using just the distinct operator on the observable set. Commit: 0de9608dec391ede82be3883884b0dca29c89032 https://github.com/hawkular/hawkular-metrics/commit/0de9608dec391ede82be3... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-30 (Mon, 30 Jan 2017) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/AggregatedStatsQueryRequest.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/QueryRequest.java 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/CounterHandler.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/MetricsServiceHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/StringHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/template/IMetricsHandler.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/tags/ExpressionTagQueryParser.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/TagsConverter.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/ExpressionTagQueryITest.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/TagsITest.java M integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/ExpressionTagQueryITest.groovy Log Message: ----------- [HWKMETRICS-523] Use the same parameter for both new and old tag query syntax. The two syntaxes are so different that there is no overlap. The new code will try to interpret all the taq queries using the new syntax, then fallback to the old syntax in case of an error. Commit: a78a0075669d9f38734fc3c3401b94a179d7ba3e https://github.com/hawkular/hawkular-metrics/commit/a78a0075669d9f38734fc... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2017-01-31 (Tue, 31 Jan 2017) Changed paths: M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/ExpressionTagQueryParser.java M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/SimpleTagQueryParser.java R core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/transformers/TagsIndexRowTransformer.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/transformers/TagsIndexRowTransformerFilter.java M integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/ExpressionTagQueryITest.groovy Log Message: ----------- [HWKMETRICS-523] A minor refactoring to clarify the purpose of a class. And re-add some commented out test code. Commit: 90b7ea16ebcfb254913a2bdea978575e0446b77f https://github.com/hawkular/hawkular-metrics/commit/90b7ea16ebcfb254913a2... Author: jsanda <jsanda(a)redhat.com&gt; Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/AggregatedStatsQueryRequest.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/QueryRequest.java 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/CounterHandler.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/MetricsServiceHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/StringHandler.java M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/template/IMetricsHandler.java M core/metrics-core-service/pom.xml A core/metrics-core-service/src/main/antlr4/org/hawkular/metrics/core/service/tags/parser/TagQuery.g4 A core/metrics-core-service/src/main/java/TagQuery.tokens A core/metrics-core-service/src/main/java/TagQueryLexer.tokens 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 R core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/TagQueryParser.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/ExpressionTagQueryParser.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/SimpleTagQueryParser.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/TagsConverter.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryBaseListener.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryBaseVisitor.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryLexer.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryListener.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryParser.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryVisitor.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/transformers/MetricIdFromMetricIndexRowTransformer.java R core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/transformers/TagsIndexRowTransformer.java A core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/transformers/TagsIndexRowTransformerFilter.java M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/CounterITest.java A core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/ExpressionTagQueryITest.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/TagsITest.java A integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/ExpressionTagQueryITest.groovy M pom.xml Log Message: ----------- Merge pull request #725 from hawkular/HWKMETRICS-523_2 [HWKMETRICS-523] Implement expressions for tag queries Compare: https://github.com/hawkular/hawkular-metrics/compare/1d8c1605760f...90b7e...