[nifi] branch master updated: NIFI-6716: Prometheus Metrics Server returns 500 when a Remote Process Group used

[pvillard]

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 <koter...@yahoo-corp.jp>
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 <pierre.villard...@gmail.com>
    
    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);