refactor: have repeated cluster queries reference itself (#1162)

* chore: have repeated queries reference itself

* chore: use rate instead of irate in namespace queries

* chore: further refactor in cluster and namespace

Author: sleepyfoodie

dashboards/resources/cluster.libsonnet

@@ -530,7 +530,7 @@ local timeSeries = g.panel.timeSeries;
         + tsPanel.queryOptions.withTargets([
           prometheus.new(
             '${datasource}',
-            queries.rateOfReceivedPackets($._config)
+            queries.networkReceivePackets($._config)
           )
           + prometheus.withLegendFormat('__auto'),
         ]),
@@ -540,7 +540,7 @@ local timeSeries = g.panel.timeSeries;
         + tsPanel.queryOptions.withTargets([
           prometheus.new(
             '${datasource}',
-            queries.rateOfTransmittedPackets($._config)
+            queries.networkTransmitPackets($._config)
           )
           + prometheus.withLegendFormat('__auto'),
         ]),
@@ -550,7 +550,7 @@ local timeSeries = g.panel.timeSeries;
         + tsPanel.queryOptions.withTargets([
           prometheus.new(
             '${datasource}',
-            queries.rateOfReceivedPacketsDropped($._config)
+            queries.networkReceivePacketsDropped($._config)
           )
           + prometheus.withLegendFormat('__auto'),
         ]),
@@ -560,7 +560,7 @@ local timeSeries = g.panel.timeSeries;
         + tsPanel.queryOptions.withTargets([
           prometheus.new(
             '${datasource}',
-            queries.rateOfTransmittedPacketsDropped($._config)
+            queries.networkTransmitPacketsDropped($._config)
           )
           + prometheus.withLegendFormat('__auto'),
         ]),

dashboards/resources/namespace.libsonnet

@@ -571,7 +571,7 @@ local timeSeries = g.panel.timeSeries;
         + tsPanel.queryOptions.withTargets([
           prometheus.new(
             '${datasource}',
-            queries.rateOfReceivedPackets($._config)
+            queries.networkReceivePackets($._config)
           )
           + prometheus.withLegendFormat('__auto'),
         ]),
@@ -581,7 +581,7 @@ local timeSeries = g.panel.timeSeries;
         + tsPanel.queryOptions.withTargets([
           prometheus.new(
             '${datasource}',
-            queries.rateOfTransmittedPackets($._config)
+            queries.networkTransmitPackets($._config)
           )
           + prometheus.withLegendFormat('__auto'),
         ]),
@@ -591,7 +591,7 @@ local timeSeries = g.panel.timeSeries;
         + tsPanel.queryOptions.withTargets([
           prometheus.new(
             '${datasource}',
-            queries.rateOfReceivedPacketsDropped($._config)
+            queries.networkReceivePacketsDropped($._config)
           )
           + prometheus.withLegendFormat('__auto'),
         ]),
@@ -601,7 +601,7 @@ local timeSeries = g.panel.timeSeries;
         + tsPanel.queryOptions.withTargets([
           prometheus.new(
             '${datasource}',
-            queries.rateOfTransmittedPacketsDropped($._config)
+            queries.networkTransmitPacketsDropped($._config)
           )
           + prometheus.withLegendFormat('__auto'),
         ]),

dashboards/resources/queries/cluster.libsonnet

@@ -77,22 +77,10 @@
     '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,
-
-  rateOfReceivedPackets(config)::
-    'sum(irate(container_network_receive_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
-
-  rateOfTransmittedPackets(config)::
-    'sum(irate(container_network_transmit_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
-
-  rateOfReceivedPacketsDropped(config)::
-    'sum(irate(container_network_receive_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
-
-  rateOfTransmittedPacketsDropped(config)::
-    'sum(irate(container_network_transmit_packets_dropped_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,
 
   // Storage Queries
   iopsReadsWrites(config)::

dashboards/resources/queries/namespace.libsonnet

@@ -86,25 +86,12 @@
   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,
 
   networkTransmitBandwidthTimeSeries(config)::
     '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,
-
-  rateOfTransmittedPackets(config)::
-    'sum(irate(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,
-
-  rateOfTransmittedPacketsDropped(config)::
-    'sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config,
-
   // Storage TimeSeries Queries
   iopsReadsWrites(config)::
     'ceil(sum by(pod) (rate(container_fs_reads_total{%(containerfsSelector)s, %(diskDeviceSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s]) + rate(container_fs_writes_total{%(containerfsSelector)s, %(diskDeviceSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace"}[%(grafanaIntervalVar)s])))' % config,