Merge branch 'NIFI-790-NEW'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a264c49d Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a264c49d Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a264c49d Branch: refs/heads/master Commit: a264c49d80a5c967bcb5d03677bbd36c4c1e6d49 Parents: ffa7ceb 1c34478 Author: Bryan Bende <[email protected]> Authored: Mon Aug 17 17:33:26 2015 -0400 Committer: Bryan Bende <[email protected]> Committed: Mon Aug 17 17:33:26 2015 -0400 ---------------------------------------------------------------------- nifi-assembly/NOTICE | 14 ++ nifi-assembly/pom.xml | 5 + .../nifi-ambari-bundle/nifi-ambari-nar/pom.xml | 33 ++++ .../src/main/resources/META-INF/NOTICE | 46 ++++++ .../nifi-ambari-reporting-task/pom.xml | 71 +++++++++ .../reporting/ambari/AmbariReportingTask.java | 151 +++++++++++++++++++ .../reporting/ambari/api/MetricBuilder.java | 84 +++++++++++ .../nifi/reporting/ambari/api/MetricFields.java | 29 ++++ .../reporting/ambari/api/MetricsBuilder.java | 93 ++++++++++++ .../reporting/ambari/metrics/MetricNames.java | 51 +++++++ .../ambari/metrics/MetricsService.java | 115 ++++++++++++++ .../org.apache.nifi.reporting.ReportingTask | 15 ++ .../additionalDetails.html | 57 +++++++ .../ambari/TestAmbariReportingTask.java | 139 +++++++++++++++++ .../ambari/api/TestMetricsBuilder.java | 74 +++++++++ .../ambari/metrics/TestMetricsService.java | 96 ++++++++++++ nifi-nar-bundles/nifi-ambari-bundle/pom.xml | 41 +++++ nifi-nar-bundles/pom.xml | 1 + pom.xml | 14 +- 19 files changed, 1128 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
