From commits-return-41840-archive-asf-public=cust-asf.ponee.io@nifi.apache.org Thu Oct 3 09:08:28 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 724EF18065B for ; Thu, 3 Oct 2019 11:08:28 +0200 (CEST) Received: (qmail 11837 invoked by uid 500); 3 Oct 2019 09:08:27 -0000 Mailing-List: contact commits-help@nifi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@nifi.apache.org Delivered-To: mailing list commits@nifi.apache.org Received: (qmail 11828 invoked by uid 99); 3 Oct 2019 09:08:27 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Oct 2019 09:08:27 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 980CA890A3; Thu, 3 Oct 2019 09:08:27 +0000 (UTC) Date: Thu, 03 Oct 2019 09:08:27 +0000 To: "commits@nifi.apache.org" Subject: [nifi] branch master updated: NIFI-6716: Prometheus Metrics Server returns 500 when a Remote Process Group used MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <157009370698.21149.7763843165687061768@gitbox.apache.org> From: pvillard@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: nifi X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 99cf87c330a2b27757cb188a4e806a46c31ecd1b X-Git-Newrev: 261a39599231aaab0115d30eaf8340fdf3801965 X-Git-Rev: 261a39599231aaab0115d30eaf8340fdf3801965 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. pvillard pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/master by this push: new 261a395 NIFI-6716: Prometheus Metrics Server returns 500 when a Remote Process Group used 261a395 is described below commit 261a39599231aaab0115d30eaf8340fdf3801965 Author: Kotaro Terada AuthorDate: Thu Sep 26 19:07:33 2019 +0900 NIFI-6716: Prometheus Metrics Server returns 500 when a Remote Process Group used Signed-off-by: Pierre Villard This closes #3767. --- .../nifi/reporting/prometheus/api/PrometheusMetricsUtil.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/src/main/java/org/apache/nifi/reporting/prometheus/api/PrometheusMetricsUtil.java b/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/src/main/java/org/apache/nifi/reporting/prometheus/api/PrometheusMetricsUtil.java index b894bee..fcf199e 100644 --- a/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/src/main/java/org/apache/nifi/reporting/prometheus/api/PrometheusMetricsUtil.java +++ b/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/src/main/java/org/apache/nifi/reporting/prometheus/api/PrometheusMetricsUtil.java @@ -402,10 +402,13 @@ public class PrometheusMetricsUtil { AMOUNT_ITEMS_INPUT.labels(instanceId, rpgComponentType, rpgComponentName, rpgComponentId, parentId, "", "", "", "") .set(remoteProcessGroupStatus.getReceivedCount()); - ACTIVE_REMOTE_PORT_COUNT.labels(instanceId, rpgComponentType, rpgComponentName, rpgComponentId, parentId).set(remoteProcessGroupStatus.getActiveRemotePortCount()); - INACTIVE_REMOTE_PORT_COUNT.labels(instanceId, rpgComponentType, rpgComponentName, rpgComponentId, parentId).set(remoteProcessGroupStatus.getInactiveRemotePortCount()); + ACTIVE_REMOTE_PORT_COUNT.labels(instanceId, rpgComponentType, rpgComponentName, rpgComponentId, parentId, "", "", "", "") + .set(remoteProcessGroupStatus.getActiveRemotePortCount()); + INACTIVE_REMOTE_PORT_COUNT.labels(instanceId, rpgComponentType, rpgComponentName, rpgComponentId, parentId, "", "", "", "") + .set(remoteProcessGroupStatus.getInactiveRemotePortCount()); - AVERAGE_LINEAGE_DURATION.labels(instanceId, rpgComponentType, rpgComponentName, rpgComponentId, parentId).set(remoteProcessGroupStatus.getAverageLineageDuration()); + AVERAGE_LINEAGE_DURATION.labels(instanceId, rpgComponentType, rpgComponentName, rpgComponentId, parentId, "", "", "", "") + .set(remoteProcessGroupStatus.getAverageLineageDuration()); IS_TRANSMITTING.labels(instanceId, rpgComponentType, rpgComponentName, rpgComponentId, parentId, remoteProcessGroupStatus.getTransmissionStatus().name()) .set(TransmissionStatus.Transmitting.equals(remoteProcessGroupStatus.getTransmissionStatus()) ? 1 : 0);