Support node pool topic metrics

Signed-off-by: Michael Edgar <[email protected]>
streamshub · Jul 17, 2024 · 4a770e4 · 4a770e4
1 parent 2f68da6
commit 4a770e4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/ui/api/kafka/actions.ts b/ui/api/kafka/actions.ts
@@ -278,13 +278,14 @@ export async function getKafkaTopicMetrics(
   async function getRangeByNodeId(
     namespace: string,
     name: string,
+    nodePools: string,
     metric: TopicMetric,
   ) {
     const start = new Date().getTime() - 1 * 60 * 60 * 1000;
     const end = new Date();
     const step = 60 * 1;
     const seriesRes = await prom!.rangeQuery(
-      topic[metric](namespace, name),
+      topic[metric](namespace, name, nodePools),
       start,
       end,
       step,
@@ -312,6 +313,7 @@ export async function getKafkaTopicMetrics(
           getRangeByNodeId(
             cluster.attributes.namespace,
             cluster.attributes.name,
+            cluster.attributes.nodePools?.join("|") ?? "",
             m,
           ),
         ),

diff --git a/ui/api/kafka/topic.promql.ts b/ui/api/kafka/topic.promql.ts
@@ -1,18 +1,27 @@
-export const incomingByteRate = (namespace: string, cluster: string) => `
+export const incomingByteRate = (
+  namespace: string,
+  cluster: string,
+  nodePools: string,
+) => `
   sum by (__console_metric_name__) (
     label_replace(
-      irate(kafka_server_brokertopicmetrics_bytesin_total{topic!="",namespace="${namespace}",pod=~"${cluster}-kafka-\\\\d+",strimzi_io_kind="Kafka"}[5m]),
+      irate(kafka_server_brokertopicmetrics_bytesin_total{topic!="",namespace="${namespace}",pod=~"${cluster}-(kafka|${nodePools})-\\\\d+",strimzi_io_kind="Kafka"}[5m]),
       "__console_metric_name__",
       "incoming_byte_rate",
       "",
       ""
     )
   )
 `;
-export const outgoingByteRate = (namespace: string, cluster: string) => `
+
+export const outgoingByteRate = (
+  namespace: string,
+  cluster: string,
+  nodePools: string,
+) => `
   sum by (__console_metric_name__) (
     label_replace(
-      irate(kafka_server_brokertopicmetrics_bytesout_total{topic!="",namespace="${namespace}",pod=~"${cluster}-kafka-\\\\d+",strimzi_io_kind="Kafka"}[5m]),
+      irate(kafka_server_brokertopicmetrics_bytesout_total{topic!="",namespace="${namespace}",pod=~"${cluster}-(kafka|${nodePools})-\\\\d+",strimzi_io_kind="Kafka"}[5m]),
       "__console_metric_name__",
       "outgoing_byte_rate",
       "",