From b95fc6fcd7a3a8a6ba9b3f77a72b660fc7f2a398 Mon Sep 17 00:00:00 2001 From: Serena K Date: Fri, 19 Dec 2025 17:19:06 -0500 Subject: [PATCH 1/2] chore: have repeated queries reference itself --- dashboards/resources/queries/cluster.libsonnet | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dashboards/resources/queries/cluster.libsonnet b/dashboards/resources/queries/cluster.libsonnet index e60d2c99d..c5eece48f 100644 --- a/dashboards/resources/queries/cluster.libsonnet +++ b/dashboards/resources/queries/cluster.libsonnet @@ -77,22 +77,22 @@ 'sum(rate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config, avgContainerReceiveBandwidth(config):: - 'avg(irate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config, + 'avg(rate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config, avgContainerTransmitBandwidth(config):: - 'avg(irate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config, + 'avg(rate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config, rateOfReceivedPackets(config):: - 'sum(irate(container_network_receive_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config, + self.networkReceivePackets(config), rateOfTransmittedPackets(config):: - 'sum(irate(container_network_transmit_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config, + self.networkTransmitPackets(config), rateOfReceivedPacketsDropped(config):: - 'sum(irate(container_network_receive_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config, + self.networkreceivepacketsdropped(config), rateOfTransmittedPacketsDropped(config):: - 'sum(irate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config, + self.networkTransmitPacketsDropped(config), // Storage Queries iopsReadsWrites(config):: From 79d499ed3ad04d51a5bb9b69b6d3844ff64984e1 Mon Sep 17 00:00:00 2001 From: Serena K Date: Fri, 19 Dec 2025 17:23:54 -0500 Subject: [PATCH 2/2] chore: use rate instead of irate in namespace queries --- dashboards/resources/queries/namespace.libsonnet | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dashboards/resources/queries/namespace.libsonnet b/dashboards/resources/queries/namespace.libsonnet index 931a242e6..78274fe9f 100644 --- a/dashboards/resources/queries/namespace.libsonnet +++ b/dashboards/resources/queries/namespace.libsonnet @@ -86,7 +86,6 @@ networkTransmitPacketsDropped(config):: 'sum(rate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config, - // Network TimeSeries Queries (using different functions - rate vs irate) networkReceiveBandwidthTimeSeries(config):: 'sum(rate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config, @@ -94,16 +93,16 @@ 'sum(rate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config, rateOfReceivedPackets(config):: - 'sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config, + 'sum(rate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config, rateOfTransmittedPackets(config):: - 'sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config, + 'sum(rate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config, rateOfReceivedPacketsDropped(config):: - 'sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config, + 'sum(rate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config, rateOfTransmittedPacketsDropped(config):: - 'sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config, + 'sum(rate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config, // Storage TimeSeries Queries iopsReadsWrites(config)::