Skip to content

Commit 0a09344

Browse files
fnikolaifnikolai
committed
improve grafana plots
Signed-off-by: Fotis Nikolaidis <nikolaidis.fotis@gmail.com>
1 parent c0173df commit 0a09344

File tree

4 files changed

+1561
-1819
lines changed

4 files changed

+1561
-1819
lines changed

‎charts/federated-learning/fedbed/templates/framework.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ spec:
4848
- -c # Read from string
4949
- | # Multi-line str
5050
set -eux
51+
cut -d ' ' -f 4 /proc/self/stat > /dev/shm/app # Sidecar: use it for entering the cgroup
52+
5153
5254
python server.py
5355
@@ -109,6 +111,7 @@ spec:
109111
- -c # Read from string
110112
- | # Multi-line str
111113
set -eux
114+
cut -d ' ' -f 4 /proc/self/stat > /dev/shm/app # Sidecar: use it for entering the cgroup
112115
113116
# do it like that until I find a better way to go from fl.dataset.cifar10 to cifar10.
114117
FL_DATASET=$(basename {{"{{.inputs.parameters.dataset}}"}})

‎charts/system/dashboards/analytics.json‎

Lines changed: 72 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"gnetId": 315,
8888
"graphTooltip": 0,
8989
"id": 1,
90-
"iteration": 1656342183612,
90+
"iteration": 1670246624998,
9191
"links": [],
9292
"liveNow": false,
9393
"panels": [
@@ -163,6 +163,7 @@
163163
"exemplar": true,
164164
"expr": "sum(container_memory_working_set_bytes{node=~\"$node\"}) / max (machine_memory_bytes{node=~\"$node\"}) * 100",
165165
"hide": false,
166+
"instant": false,
166167
"interval": "",
167168
"legendFormat": "",
168169
"refId": "usage"
@@ -794,7 +795,7 @@
794795
"exemplar": true,
795796
"expr": "sum(max(machine_cpu_cores) by (node))",
796797
"format": "table",
797-
"instant": true,
798+
"instant": false,
798799
"interval": "",
799800
"intervalFactor": 1,
800801
"legendFormat": "",
@@ -953,8 +954,8 @@
953954
{
954955
"datasource": null,
955956
"gridPos": {
956-
"h": 6,
957-
"w": 24,
957+
"h": 8,
958+
"w": 6,
958959
"x": 0,
959960
"y": 10
960961
},
@@ -1051,7 +1052,8 @@
10511052
},
10521053
"custom": {
10531054
"align": "auto",
1054-
"displayMode": "auto"
1055+
"displayMode": "auto",
1056+
"filterable": false
10551057
},
10561058
"mappings": [],
10571059
"thresholds": {
@@ -1080,10 +1082,10 @@
10801082
"overrides": []
10811083
},
10821084
"gridPos": {
1083-
"h": 10,
1085+
"h": 8,
10841086
"w": 12,
1085-
"x": 0,
1086-
"y": 16
1087+
"x": 6,
1088+
"y": 10
10871089
},
10881090
"id": 74,
10891091
"options": {
@@ -1097,7 +1099,7 @@
10971099
"expr": "max(up) by (node, instance)",
10981100
"format": "table",
10991101
"hide": false,
1100-
"instant": true,
1102+
"instant": false,
11011103
"interval": "",
11021104
"intervalFactor": 1,
11031105
"legendFormat": "",
@@ -1108,15 +1110,44 @@
11081110
"timeShift": null,
11091111
"title": "Placement Table",
11101112
"transformations": [
1113+
{
1114+
"id": "groupBy",
1115+
"options": {
1116+
"fields": {
1117+
"Time": {
1118+
"aggregations": [
1119+
"first",
1120+
"last"
1121+
],
1122+
"operation": "aggregate"
1123+
},
1124+
"Value": {
1125+
"aggregations": [],
1126+
"operation": "groupby"
1127+
},
1128+
"instance": {
1129+
"aggregations": [],
1130+
"operation": "groupby"
1131+
},
1132+
"node": {
1133+
"aggregations": [],
1134+
"operation": "groupby"
1135+
}
1136+
}
1137+
}
1138+
},
11111139
{
11121140
"id": "organize",
11131141
"options": {
11141142
"excludeByName": {
1115-
"Time": true,
1143+
"Time": false,
11161144
"Value": true
11171145
},
11181146
"indexByName": {},
11191147
"renameByName": {
1148+
"Time": "Time",
1149+
"Time (first)": "Started",
1150+
"Time (last)": "To",
11201151
"Value": "",
11211152
"instance": "Instance",
11221153
"node": "Node"
@@ -1158,10 +1189,10 @@
11581189
"overrides": []
11591190
},
11601191
"gridPos": {
1161-
"h": 10,
1162-
"w": 12,
1163-
"x": 12,
1164-
"y": 16
1192+
"h": 8,
1193+
"w": 6,
1194+
"x": 18,
1195+
"y": 10
11651196
},
11661197
"id": 137,
11671198
"links": [],
@@ -1201,7 +1232,7 @@
12011232
"h": 1,
12021233
"w": 24,
12031234
"x": 0,
1204-
"y": 26
1235+
"y": 18
12051236
},
12061237
"id": 129,
12071238
"panels": [],
@@ -1214,7 +1245,7 @@
12141245
"h": 2,
12151246
"w": 24,
12161247
"x": 0,
1217-
"y": 27
1248+
"y": 19
12181249
},
12191250
"id": 119,
12201251
"options": {
@@ -1302,7 +1333,7 @@
13021333
"h": 9,
13031334
"w": 24,
13041335
"x": 0,
1305-
"y": 29
1336+
"y": 21
13061337
},
13071338
"id": 78,
13081339
"options": {
@@ -1397,7 +1428,7 @@
13971428
"h": 9,
13981429
"w": 24,
13991430
"x": 0,
1400-
"y": 38
1431+
"y": 30
14011432
},
14021433
"id": 110,
14031434
"options": {
@@ -1446,7 +1477,7 @@
14461477
"h": 1,
14471478
"w": 24,
14481479
"x": 0,
1449-
"y": 47
1480+
"y": 39
14501481
},
14511482
"id": 131,
14521483
"panels": [],
@@ -1459,7 +1490,7 @@
14591490
"h": 2,
14601491
"w": 24,
14611492
"x": 0,
1462-
"y": 48
1493+
"y": 40
14631494
},
14641495
"id": 134,
14651496
"options": {
@@ -1586,7 +1617,7 @@
15861617
"h": 8,
15871618
"w": 24,
15881619
"x": 0,
1589-
"y": 50
1620+
"y": 42
15901621
},
15911622
"id": 109,
15921623
"links": [],
@@ -1686,7 +1717,7 @@
16861717
"h": 8,
16871718
"w": 24,
16881719
"x": 0,
1689-
"y": 58
1720+
"y": 50
16901721
},
16911722
"id": 112,
16921723
"links": [],
@@ -1778,7 +1809,7 @@
17781809
"h": 8,
17791810
"w": 24,
17801811
"x": 0,
1781-
"y": 66
1812+
"y": 58
17821813
},
17831814
"id": 139,
17841815
"links": [],
@@ -1869,7 +1900,7 @@
18691900
"h": 8,
18701901
"w": 24,
18711902
"x": 0,
1872-
"y": 74
1903+
"y": 66
18731904
},
18741905
"id": 140,
18751906
"links": [],
@@ -1960,7 +1991,7 @@
19601991
"h": 8,
19611992
"w": 24,
19621993
"x": 0,
1963-
"y": 82
1994+
"y": 74
19641995
},
19651996
"id": 141,
19661997
"links": [],
@@ -2012,7 +2043,7 @@
20122043
"h": 8,
20132044
"w": 24,
20142045
"x": 0,
2015-
"y": 90
2046+
"y": 82
20162047
},
20172048
"heatmap": {},
20182049
"hideZeroBuckets": false,
@@ -2118,7 +2149,7 @@
21182149
"h": 8,
21192150
"w": 24,
21202151
"x": 0,
2121-
"y": 98
2152+
"y": 90
21222153
},
21232154
"id": 126,
21242155
"links": [],
@@ -2159,7 +2190,7 @@
21592190
"h": 1,
21602191
"w": 24,
21612192
"x": 0,
2162-
"y": 106
2193+
"y": 98
21632194
},
21642195
"id": 133,
21652196
"panels": [],
@@ -2172,7 +2203,7 @@
21722203
"h": 2,
21732204
"w": 24,
21742205
"x": 0,
2175-
"y": 107
2206+
"y": 99
21762207
},
21772208
"id": 122,
21782209
"options": {
@@ -2255,7 +2286,7 @@
22552286
"h": 11,
22562287
"w": 24,
22572288
"x": 0,
2258-
"y": 109
2289+
"y": 101
22592290
},
22602291
"id": 123,
22612292
"links": [],
@@ -2360,7 +2391,7 @@
23602391
"h": 11,
23612392
"w": 24,
23622393
"x": 0,
2363-
"y": 120
2394+
"y": 112
23642395
},
23652396
"id": 113,
23662397
"links": [],
@@ -2456,7 +2487,7 @@
24562487
"h": 11,
24572488
"w": 24,
24582489
"x": 0,
2459-
"y": 131
2490+
"y": 123
24602491
},
24612492
"id": 115,
24622493
"links": [],
@@ -2560,7 +2591,7 @@
25602591
"h": 11,
25612592
"w": 24,
25622593
"x": 0,
2563-
"y": 142
2594+
"y": 134
25642595
},
25652596
"id": 117,
25662597
"links": [],
@@ -2667,7 +2698,7 @@
26672698
"h": 11,
26682699
"w": 24,
26692700
"x": 0,
2670-
"y": 153
2701+
"y": 145
26712702
},
26722703
"id": 114,
26732704
"links": [],
@@ -2773,7 +2804,7 @@
27732804
"h": 11,
27742805
"w": 24,
27752806
"x": 0,
2776-
"y": 164
2807+
"y": 156
27772808
},
27782809
"id": 118,
27792810
"links": [],
@@ -2831,7 +2862,7 @@
28312862
"h": 11,
28322863
"w": 24,
28332864
"x": 0,
2834-
"y": 175
2865+
"y": 167
28352866
},
28362867
"heatmap": {},
28372868
"hideZeroBuckets": true,
@@ -2949,7 +2980,7 @@
29492980
"h": 11,
29502981
"w": 24,
29512982
"x": 0,
2952-
"y": 186
2983+
"y": 178
29532984
},
29542985
"id": 121,
29552986
"links": [],
@@ -3080,7 +3111,7 @@
30803111
"h": 11,
30813112
"w": 24,
30823113
"x": 0,
3083-
"y": 197
3114+
"y": 189
30843115
},
30853116
"id": 125,
30863117
"links": [],
@@ -3134,7 +3165,7 @@
31343165
"h": 1,
31353166
"w": 24,
31363167
"x": 0,
3137-
"y": 208
3168+
"y": 200
31383169
},
31393170
"id": 136,
31403171
"panels": [],
@@ -3224,7 +3255,7 @@
32243255
"h": 11,
32253256
"w": 24,
32263257
"x": 0,
3227-
"y": 209
3258+
"y": 201
32283259
},
32293260
"id": 97,
32303261
"links": [],
@@ -3355,7 +3386,7 @@
33553386
"h": 11,
33563387
"w": 24,
33573388
"x": 0,
3358-
"y": 220
3389+
"y": 212
33593390
},
33603391
"id": 100,
33613392
"links": [],

0 commit comments

Comments
 (0)