[Hawkular-commits] [hawkular/hawkular-metrics] 18e790: HWKMETRICS-429 Let ptrans connect to Hawkular-Serv...

Branch: refs/heads/master Home: https://github.com/hawkular/hawkular-metrics Commit: 18e7909fda3cfcfd81c5f64fb8616d4d393c1d57 https://github.com/hawkular/hawkular-metrics/commit/18e7909fda3cfcfd81c5f... Author: Thomas Segismont <tsegismo(a)redhat.com&gt; Date: 2016-07-11 (Mon, 11 Jul 2016) Changed paths: M clients/ptranslator/pom.xml M clients/ptranslator/ptrans.conf R clients/ptranslator/src/assembly/all/assembly.xml M clients/ptranslator/src/assembly/dist/assets/ptrans.conf M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/Configuration.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/ConfigurationKey.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/Main.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/PTrans.java R clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/ServerType.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/backend/Constants.java R clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/backend/MetricsSender.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/backend/NettyToVertxHandler.java A clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/backend/SingleMetricConverter.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/collectd/CollectdServer.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/graphite/GraphiteServer.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/PTransTest.java R clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/backend/MetricsSenderITest.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/data/ServerDataHelper.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/exec/ConfigurationITest.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/exec/OpenedPortsITest.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/CollectdITest.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/FullStackITest.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/GraphiteITest.java M clients/ptranslator/src/test/resources/ptrans.conf M data-generator/pom.xml M integration-tests/jmh-benchmark/pom.xml M pom.xml Log Message: ----------- HWKMETRICS-429 Let ptrans connect to Hawkular-Services and Openshift-Metrics Since Vert.x Hawkular Metrics already knows how to connect to the backend, there is no point in maintaining the same kind of functionality in ptrans. So now the protocol servers send json to the event bus, and the Vert.x Metrics SPI impl will take care of forwarding the datapoints. Note that since Vert.x 3.3.0, the SPI impl knows how to connect to standalone Metrics, old Hawkular servers, Hawkular Services and Openshift-Metrics. So we only have to configure it properly. Also, use Maven Shade Plugin to create the fat JAR Assembly plugin is not recommended for this usage (because, among other things, you can't control the output in case of conflicts) Commit: 180140cc1e0b962ee83269ebdd1c67d189a2e187 https://github.com/hawkular/hawkular-metrics/commit/180140cc1e0b962ee8326... Author: Stefan Negrea <snegrea(a)redhat.com&gt; Date: 2016-07-11 (Mon, 11 Jul 2016) Changed paths: M clients/ptranslator/pom.xml M clients/ptranslator/ptrans.conf R clients/ptranslator/src/assembly/all/assembly.xml M clients/ptranslator/src/assembly/dist/assets/ptrans.conf M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/Configuration.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/ConfigurationKey.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/Main.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/PTrans.java R clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/ServerType.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/backend/Constants.java R clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/backend/MetricsSender.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/backend/NettyToVertxHandler.java A clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/backend/SingleMetricConverter.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/collectd/CollectdServer.java M clients/ptranslator/src/main/java/org/hawkular/metrics/clients/ptrans/graphite/GraphiteServer.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/PTransTest.java R clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/backend/MetricsSenderITest.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/data/ServerDataHelper.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/exec/ConfigurationITest.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/exec/OpenedPortsITest.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/CollectdITest.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/FullStackITest.java M clients/ptranslator/src/test/java/org/hawkular/metrics/clients/ptrans/fullstack/GraphiteITest.java M clients/ptranslator/src/test/resources/ptrans.conf M data-generator/pom.xml M integration-tests/jmh-benchmark/pom.xml M pom.xml Log Message: ----------- Merge pull request #529 from tsegismont/jira/HWKMETRICS-429 HWKMETRICS-429 Let ptrans connect to Hawkular-Services and Openshift-Metrics Compare: https://github.com/hawkular/hawkular-metrics/compare/a72334d8591c...18014...