[2/2] nifi git commit: NIFI-4809 - Implement a SiteToSiteMetricsReportingTask

2018-04-11 Thread mattyb149 
NIFI-4809 - Implement a SiteToSiteMetricsReportingTask

Fixed dependency issue by providing a local JSON reader

Rebased + fixed conflict + updated versions in pom + EL scope

Signed-off-by: Matthew Burgess 

This closes #2575


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6fbe1515
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6fbe1515
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6fbe1515

Branch: refs/heads/master
Commit: 6fbe1515eefd2071dc75a1de2c1fc15cc282da76
Parents: ce0855e
Author: Pierre Villard 
Authored: Tue Jan 23 23:15:18 2018 +0100
Committer: Matthew Burgess 
Committed: Wed Apr 11 14:44:30 2018 -0400

--
 .../nifi-ambari-reporting-task/pom.xml  |  15 +-
 .../reporting/ambari/AmbariReportingTask.java   |   4 +-
 .../reporting/ambari/api/MetricBuilder.java |  84 
 .../nifi/reporting/ambari/api/MetricFields.java |  29 --
 .../reporting/ambari/api/MetricsBuilder.java|  93 
 .../reporting/ambari/metrics/MetricNames.java   |  55 ---
 .../ambari/metrics/MetricsService.java  | 131 --
 .../ambari/api/TestMetricsBuilder.java  |   2 +
 .../ambari/metrics/TestMetricsService.java  |   2 +
 .../nifi-reporting-utils/pom.xml|  10 +
 .../reporting/util/metrics/MetricNames.java |  59 +++
 .../reporting/util/metrics/MetricsService.java  | 230 ++
 .../util/metrics/api/MetricBuilder.java |  84 
 .../util/metrics/api/MetricFields.java  |  29 ++
 .../util/metrics/api/MetricsBuilder.java|  93 
 .../nifi-site-to-site-reporting-task/pom.xml|  39 +-
 .../AbstractSiteToSiteReportingTask.java| 420 ++-
 .../SiteToSiteBulletinReportingTask.java|  18 +-
 .../SiteToSiteMetricsReportingTask.java | 222 ++
 .../SiteToSiteProvenanceReportingTask.java  |  28 +-
 .../SiteToSiteStatusReportingTask.java  |  37 +-
 .../org.apache.nifi.reporting.ReportingTask |   3 +-
 .../additionalDetails.html  | 178 
 .../additionalDetails.html  |   2 +-
 .../src/main/resources/schema-metrics.avsc  |  37 ++
 .../TestSiteToSiteMetricsReportingTask.java | 296 +
 26 files changed, 1715 insertions(+), 485 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/6fbe1515/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml 
b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
index dafe829..de024e2 100644
--- a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
@@ -30,21 +30,11 @@
 jersey-client
 
 
-org.glassfish
-javax.json
-1.0.4
-
-
 javax.json
 javax.json-api
 1.0
 
 
-com.yammer.metrics
-metrics-core
-2.2.0
-
-
 org.apache.nifi
 nifi-api
 
@@ -53,6 +43,11 @@
 nifi-utils
 1.7.0-SNAPSHOT
 
+
+org.apache.nifi
+nifi-reporting-utils
+1.7.0-SNAPSHOT
+
 
 
 org.apache.nifi

http://git-wip-us.apache.org/repos/asf/nifi/blob/6fbe1515/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/AmbariReportingTask.java
--
diff --git 
a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/AmbariReportingTask.java
 
b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/AmbariReportingTask.java
index 5bbdecb..0568b3e 100644
--- 
a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/AmbariReportingTask.java
+++ 
b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/AmbariReportingTask.java
@@ -29,8 +29,8 @@ import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.reporting.AbstractReportingTask;
 import org.apache.nifi.reporting.ReportingContext;
-import org.apache.nifi.reporting.ambari.api.MetricsBuilder;
-import org.apache.nifi.reporting.ambari.metrics.MetricsService;
+import

[2/2] nifi git commit: NIFI-4809 - Implement a SiteToSiteMetricsReportingTask

2018-03-15 Thread mattyb149 
NIFI-4809 - Implement a SiteToSiteMetricsReportingTask

address review comments

NIFI-4809 - Added Record Writer property

added unit tests and additional details doc

review comments

Signed-off-by: Matthew Burgess 

This closes #2430


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/930417b9
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/930417b9
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/930417b9

Branch: refs/heads/master
Commit: 930417b9dcabb430df79c683acb9c927aa4f5b8b
Parents: 844da06
Author: Pierre Villard 
Authored: Tue Jan 23 23:15:18 2018 +0100
Committer: Matthew Burgess 
Committed: Thu Mar 15 15:58:31 2018 -0400

--
 .../nifi-ambari-reporting-task/pom.xml  |  15 +-
 .../reporting/ambari/AmbariReportingTask.java   |   4 +-
 .../reporting/ambari/api/MetricBuilder.java |  84 --
 .../nifi/reporting/ambari/api/MetricFields.java |  29 --
 .../reporting/ambari/api/MetricsBuilder.java|  93 --
 .../reporting/ambari/metrics/MetricNames.java   |  55 
 .../ambari/metrics/MetricsService.java  | 131 
 .../ambari/api/TestMetricsBuilder.java  |   2 +
 .../ambari/metrics/TestMetricsService.java  |   2 +
 .../nifi-reporting-utils/pom.xml|  10 +
 .../reporting/util/metrics/MetricNames.java |  59 
 .../reporting/util/metrics/MetricsService.java  | 230 ++
 .../util/metrics/api/MetricBuilder.java |  84 ++
 .../util/metrics/api/MetricFields.java  |  29 ++
 .../util/metrics/api/MetricsBuilder.java|  93 ++
 .../nifi-site-to-site-reporting-task/pom.xml|  40 ++-
 .../AbstractSiteToSiteReportingTask.java| 103 ++-
 .../SiteToSiteBulletinReportingTask.java|  18 +-
 .../SiteToSiteMetricsReportingTask.java | 221 ++
 .../SiteToSiteProvenanceReportingTask.java  |  28 +-
 .../SiteToSiteStatusReportingTask.java  |  37 +--
 .../org.apache.nifi.reporting.ReportingTask |   3 +-
 .../additionalDetails.html  | 178 +++
 .../additionalDetails.html  |   2 +-
 .../src/main/resources/schema-metrics.avsc  |  37 +++
 .../TestSiteToSiteMetricsReportingTask.java | 296 +++
 26 files changed, 1398 insertions(+), 485 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/nifi/blob/930417b9/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
--
diff --git 
a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml 
b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
index 5f30ec5..88f4a3b 100644
--- a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/pom.xml
@@ -30,21 +30,11 @@
 jersey-client
 
 
-org.glassfish
-javax.json
-1.0.4
-
-
 javax.json
 javax.json-api
 1.0
 
 
-com.yammer.metrics
-metrics-core
-2.2.0
-
-
 org.apache.nifi
 nifi-api
 
@@ -53,6 +43,11 @@
 nifi-utils
 1.6.0-SNAPSHOT
 
+
+org.apache.nifi
+nifi-reporting-utils
+1.6.0-SNAPSHOT
+
 
 
 org.apache.nifi

http://git-wip-us.apache.org/repos/asf/nifi/blob/930417b9/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/AmbariReportingTask.java
--
diff --git 
a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/AmbariReportingTask.java
 
b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/AmbariReportingTask.java
index a5ce9f4..eadef74 100644
--- 
a/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/AmbariReportingTask.java
+++ 
b/nifi-nar-bundles/nifi-ambari-bundle/nifi-ambari-reporting-task/src/main/java/org/apache/nifi/reporting/ambari/AmbariReportingTask.java
@@ -28,8 +28,8 @@ import org.apache.nifi.controller.status.ProcessGroupStatus;
 import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.reporting.AbstractReportingTask;
 import org.apache.nifi.reporting.ReportingContext;
-import org.apache.nifi.reporting.ambari.api.MetricsBuilder;
-import