Github user joewitt commented on a diff in the pull request: https://github.com/apache/nifi/pull/188#discussion_r51226877 --- Diff: nifi-nar-bundles/nifi-riemann-bundle/nifi-riemann-reporting-task/src/main/java/org/apache/nifi/reporting/riemann/RiemannReportingTask.java --- @@ -0,0 +1,244 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.nifi.reporting.riemann; + +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +import com.google.common.collect.ImmutableList; +import org.apache.nifi.annotation.behavior.DynamicProperty; +import org.apache.nifi.annotation.documentation.CapabilityDescription; +import org.apache.nifi.annotation.documentation.Tags; +import org.apache.nifi.annotation.lifecycle.OnScheduled; +import org.apache.nifi.annotation.lifecycle.OnStopped; +import org.apache.nifi.components.PropertyDescriptor; +import org.apache.nifi.controller.ConfigurationContext; +import org.apache.nifi.processor.exception.ProcessException; +import org.apache.nifi.processor.util.StandardValidators; +import org.apache.nifi.reporting.AbstractReportingTask; +import org.apache.nifi.reporting.Bulletin; +import org.apache.nifi.reporting.BulletinQuery; +import org.apache.nifi.reporting.ReportingContext; +import org.apache.nifi.reporting.riemann.metrics.MetricsService; + +import com.aphyr.riemann.Proto; +import com.aphyr.riemann.client.IPromise; +import com.aphyr.riemann.client.RiemannClient; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.yammer.metrics.core.VirtualMachineMetrics; + +@Tags({ "reporting", "riemann", "metrics" }) +@DynamicProperty(name = "Attribute Name", value = "Attribute Value", supportsExpressionLanguage = false, + description = "Additional attributes may be attached to the event by adding dynamic properties") +@CapabilityDescription("Publish NiFi metrics to Riemann. These metrics include " + "JVM, Processor, and General Data Flow metrics. In addition, you may also forward bulletin " + "board messages.") +public class RiemannReportingTask extends AbstractReportingTask { + private static final PropertyDescriptor RIEMANN_HOST = new PropertyDescriptor.Builder().name("Riemann Address").description("Hostname of Riemann server").required(true) + .addValidator(StandardValidators.NON_EMPTY_VALIDATOR).build(); + private static final PropertyDescriptor RIEMANN_PORT = new PropertyDescriptor.Builder().name("Riemann Port").description("Port that Riemann is listening on").required(true).defaultValue("5555") + .addValidator(StandardValidators.PORT_VALIDATOR).build(); + private static final PropertyDescriptor TRANSPORT_PROTOCOL = new PropertyDescriptor.Builder().name("Transport Protocol").description("Transport protocol to speak to Riemann in").required(true) + .allowableValues(new Transport[] { Transport.TCP, Transport.UDP }).defaultValue("TCP").build(); + private static final PropertyDescriptor SERVICE_PREFIX = new PropertyDescriptor.Builder().name("Prefix for Service Name").description("Prefix to use when reporting to Riemann").defaultValue("nifi") + .required(true).addValidator(StandardValidators.NON_EMPTY_VALIDATOR).build(); + private static final PropertyDescriptor WRITE_TIMEOUT = new PropertyDescriptor.Builder().name("Timeout").description("Timeout in milliseconds when writing events to Riemann").required(true) + .defaultValue("500ms").addValidator(StandardValidators.TIME_PERIOD_VALIDATOR).build(); + private static final PropertyDescriptor HOSTNAME = new PropertyDescriptor.Builder().name("Hostname").description("The Hostname of this NiFi instance to report to Riemann").required(true) + .expressionLanguageSupported(true).defaultValue("${hostname(true)}").addValidator(StandardValidators.NON_EMPTY_VALIDATOR).build(); + private static final PropertyDescriptor TAGS = new PropertyDescriptor.Builder().name("Tags").description("Comma separated list of tags to include ").required(true).expressionLanguageSupported(true) + .defaultValue("nifi,metrics").addValidator(StandardValidators.NON_EMPTY_VALIDATOR).build(); + private static final PropertyDescriptor SEND_JVM_METRICS = new PropertyDescriptor.Builder().name("JVM Metrics").description("Forwards NiFi JVM metrics to Riemann").allowableValues("true", "false") + .required(true).defaultValue("true").addValidator(StandardValidators.BOOLEAN_VALIDATOR).build(); + private static final PropertyDescriptor SEND_NIFI_METRICS = new PropertyDescriptor.Builder().name("NiFi Metrics").description("Forwards aggregated data flow metrics to Riemann") + .allowableValues("true", "false").required(true).defaultValue("true").addValidator(StandardValidators.BOOLEAN_VALIDATOR).build(); + private static final PropertyDescriptor SEND_PROCESSOR_METRICS = new PropertyDescriptor.Builder().name("Processor Metrics").description("Forwards metrics for individual processor to Riemann") + .allowableValues("true", "false").required(true).defaultValue("true").addValidator(StandardValidators.BOOLEAN_VALIDATOR).build(); + private static final PropertyDescriptor SEND_BULLETIN_MESSAGES = new PropertyDescriptor.Builder().name("Bulletin Messages").description("Forwards messages from the Bulletin board to Riemann") + .allowableValues("true", "false").required(true).defaultValue("true").addValidator(StandardValidators.BOOLEAN_VALIDATOR).build(); + private static final PropertyDescriptor MIN_BULLETIN_LEVEL = new PropertyDescriptor.Builder().name("Minimum Bulletin Level") + .description("Only forward bulletin messages at this level and above to Riemann").allowableValues(LogLevel.values()).required(true).defaultValue("WARNING").build(); + protected Transport transport; + private volatile long lastObservedBulletinId = 0; + private volatile RiemannClient riemannClient = null; + private MetricsService metricsService; + private final VirtualMachineMetrics virtualMachineMetrics = VirtualMachineMetrics.getInstance(); + + @Override + protected List<PropertyDescriptor> getSupportedPropertyDescriptors() { + final List<PropertyDescriptor> properties = Lists.newArrayList(); + properties.add(RIEMANN_HOST); + properties.add(RIEMANN_PORT); + properties.add(TRANSPORT_PROTOCOL); + properties.add(SERVICE_PREFIX); + properties.add(HOSTNAME); + properties.add(TAGS); + properties.add(SEND_JVM_METRICS); + properties.add(SEND_NIFI_METRICS); + properties.add(SEND_PROCESSOR_METRICS); + properties.add(SEND_BULLETIN_MESSAGES); + properties.add(MIN_BULLETIN_LEVEL); + properties.add(WRITE_TIMEOUT); + return Collections.unmodifiableList(properties); + } + + @Override + protected PropertyDescriptor getSupportedDynamicPropertyDescriptor(final String propertyDescriptorName) { + return new PropertyDescriptor.Builder().name(propertyDescriptorName).required(false).addValidator(StandardValidators.NON_EMPTY_VALIDATOR).expressionLanguageSupported(false).dynamic(true) + .build(); + } + + @OnStopped + public final void cleanUpClient() { + if (riemannClient != null) { + this.riemannClient.close(); --- End diff -- What if this throws an exception? Hopefully the framework will catch it and log an error and provide a bulletin.
--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---