Skip to content
This repository was archived by the owner on Dec 1, 2018. It is now read-only.

Commit 78f6958

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1961 from pcm32/master
Uses mean instead of sum in Grafana queries to avoid plotting variations at different timescale
2 parents 032cab8 + b28083c commit 78f6958

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

‎grafana/dashboards/cluster.json‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878
],
7979
"measurement": "cpu/usage_rate",
80-
"query": "SELECT sum(\"value\") FROM \"cpu/usage_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
80+
"query": "SELECT mean(\"value\") FROM \"cpu/usage_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
8181
"refId": "A",
8282
"resultFormat": "time_series",
8383
"select": [
@@ -120,7 +120,7 @@
120120
}
121121
],
122122
"measurement": "cpu/limit",
123-
"query": "SELECT sum(\"value\") FROM \"cpu/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
123+
"query": "SELECT mean(\"value\") FROM \"cpu/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
124124
"refId": "B",
125125
"resultFormat": "time_series",
126126
"select": [
@@ -163,7 +163,7 @@
163163
}
164164
],
165165
"measurement": "cpu/request",
166-
"query": "SELECT sum(\"value\") FROM \"cpu/request\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
166+
"query": "SELECT mean(\"value\") FROM \"cpu/request\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
167167
"refId": "C",
168168
"resultFormat": "time_series",
169169
"select": [
@@ -280,7 +280,7 @@
280280
}
281281
],
282282
"measurement": "cpu/usage_rate",
283-
"query": "SELECT sum(\"value\") FROM \"cpu/usage_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
283+
"query": "SELECT mean(\"value\") FROM \"cpu/usage_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
284284
"refId": "A",
285285
"resultFormat": "time_series",
286286
"select": [
@@ -329,7 +329,7 @@
329329
}
330330
],
331331
"measurement": "cpu/limit",
332-
"query": "SELECT sum(\"value\") FROM \"cpu/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
332+
"query": "SELECT mean(\"value\") FROM \"cpu/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
333333
"refId": "B",
334334
"resultFormat": "time_series",
335335
"select": [
@@ -378,7 +378,7 @@
378378
}
379379
],
380380
"measurement": "cpu/request",
381-
"query": "SELECT sum(\"value\") FROM \"cpu/request\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
381+
"query": "SELECT mean(\"value\") FROM \"cpu/request\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
382382
"refId": "C",
383383
"resultFormat": "time_series",
384384
"select": [
@@ -487,7 +487,7 @@
487487
}
488488
],
489489
"measurement": "cpu/usage_rate",
490-
"query": "SELECT sum(\"value\") FROM \"cpu/usage_rate\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
490+
"query": "SELECT mean(\"value\") FROM \"cpu/usage_rate\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
491491
"refId": "A",
492492
"resultFormat": "time_series",
493493
"select": [
@@ -542,7 +542,7 @@
542542
}
543543
],
544544
"measurement": "cpu/limit",
545-
"query": "SELECT sum(\"value\") FROM \"cpu/limit\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
545+
"query": "SELECT mean(\"value\") FROM \"cpu/limit\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
546546
"refId": "B",
547547
"resultFormat": "time_series",
548548
"select": [
@@ -597,7 +597,7 @@
597597
}
598598
],
599599
"measurement": "cpu/request",
600-
"query": "SELECT sum(\"value\") FROM \"cpu/request\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
600+
"query": "SELECT mean(\"value\") FROM \"cpu/request\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
601601
"refId": "C",
602602
"resultFormat": "time_series",
603603
"select": [
@@ -714,7 +714,7 @@
714714
}
715715
],
716716
"measurement": "memory/usage",
717-
"query": "SELECT sum(\"value\") FROM \"memory/usage\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
717+
"query": "SELECT mean(\"value\") FROM \"memory/usage\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
718718
"refId": "B",
719719
"resultFormat": "time_series",
720720
"select": [
@@ -757,7 +757,7 @@
757757
}
758758
],
759759
"measurement": "memory/working_set",
760-
"query": "SELECT sum(\"value\") FROM \"memory/working_set\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
760+
"query": "SELECT mean(\"value\") FROM \"memory/working_set\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
761761
"refId": "C",
762762
"resultFormat": "time_series",
763763
"select": [
@@ -801,7 +801,7 @@
801801
],
802802
"hide": false,
803803
"measurement": "memory/limit",
804-
"query": "SELECT sum(\"value\") FROM \"memory/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
804+
"query": "SELECT mean(\"value\") FROM \"memory/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
805805
"refId": "A",
806806
"resultFormat": "time_series",
807807
"select": [
@@ -845,7 +845,7 @@
845845
],
846846
"hide": false,
847847
"measurement": "memory/request",
848-
"query": "SELECT sum(\"value\") FROM \"memory/request\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
848+
"query": "SELECT mean(\"value\") FROM \"memory/request\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
849849
"refId": "D",
850850
"resultFormat": "time_series",
851851
"select": [
@@ -954,7 +954,7 @@
954954
}
955955
],
956956
"measurement": "memory/usage",
957-
"query": "SELECT sum(\"value\") FROM \"memory/usage\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
957+
"query": "SELECT mean(\"value\") FROM \"memory/usage\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
958958
"refId": "B",
959959
"resultFormat": "time_series",
960960
"select": [
@@ -1003,7 +1003,7 @@
10031003
}
10041004
],
10051005
"measurement": "memory/working_set",
1006-
"query": "SELECT sum(\"value\") FROM \"memory/working_set\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
1006+
"query": "SELECT mean(\"value\") FROM \"memory/working_set\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
10071007
"refId": "A",
10081008
"resultFormat": "time_series",
10091009
"select": [
@@ -1052,7 +1052,7 @@
10521052
}
10531053
],
10541054
"measurement": "memory/limit",
1055-
"query": "SELECT sum(\"value\") FROM \"memory/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
1055+
"query": "SELECT mean(\"value\") FROM \"memory/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
10561056
"refId": "C",
10571057
"resultFormat": "time_series",
10581058
"select": [
@@ -1101,7 +1101,7 @@
11011101
}
11021102
],
11031103
"measurement": "memory/request",
1104-
"query": "SELECT sum(\"value\") FROM \"memory/request\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
1104+
"query": "SELECT mean(\"value\") FROM \"memory/request\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
11051105
"refId": "D",
11061106
"resultFormat": "time_series",
11071107
"select": [
@@ -1218,7 +1218,7 @@
12181218
}
12191219
],
12201220
"measurement": "memory/usage",
1221-
"query": "SELECT sum(\"value\") FROM \"memory/usage\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
1221+
"query": "SELECT mean(\"value\") FROM \"memory/usage\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
12221222
"refId": "B",
12231223
"resultFormat": "time_series",
12241224
"select": [
@@ -1273,7 +1273,7 @@
12731273
}
12741274
],
12751275
"measurement": "memory/working_set",
1276-
"query": "SELECT sum(\"value\") FROM \"memory/working_set\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
1276+
"query": "SELECT mean(\"value\") FROM \"memory/working_set\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
12771277
"refId": "A",
12781278
"resultFormat": "time_series",
12791279
"select": [
@@ -1328,7 +1328,7 @@
13281328
}
13291329
],
13301330
"measurement": "memory/limit",
1331-
"query": "SELECT sum(\"value\") FROM \"memory/limit\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
1331+
"query": "SELECT mean(\"value\") FROM \"memory/limit\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
13321332
"refId": "C",
13331333
"resultFormat": "time_series",
13341334
"select": [
@@ -1383,7 +1383,7 @@
13831383
}
13841384
],
13851385
"measurement": "memory/request",
1386-
"query": "SELECT sum(\"value\") FROM \"memory/request\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
1386+
"query": "SELECT mean(\"value\") FROM \"memory/request\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
13871387
"refId": "D",
13881388
"resultFormat": "time_series",
13891389
"select": [
@@ -1492,7 +1492,7 @@
14921492
}
14931493
],
14941494
"measurement": "network/tx_rate",
1495-
"query": "SELECT sum(\"value\") FROM \"network/tx_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
1495+
"query": "SELECT mean(\"value\") FROM \"network/tx_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
14961496
"refId": "A",
14971497
"resultFormat": "time_series",
14981498
"select": [
@@ -1535,7 +1535,7 @@
15351535
}
15361536
],
15371537
"measurement": "network/rx_rate",
1538-
"query": "SELECT sum(\"value\") FROM \"network/rx_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
1538+
"query": "SELECT mean(\"value\") FROM \"network/rx_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
15391539
"refId": "B",
15401540
"resultFormat": "time_series",
15411541
"select": [
@@ -1644,7 +1644,7 @@
16441644
}
16451645
],
16461646
"measurement": "network/tx_rate",
1647-
"query": "SELECT sum(\"value\") FROM \"network/tx_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
1647+
"query": "SELECT mean(\"value\") FROM \"network/tx_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
16481648
"rawQuery": false,
16491649
"refId": "A",
16501650
"resultFormat": "time_series",
@@ -1694,7 +1694,7 @@
16941694
}
16951695
],
16961696
"measurement": "network/rx_rate",
1697-
"query": "SELECT sum(\"value\") FROM \"network/rx_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
1697+
"query": "SELECT mean(\"value\") FROM \"network/rx_rate\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
16981698
"rawQuery": false,
16991699
"refId": "B",
17001700
"resultFormat": "time_series",
@@ -1804,7 +1804,7 @@
18041804
}
18051805
],
18061806
"measurement": "network/tx_rate",
1807-
"query": "SELECT sum(\"value\") FROM \"network/tx_rate\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
1807+
"query": "SELECT mean(\"value\") FROM \"network/tx_rate\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
18081808
"rawQuery": false,
18091809
"refId": "A",
18101810
"resultFormat": "time_series",
@@ -1860,7 +1860,7 @@
18601860
}
18611861
],
18621862
"measurement": "network/rx_rate",
1863-
"query": "SELECT sum(\"value\") FROM \"network/rx_rate\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
1863+
"query": "SELECT mean(\"value\") FROM \"network/rx_rate\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
18641864
"rawQuery": false,
18651865
"refId": "B",
18661866
"resultFormat": "time_series",
@@ -1970,7 +1970,7 @@
19701970
}
19711971
],
19721972
"measurement": "filesystem/usage",
1973-
"query": "SELECT sum(\"value\") FROM \"filesystem/usage\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
1973+
"query": "SELECT mean(\"value\") FROM \"filesystem/usage\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
19741974
"refId": "A",
19751975
"resultFormat": "time_series",
19761976
"select": [
@@ -2013,7 +2013,7 @@
20132013
}
20142014
],
20152015
"measurement": "filesystem/limit",
2016-
"query": "SELECT sum(\"value\") FROM \"filesystem/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
2016+
"query": "SELECT mean(\"value\") FROM \"filesystem/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval) fill(null)",
20172017
"refId": "B",
20182018
"resultFormat": "time_series",
20192019
"select": [
@@ -2122,7 +2122,7 @@
21222122
}
21232123
],
21242124
"measurement": "filesystem/usage",
2125-
"query": "SELECT sum(\"value\") FROM \"filesystem/usage\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
2125+
"query": "SELECT mean(\"value\") FROM \"filesystem/usage\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
21262126
"refId": "A",
21272127
"resultFormat": "time_series",
21282128
"select": [
@@ -2171,7 +2171,7 @@
21712171
}
21722172
],
21732173
"measurement": "filesystem/limit",
2174-
"query": "SELECT sum(\"value\") FROM \"filesystem/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
2174+
"query": "SELECT mean(\"value\") FROM \"filesystem/limit\" WHERE \"type\" = 'node' AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
21752175
"refId": "B",
21762176
"resultFormat": "time_series",
21772177
"select": [
@@ -2280,7 +2280,7 @@
22802280
}
22812281
],
22822282
"measurement": "filesystem/usage",
2283-
"query": "SELECT sum(\"value\") FROM \"filesystem/usage\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
2283+
"query": "SELECT mean(\"value\") FROM \"filesystem/usage\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
22842284
"refId": "A",
22852285
"resultFormat": "time_series",
22862286
"select": [
@@ -2335,7 +2335,7 @@
23352335
}
23362336
],
23372337
"measurement": "filesystem/limit",
2338-
"query": "SELECT sum(\"value\") FROM \"filesystem/limit\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
2338+
"query": "SELECT mean(\"value\") FROM \"filesystem/limit\" WHERE \"type\" = 'node' AND \"nodename\" =~ /$nodename$/ AND $timeFilter GROUP BY time($interval), \"nodename\" fill(null)",
23392339
"refId": "B",
23402340
"resultFormat": "time_series",
23412341
"select": [

0 commit comments

Comments
 (0)