From 27125c7e40a4cf368129ef1931ff960e22cb074a Mon Sep 17 00:00:00 2001
From: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
Date: Fri, 8 Sep 2023 12:40:24 +1000
Subject: [PATCH] feat: expose prometheus metrics from haproxy

Signed-off-by: Lenin Mehedy <lenin.mehedy@swirldslabs.com>
---
 charts/hedera-network/templates/services/haproxy-svc.yaml  | 7 +++++++
 .../templates/services/network-node-svc.yaml               | 3 ++-
 .../templates/telemetry/prometheus-svc-monitor.yaml        | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/charts/hedera-network/templates/services/haproxy-svc.yaml b/charts/hedera-network/templates/services/haproxy-svc.yaml
index 1f4d6acf2..64d1c389c 100644
--- a/charts/hedera-network/templates/services/haproxy-svc.yaml
+++ b/charts/hedera-network/templates/services/haproxy-svc.yaml
@@ -7,6 +7,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: haproxy-{{ $node.name }}-svc
+  labels:
+    fullstack.hedera.com/type: haproxy-svc
+    fullstack.hedera.com/node-name: {{ $node.name }}
+    fullstack.hedera.com/prometheus-endpoint: active
 spec:
   {{- if default $defaults.loadBalancerEnabled $haproxy.loadBalancerEnabled | eq "true" }}
   type: LoadBalancer
@@ -20,6 +24,9 @@ spec:
     - name: tls-grpc-client-port
       port: 50212
       targetPort: 50212
+    - name: prometheus # stats port
+      port: 14567
+      targetPort: 14567
 {{- end }}
 {{- end }}
 
diff --git a/charts/hedera-network/templates/services/network-node-svc.yaml b/charts/hedera-network/templates/services/network-node-svc.yaml
index 8dc400988..e000fb95e 100644
--- a/charts/hedera-network/templates/services/network-node-svc.yaml
+++ b/charts/hedera-network/templates/services/network-node-svc.yaml
@@ -6,7 +6,8 @@ metadata:
   name: network-{{ $nodeConfig.name }}-svc
   labels:
     fullstack.hedera.com/type: network-node-svc
-    fullstack.hedera.com/node-name: {{ $nodeConfig.name }} 
+    fullstack.hedera.com/node-name: {{ $nodeConfig.name }}
+    fullstack.hedera.com/prometheus-endpoint: active
 spec:
   selector:
     app: network-{{ $nodeConfig.name }}
diff --git a/charts/hedera-network/templates/telemetry/prometheus-svc-monitor.yaml b/charts/hedera-network/templates/telemetry/prometheus-svc-monitor.yaml
index 35d2893f8..ff4ba05e0 100644
--- a/charts/hedera-network/templates/telemetry/prometheus-svc-monitor.yaml
+++ b/charts/hedera-network/templates/telemetry/prometheus-svc-monitor.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      fullstack.hedera.com/type: network-node-svc
+      fullstack.hedera.com/prometheus-endpoint: active
   endpoints:
     - port: prometheus # must match the prometheus port-name in network-node-svc.yaml
       interval: 10s # ideally it should be higher than the node-metrics-scraper interval set in otel-collector-config.yaml