From c9e0aa221aeb9f3bccd40bee775de7566fc139c6 Mon Sep 17 00:00:00 2001
From: "Patrick J. McNerthney" <pat@mcnerthney.com>
Date: Wed, 26 May 2021 03:51:44 -1000
Subject: [PATCH] Ingress and PersistentVolumeClaims metrics need to also be
 (#2443)

filtered and grouped by namespace, in addition to ingress.

Signed-off-by: Patrick J McNerthney <pat@mcnerthney.com>
---
 src/main/prometheus/lens.ts                      | 16 ++++++++--------
 src/main/prometheus/operator.ts                  | 16 ++++++++--------
 src/main/prometheus/stacklight.ts                | 16 ++++++++--------
 src/renderer/api/endpoints/ingress.api.ts        |  2 +-
 .../endpoints/persistent-volume-claims.api.ts    |  4 ++--
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/main/prometheus/lens.ts b/src/main/prometheus/lens.ts
index 18c4763dc9..4fb5c8d339 100644
--- a/src/main/prometheus/lens.ts
+++ b/src/main/prometheus/lens.ts
@@ -88,18 +88,18 @@ export class PrometheusLens implements PrometheusProvider {
         };
       case "pvc":
         return {
-          diskUsage: `sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim="${opts.pvc}"}) by (persistentvolumeclaim, namespace)`,
-          diskCapacity: `sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim="${opts.pvc}"}) by (persistentvolumeclaim, namespace)`
+          diskUsage: `sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim="${opts.pvc}",namespace="${opts.namespace}"}) by (persistentvolumeclaim, namespace)`,
+          diskCapacity: `sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim="${opts.pvc}",namespace="${opts.namespace}"}) by (persistentvolumeclaim, namespace)`
         };
       case "ingress":
-        const bytesSent = (ingress: string, statuses: string) =>
-          `sum(rate(nginx_ingress_controller_bytes_sent_sum{ingress="${ingress}", status=~"${statuses}"}[${this.rateAccuracy}])) by (ingress)`;
+        const bytesSent = (ingress: string, namespace: string, statuses: string) =>
+          `sum(rate(nginx_ingress_controller_bytes_sent_sum{ingress="${ingress}",namespace="${namespace}",status=~"${statuses}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
 
         return {
-          bytesSentSuccess: bytesSent(opts.ingress, "^2\\\\d*"),
-          bytesSentFailure: bytesSent(opts.ingress, "^5\\\\d*"),
-          requestDurationSeconds: `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}"}[${this.rateAccuracy}])) by (ingress)`,
-          responseDurationSeconds: `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}"}[${this.rateAccuracy}])) by (ingress)`
+          bytesSentSuccess: bytesSent(opts.ingress, opts.namespace, "^2\\\\d*"),
+          bytesSentFailure: bytesSent(opts.ingress, opts.namespace, "^5\\\\d*"),
+          requestDurationSeconds: `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`,
+          responseDurationSeconds: `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`
         };
     }
   }
diff --git a/src/main/prometheus/operator.ts b/src/main/prometheus/operator.ts
index dead850056..b546cac517 100644
--- a/src/main/prometheus/operator.ts
+++ b/src/main/prometheus/operator.ts
@@ -98,18 +98,18 @@ export class PrometheusOperator implements PrometheusProvider {
         };
       case "pvc":
         return {
-          diskUsage: `sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim="${opts.pvc}"}) by (persistentvolumeclaim, namespace)`,
-          diskCapacity: `sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim="${opts.pvc}"}) by (persistentvolumeclaim, namespace)`
+          diskUsage: `sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim="${opts.pvc}",namespace="${opts.namespace}"}) by (persistentvolumeclaim, namespace)`,
+          diskCapacity: `sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim="${opts.pvc}",namespace="${opts.namespace}"}) by (persistentvolumeclaim, namespace)`
         };
       case "ingress":
-        const bytesSent = (ingress: string, statuses: string) =>
-          `sum(rate(nginx_ingress_controller_bytes_sent_sum{ingress="${ingress}", status=~"${statuses}"}[${this.rateAccuracy}])) by (ingress)`;
+        const bytesSent = (ingress: string, namespace: string, statuses: string) =>
+          `sum(rate(nginx_ingress_controller_bytes_sent_sum{ingress="${ingress}",namespace="${namespace}",status=~"${statuses}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
 
         return {
-          bytesSentSuccess: bytesSent(opts.ingress, "^2\\\\d*"),
-          bytesSentFailure: bytesSent(opts.ingress, "^5\\\\d*"),
-          requestDurationSeconds: `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}"}[${this.rateAccuracy}])) by (ingress)`,
-          responseDurationSeconds: `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}"}[${this.rateAccuracy}])) by (ingress)`
+          bytesSentSuccess: bytesSent(opts.ingress, opts.namespace, "^2\\\\d*"),
+          bytesSentFailure: bytesSent(opts.ingress, opts.namespace, "^5\\\\d*"),
+          requestDurationSeconds: `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`,
+          responseDurationSeconds: `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`
         };
     }
   }
diff --git a/src/main/prometheus/stacklight.ts b/src/main/prometheus/stacklight.ts
index 0bdda6b96e..40c1963d3f 100644
--- a/src/main/prometheus/stacklight.ts
+++ b/src/main/prometheus/stacklight.ts
@@ -88,18 +88,18 @@ export class PrometheusStacklight implements PrometheusProvider {
         };
       case "pvc":
         return {
-          diskUsage: `sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim="${opts.pvc}"}) by (persistentvolumeclaim, namespace)`,
-          diskCapacity: `sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim="${opts.pvc}"}) by (persistentvolumeclaim, namespace)`
+          diskUsage: `sum(kubelet_volume_stats_used_bytes{persistentvolumeclaim="${opts.pvc}",namespace="${opts.namespace}"}) by (persistentvolumeclaim, namespace)`,
+          diskCapacity: `sum(kubelet_volume_stats_capacity_bytes{persistentvolumeclaim="${opts.pvc}",namespace="${opts.namespace}"}) by (persistentvolumeclaim, namespace)`
         };
       case "ingress":
-        const bytesSent = (ingress: string, statuses: string) =>
-          `sum(rate(nginx_ingress_controller_bytes_sent_sum{ingress="${ingress}", status=~"${statuses}"}[${this.rateAccuracy}])) by (ingress)`;
+        const bytesSent = (ingress: string, namespace: string, statuses: string) =>
+          `sum(rate(nginx_ingress_controller_bytes_sent_sum{ingress="${ingress}",namespace="${namespace}",status=~"${statuses}"}[${this.rateAccuracy}])) by (ingress, namespace)`;
 
         return {
-          bytesSentSuccess: bytesSent(opts.ingress, "^2\\\\d*"),
-          bytesSentFailure: bytesSent(opts.ingress, "^5\\\\d*"),
-          requestDurationSeconds: `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}"}[${this.rateAccuracy}])) by (ingress)`,
-          responseDurationSeconds: `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}"}[${this.rateAccuracy}])) by (ingress)`
+          bytesSentSuccess: bytesSent(opts.ingress, opts.namespace, "^2\\\\d*"),
+          bytesSentFailure: bytesSent(opts.ingress, opts.namespace, "^5\\\\d*"),
+          requestDurationSeconds: `sum(rate(nginx_ingress_controller_request_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`,
+          responseDurationSeconds: `sum(rate(nginx_ingress_controller_response_duration_seconds_sum{ingress="${opts.ingress}",namespace="${opts.namespace}"}[${this.rateAccuracy}])) by (ingress, namespace)`
         };
     }
   }
diff --git a/src/renderer/api/endpoints/ingress.api.ts b/src/renderer/api/endpoints/ingress.api.ts
index 6b0fbaecba..a65af0e326 100644
--- a/src/renderer/api/endpoints/ingress.api.ts
+++ b/src/renderer/api/endpoints/ingress.api.ts
@@ -27,7 +27,7 @@ import type { KubeJsonApiData } from "../kube-json-api";
 
 export class IngressApi extends KubeApi<Ingress> {
   getMetrics(ingress: string, namespace: string): Promise<IIngressMetrics> {
-    const opts = { category: "ingress", ingress };
+    const opts = { category: "ingress", ingress, namespace };
 
     return metricsApi.getMetrics({
       bytesSentSuccess: opts,
diff --git a/src/renderer/api/endpoints/persistent-volume-claims.api.ts b/src/renderer/api/endpoints/persistent-volume-claims.api.ts
index ca36151767..e8b50683c9 100644
--- a/src/renderer/api/endpoints/persistent-volume-claims.api.ts
+++ b/src/renderer/api/endpoints/persistent-volume-claims.api.ts
@@ -29,8 +29,8 @@ import type { KubeJsonApiData } from "../kube-json-api";
 export class PersistentVolumeClaimsApi extends KubeApi<PersistentVolumeClaim> {
   getMetrics(pvcName: string, namespace: string): Promise<IPvcMetrics> {
     return metricsApi.getMetrics({
-      diskUsage: { category: "pvc", pvc: pvcName },
-      diskCapacity: { category: "pvc", pvc: pvcName }
+      diskUsage: { category: "pvc", pvc: pvcName, namespace },
+      diskCapacity: { category: "pvc", pvc: pvcName, namespace }
     }, {
       namespace
     });