Skip to content

Commit 93a00d2

Browse files
authored
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
1 parent a1ec6db commit 93a00d2

File tree

4 files changed

+10
-35
lines changed

4 files changed

+10
-35
lines changed

dashboards/resources/cluster.libsonnet

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ local timeSeries = g.panel.timeSeries;
530530
+ tsPanel.queryOptions.withTargets([
531531
prometheus.new(
532532
'${datasource}',
533-
queries.rateOfReceivedPackets($._config)
533+
queries.networkReceivePackets($._config)
534534
)
535535
+ prometheus.withLegendFormat('__auto'),
536536
]),
@@ -540,7 +540,7 @@ local timeSeries = g.panel.timeSeries;
540540
+ tsPanel.queryOptions.withTargets([
541541
prometheus.new(
542542
'${datasource}',
543-
queries.rateOfTransmittedPackets($._config)
543+
queries.networkTransmitPackets($._config)
544544
)
545545
+ prometheus.withLegendFormat('__auto'),
546546
]),
@@ -550,7 +550,7 @@ local timeSeries = g.panel.timeSeries;
550550
+ tsPanel.queryOptions.withTargets([
551551
prometheus.new(
552552
'${datasource}',
553-
queries.rateOfReceivedPacketsDropped($._config)
553+
queries.networkReceivePacketsDropped($._config)
554554
)
555555
+ prometheus.withLegendFormat('__auto'),
556556
]),
@@ -560,7 +560,7 @@ local timeSeries = g.panel.timeSeries;
560560
+ tsPanel.queryOptions.withTargets([
561561
prometheus.new(
562562
'${datasource}',
563-
queries.rateOfTransmittedPacketsDropped($._config)
563+
queries.networkTransmitPacketsDropped($._config)
564564
)
565565
+ prometheus.withLegendFormat('__auto'),
566566
]),

dashboards/resources/namespace.libsonnet

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ local timeSeries = g.panel.timeSeries;
571571
+ tsPanel.queryOptions.withTargets([
572572
prometheus.new(
573573
'${datasource}',
574-
queries.rateOfReceivedPackets($._config)
574+
queries.networkReceivePackets($._config)
575575
)
576576
+ prometheus.withLegendFormat('__auto'),
577577
]),
@@ -581,7 +581,7 @@ local timeSeries = g.panel.timeSeries;
581581
+ tsPanel.queryOptions.withTargets([
582582
prometheus.new(
583583
'${datasource}',
584-
queries.rateOfTransmittedPackets($._config)
584+
queries.networkTransmitPackets($._config)
585585
)
586586
+ prometheus.withLegendFormat('__auto'),
587587
]),
@@ -591,7 +591,7 @@ local timeSeries = g.panel.timeSeries;
591591
+ tsPanel.queryOptions.withTargets([
592592
prometheus.new(
593593
'${datasource}',
594-
queries.rateOfReceivedPacketsDropped($._config)
594+
queries.networkReceivePacketsDropped($._config)
595595
)
596596
+ prometheus.withLegendFormat('__auto'),
597597
]),
@@ -601,7 +601,7 @@ local timeSeries = g.panel.timeSeries;
601601
+ tsPanel.queryOptions.withTargets([
602602
prometheus.new(
603603
'${datasource}',
604-
queries.rateOfTransmittedPacketsDropped($._config)
604+
queries.networkTransmitPacketsDropped($._config)
605605
)
606606
+ prometheus.withLegendFormat('__auto'),
607607
]),

dashboards/resources/queries/cluster.libsonnet

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,10 @@
7777
'sum(rate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
7878

7979
avgContainerReceiveBandwidth(config)::
80-
'avg(irate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
80+
'avg(rate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
8181

8282
avgContainerTransmitBandwidth(config)::
83-
'avg(irate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
84-
85-
rateOfReceivedPackets(config)::
86-
'sum(irate(container_network_receive_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
87-
88-
rateOfTransmittedPackets(config)::
89-
'sum(irate(container_network_transmit_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
90-
91-
rateOfReceivedPacketsDropped(config)::
92-
'sum(irate(container_network_receive_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
93-
94-
rateOfTransmittedPacketsDropped(config)::
95-
'sum(irate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
83+
'avg(rate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s=~".+"}[%(grafanaIntervalVar)s])) by (namespace)' % config,
9684

9785
// Storage Queries
9886
iopsReadsWrites(config)::

dashboards/resources/queries/namespace.libsonnet

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,25 +86,12 @@
8686
networkTransmitPacketsDropped(config)::
8787
'sum(rate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config,
8888

89-
// Network TimeSeries Queries (using different functions - rate vs irate)
9089
networkReceiveBandwidthTimeSeries(config)::
9190
'sum(rate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config,
9291

9392
networkTransmitBandwidthTimeSeries(config)::
9493
'sum(rate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config,
9594

96-
rateOfReceivedPackets(config)::
97-
'sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config,
98-
99-
rateOfTransmittedPackets(config)::
100-
'sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config,
101-
102-
rateOfReceivedPacketsDropped(config)::
103-
'sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config,
104-
105-
rateOfTransmittedPacketsDropped(config)::
106-
'sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster", %(namespaceLabel)s="$namespace"}[%(grafanaIntervalVar)s])) by (pod)' % config,
107-
10895
// Storage TimeSeries Queries
10996
iopsReadsWrites(config)::
11097
'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,

0 commit comments

Comments
 (0)