[Hawkular-commits] [hawkular/hawkular-metrics] 9135f3: This is a combination of 12 commits.

[jsanda]

  Branch: refs/heads/master
  Home:   https://github.com/hawkular/hawkular-metrics
  Commit: 9135f3c3ed8e01f78327dc36f3b4de26d91e41ea
      https://github.com/hawkular/hawkular-metrics/commit/9135f3c3ed8e01f78327dc36f3b4de26d91e41ea
  Author: Thomas Segismont <tsegismo at redhat.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M api/metrics-api-jaxrs/src/main/antlr4/org/hawkular/metrics/api/jaxrs/influx/query/parse/InfluxQuery.g4
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxObject.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/prettyprint/PrettyFilter.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/prettyprint/PrettyInterceptor.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/query/parse/definition/SelectQueryDefinitionsParser.java
    M api/metrics-api-jaxrs/src/test/resources/influx/query/supported-select-queries.iql
    M api/metrics-api-jaxrs/src/test/resources/influx/query/syntactically-correct-queries.iql
    M clients/ptranslator/log4j-dev.xml
    M rest-tests/src/test/groovy/org/hawkular/metrics/rest/InfluxITest.groovy
    M rest-tests/src/test/java/org/hawkular/metrics/test/InfluxDBTest.java
    M rest-tests/src/test/java/org/hawkular/metrics/test/InfluxDatabaseITest.java

  Log Message:
  -----------
  This is a combination of 12 commits.

The first commit's message is:

Catch parse exception so that a proper response can be built

This is the 2nd commit message:

Use plain text error messages as Influx does

This is the 3rd commit message:

Import changes from rx-migration branch to ease future merge

This is the 4th commit message:

Fixed list series output bug

Also, make sure Influx tests never fail because of data conflict (user distinct tenantId/dbName)

This is the 5th commit message:

Import changes from rx-migration branch to ease future merge

This is the 6th commit message:

Fix PrettyInterceptor: InfluxHandler may have changed the media type

This is the 7th commit message:

Support absolute moment operands in queries. For example:

select * from test where time > 1501560s and time < 4560546h

It's like using a date operand, but with timestamps.

This is the 8th commit message:

Change ptrans log level in development config file

This is the 9th commit message:

Add empty collections/arrays to JSON output

This is the 10th commit message:

Minor change in "pretty" filter and interceptor

This is the 11th commit message:

Checkstyle fixes

This is the 12th commit message:

Revert change in JacksonConfig to avoid failing itests

But configure InfluxObject explicitly to include empty points collection in JSON output


  Commit: 50a0fb8815bf40c0760e3fefb91f21512fdddb9f
      https://github.com/hawkular/hawkular-metrics/commit/50a0fb8815bf40c0760e3fefb91f21512fdddb9f
  Author: jsanda <jsanda at redhat.com>
  Date:   2015-05-20 (Wed, 20 May 2015)

  Changed paths:
    M api/metrics-api-jaxrs/src/main/antlr4/org/hawkular/metrics/api/jaxrs/influx/query/parse/InfluxQuery.g4
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxObject.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/InfluxSeriesHandler.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/prettyprint/PrettyFilter.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/prettyprint/PrettyInterceptor.java
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/influx/query/parse/definition/SelectQueryDefinitionsParser.java
    M api/metrics-api-jaxrs/src/test/resources/influx/query/supported-select-queries.iql
    M api/metrics-api-jaxrs/src/test/resources/influx/query/syntactically-correct-queries.iql
    M clients/ptranslator/log4j-dev.xml
    M rest-tests/src/test/groovy/org/hawkular/metrics/rest/InfluxITest.groovy
    M rest-tests/src/test/java/org/hawkular/metrics/test/InfluxDBTest.java
    M rest-tests/src/test/java/org/hawkular/metrics/test/InfluxDatabaseITest.java

  Log Message:
  -----------
  Merge pull request #220 from tsegismont/grafana_testing

Updates after Grafana integration testing


Compare: https://github.com/hawkular/hawkular-metrics/compare/e968baad0359...50a0fb8815bf