From 6e82ec738cbd6c8461ea90183cbf418f1f0e1f1f Mon Sep 17 00:00:00 2001 From: jpercivall Date: Mon, 22 Aug 2016 21:34:30 -0400 Subject: [PATCH] NIFI-2269 Fixing minor issues with style check, licensing, etc. --- nifi-assembly/NOTICE | 4 - nifi-assembly/pom.xml | 143 ------------------ .../nifi-datadog-nar/pom.xml | 1 - .../datadog/DataDogReportingTask.java | 28 ++-- .../datadog/metrics/MetricsService.java | 2 +- .../additionalDetails.html | 3 - .../datadog/TestDataDogReportingTask.java | 1 - nifi-nar-bundles/nifi-datadog-bundle/pom.xml | 5 + pom.xml | 6 + 9 files changed, 27 insertions(+), 166 deletions(-) rename nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/{org.apache.nifi.reporting.ambari.AmbariReportingTask => org.apache.nifi.reporting.datadog.DataDogReportingTask}/additionalDetails.html (95%) diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index 0a98bd13eb..fa5a91347a 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -59,10 +59,6 @@ The following binary components are provided under the Apache Software License v Tatu Saloranta (http://wiki.fasterxml.com/TatuSaloranta) - (ASLv2) Google Guava - The following NOTICE information applies: - Copyright 2011 Guava International Limited - (ASLv2) Dropwizard Metrics The following NOTICE information applies: Copyright (c) 2010-2013 Coda Hale, Yammer.com diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml index 7228a51412..44a03b5002 100755 --- a/nifi-assembly/pom.xml +++ b/nifi-assembly/pom.xml @@ -83,7 +83,6 @@ language governing permissions and limitations under the License. --> org.apache.nifi nifi-framework-api - 1.0.0-SNAPSHOT org.apache.nifi @@ -135,7 +134,6 @@ language governing permissions and limitations under the License. --> org.apache.nifi nifi-datadog-nar - 1.0.0-SNAPSHOT nar @@ -374,147 +372,6 @@ language governing permissions and limitations under the License. --> nar - - - 512 - 128 - - - ${project.version} - true - 10 sec - 500 ms - 30 sec - 10 millis - - ./conf/flow.xml.gz - true - ./conf/archive/ - 30 days - 500 MB - ./conf/login-identity-providers.xml - ./conf/authorizers.xml - ./conf/templates - ./database_repository - - ./conf/state-management.xml - false - ./conf/zookeeper.properties - local-provider - zk-provider - - org.apache.nifi.controller.repository.WriteAheadFlowFileRepository - ./flowfile_repository - 256 - 2 mins - false - org.apache.nifi.controller.FileSystemSwapManager - 20000 - 5 sec - 1 - 5 sec - 4 - - org.apache.nifi.controller.repository.FileSystemRepository - 10 MB - 100 - ./content_repository - 12 hours - 50% - true - false - /nifi-content-viewer/ - - - - 30 sec - ./lib - ./work/nar/ - ./work/docs/components - - PBEWITHMD5AND256BITAES-CBC-OPENSSL - BC - ;LOCK_TIMEOUT=25000;WRITE_DELAY=0;AUTO_SERVER=FALSE - - 9990 - - - org.apache.nifi.provenance.PersistentProvenanceRepository - ./provenance_repository - 24 hours - 1 GB - 30 secs - 100 MB - 2 - 1 - true - EventType, FlowFileUUID, Filename, ProcessorID, Relationship - - 500 MB - false - 16 - 65536 - - - 100000 - - - org.apache.nifi.controller.status.history.VolatileComponentStatusRepository - 1440 - 1 min - - - ./lib - - 8080 - - - ./work/jetty - 200 - - - - - - - - - - - file-provider - - - - - - - 5 sec - false - - - false - - - 10 - 25 - 5 sec - 5 sec - - - 15 secs - - - - 3 secs - 3 secs - /nifi - - - - - - 12 hours - rpm diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml index eff4df560a..5154cb1866 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml +++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-nar/pom.xml @@ -30,7 +30,6 @@ org.apache.nifi nifi-datadog-reporting-task - 1.0.0-SNAPSHOT diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/DataDogReportingTask.java b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/DataDogReportingTask.java index 4ff52928c8..fe8d6500c3 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/DataDogReportingTask.java +++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/DataDogReportingTask.java @@ -34,7 +34,6 @@ import org.apache.nifi.controller.status.ConnectionStatus; import org.apache.nifi.controller.status.PortStatus; import org.apache.nifi.controller.status.ProcessGroupStatus; import org.apache.nifi.controller.status.ProcessorStatus; -import org.apache.nifi.logging.ComponentLog; import org.apache.nifi.processor.util.StandardValidators; import org.apache.nifi.reporting.AbstractReportingTask; import org.apache.nifi.reporting.ReportingContext; @@ -43,26 +42,29 @@ import org.coursera.metrics.datadog.DynamicTagsCallback; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.util.*; +import java.util.Map; +import java.util.HashMap; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.ConcurrentHashMap; @Tags({"reporting", "datadog", "metrics"}) -@CapabilityDescription("Publishes metrics from NiFi to datadog") +@CapabilityDescription("Publishes metrics from NiFi to datadog. For accurate and informative reporting, components should have unique names.") public class DataDogReportingTask extends AbstractReportingTask { - static final AllowableValue DATADOG_AGENT = new AllowableValue("DataDog Agent", "DataDog Agent", - "Metrics will be sent via locally installed DataDog agent. " + - "DataDog agent needs to be installed manually before using this option"); + static final AllowableValue DATADOG_AGENT = new AllowableValue("Datadog Agent", "Datadog Agent", + "Metrics will be sent via locally installed Datadog agent. " + + "Datadog agent needs to be installed manually before using this option"); static final AllowableValue DATADOG_HTTP = new AllowableValue("Datadog HTTP", "Datadog HTTP", "Metrics will be sent via HTTP transport with no need of Agent installed. " + - "DataDog API key needs to be set"); + "Datadog API key needs to be set"); static final PropertyDescriptor DATADOG_TRANSPORT = new PropertyDescriptor.Builder() - .name("DataDog transport") - .description("Transport through which metrics will be sent to DataDog") + .name("Datadog transport") + .description("Transport through which metrics will be sent to Datadog") .required(true) .allowableValues(DATADOG_AGENT, DATADOG_HTTP) .defaultValue(DATADOG_HTTP.getValue()) @@ -70,7 +72,7 @@ public class DataDogReportingTask extends AbstractReportingTask { static final PropertyDescriptor API_KEY = new PropertyDescriptor.Builder() .name("API key") - .description("DataDog API key. If specified value is 'agent', local DataDog agent will be used.") + .description("Datadog API key. If specified value is 'agent', local Datadog agent will be used.") .expressionLanguageSupported(false) .required(false) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR) @@ -148,8 +150,8 @@ public class DataDogReportingTask extends AbstractReportingTask { protected void updateMetrics(Map metrics, Optional processorName, Map tags) { for (Map.Entry entry : metrics.entrySet()) { - logger.info(entry.getKey() + ": " + entry.getValue()); final String metricName = buildMetricName(processorName, entry.getKey()); + logger.debug(metricName + ": " + entry.getValue()); //if metric is not registered yet - register it if (!metricsMap.containsKey(metricName)) { metricsMap.put(metricName, new AtomicDouble(entry.getValue())); @@ -160,7 +162,7 @@ public class DataDogReportingTask extends AbstractReportingTask { } } - private void updateAllMetricGroups (ProcessGroupStatus processGroupStatus) { + private void updateAllMetricGroups(ProcessGroupStatus processGroupStatus) { final List processorStatuses = new ArrayList<>(); populateProcessorStatuses(processGroupStatus, processorStatuses); for (final ProcessorStatus processorStatus : processorStatuses) { @@ -191,7 +193,7 @@ public class DataDogReportingTask extends AbstractReportingTask { portTags.putAll(metricsService.getPortStatusTags(portStatus)); updateMetrics(metricsService.getPortStatusMetrics(portStatus), Optional.absent(), portTags); } - + updateMetrics(metricsService.getJVMMetrics(virtualMachineMetrics), Optional.absent(), defaultTags); updateMetrics(metricsService.getDataFlowMetrics(processGroupStatus), Optional.absent(), defaultTags); diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java index cf1a625cbc..d1419ebd92 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java +++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/java/org/apache/nifi/reporting/datadog/metrics/MetricsService.java @@ -108,7 +108,7 @@ public class MetricsService { return metrics; } - public List getAllTagsList () { + public List getAllTagsList() { List tagsList = new ArrayList<>(); tagsList.add("env"); tagsList.add("dataflow_id"); diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.ambari.AmbariReportingTask/additionalDetails.html b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.datadog.DataDogReportingTask/additionalDetails.html similarity index 95% rename from nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.ambari.AmbariReportingTask/additionalDetails.html rename to nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.datadog.DataDogReportingTask/additionalDetails.html index 43bac38d01..88585623c8 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.ambari.AmbariReportingTask/additionalDetails.html +++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/main/resources/docs/org.apache.nifi.reporting.datadog.DataDogReportingTask/additionalDetails.html @@ -49,8 +49,5 @@
  • jvm.gc.runs
  • jvm.gc.time
    • -

    - Please consult the DataDog and NiFi documentation for further details. -

    diff --git a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/test/java/org/apache/nifi/reporting/datadog/TestDataDogReportingTask.java b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/test/java/org/apache/nifi/reporting/datadog/TestDataDogReportingTask.java index b785d40c19..0d2f0e74b9 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/test/java/org/apache/nifi/reporting/datadog/TestDataDogReportingTask.java +++ b/nifi-nar-bundles/nifi-datadog-bundle/nifi-datadog-reporting-task/src/test/java/org/apache/nifi/reporting/datadog/TestDataDogReportingTask.java @@ -25,7 +25,6 @@ import com.yammer.metrics.core.VirtualMachineMetrics; import org.apache.nifi.controller.ConfigurationContext; import org.apache.nifi.controller.status.ProcessGroupStatus; import org.apache.nifi.controller.status.ProcessorStatus; -import org.apache.nifi.logging.ComponentLog; import org.apache.nifi.reporting.EventAccess; import org.apache.nifi.reporting.InitializationException; import org.apache.nifi.reporting.ReportingContext; diff --git a/nifi-nar-bundles/nifi-datadog-bundle/pom.xml b/nifi-nar-bundles/nifi-datadog-bundle/pom.xml index eb6b87c635..1cef6b52ae 100644 --- a/nifi-nar-bundles/nifi-datadog-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-datadog-bundle/pom.xml @@ -31,6 +31,11 @@ + + org.apache.nifi + nifi-datadog-reporting-task + 1.0.0-SNAPSHOT + org.glassfish.jersey.core jersey-client diff --git a/pom.xml b/pom.xml index 821ce3cce4..47a8992aea 100644 --- a/pom.xml +++ b/pom.xml @@ -1217,6 +1217,12 @@ language governing permissions and limitations under the License. --> 1.0.0-SNAPSHOT nar + + org.apache.nifi + nifi-datadog-nar + 1.0.0-SNAPSHOT + nar + org.apache.nifi nifi-properties