Skip to content

Commit b2ba8b8

Browse files
committed
Fix #34712: add descriptions to dashboards
1 parent 90bddb3 commit b2ba8b8

File tree

9 files changed

+559
-68
lines changed

9 files changed

+559
-68
lines changed

overlays/monitoring/components/container-sharing/configs/dashboards/shinyproxy-delegate-app-logs.json

Lines changed: 60 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,63 @@
2727
"graphTooltip": 0,
2828
"links": [],
2929
"panels": [
30+
{
31+
"collapsed": false,
32+
"gridPos": {
33+
"h": 1,
34+
"w": 24,
35+
"x": 0,
36+
"y": 0
37+
},
38+
"id": 11,
39+
"panels": [],
40+
"title": "Description",
41+
"type": "row"
42+
},
43+
{
44+
"fieldConfig": {
45+
"defaults": {},
46+
"overrides": []
47+
},
48+
"gridPos": {
49+
"h": 7,
50+
"w": 24,
51+
"x": 0,
52+
"y": 1
53+
},
54+
"id": 12,
55+
"options": {
56+
"code": {
57+
"language": "plaintext",
58+
"showLineNumbers": false,
59+
"showMiniMap": false
60+
},
61+
"content": "This dashboard shows the logs of delegate apps. This are the containers used by apps using pre-initialization or container-sharing.\n\n**Tips:**\n\n- use the filters on the top of page\n- the app metadata is only shown when a single id is selected\n- change the time range in the top-right corner of the page\n- disable the automatic refresh (in the top-right corner) if the dashboard takes a long time to load\n- when the time range exceeds 7 days, the dashboard might fail to load the data\n- use the calendar button (in the time range selector) to load data on specific dates or times\n- click on a log line to see the app id and other metadata",
62+
"mode": "markdown"
63+
},
64+
"pluginVersion": "11.6.1",
65+
"title": "",
66+
"type": "text"
67+
},
68+
{
69+
"collapsed": false,
70+
"gridPos": {
71+
"h": 1,
72+
"w": 24,
73+
"x": 0,
74+
"y": 8
75+
},
76+
"id": 10,
77+
"panels": [],
78+
"title": "",
79+
"type": "row"
80+
},
3081
{
3182
"datasource": {
3283
"type": "prometheus",
3384
"uid": "${prometheus}"
3485
},
35-
"description": "",
86+
"description": "The time at which the delegate app was (automatically) launched. Only shown if a single id is selected. ",
3687
"fieldConfig": {
3788
"defaults": {
3889
"color": {
@@ -61,7 +112,7 @@
61112
"h": 2,
62113
"w": 4,
63114
"x": 0,
64-
"y": 0
115+
"y": 9
65116
},
66117
"id": 4,
67118
"options": {
@@ -83,6 +134,7 @@
83134
"wideLayout": true
84135
},
85136
"pluginVersion": "8.5.6",
137+
"maxDataPoints": 10000,
86138
"targets": [
87139
{
88140
"datasource": {
@@ -119,7 +171,7 @@
119171
"type": "prometheus",
120172
"uid": "${prometheus}"
121173
},
122-
"description": "",
174+
"description": "The id of the application spec. Only shown if a single id is selected.",
123175
"fieldConfig": {
124176
"defaults": {
125177
"color": {
@@ -148,7 +200,7 @@
148200
"h": 2,
149201
"w": 4,
150202
"x": 4,
151-
"y": 0
203+
"y": 9
152204
},
153205
"id": 6,
154206
"options": {
@@ -207,7 +259,7 @@
207259
"type": "prometheus",
208260
"uid": "${prometheus}"
209261
},
210-
"description": "",
262+
"description": "The status of the app. It can take up to two minutes for the status to change. Only shown if a single id is selected. \n",
211263
"fieldConfig": {
212264
"defaults": {
213265
"color": {
@@ -250,7 +302,7 @@
250302
"h": 2,
251303
"w": 4,
252304
"x": 8,
253-
"y": 0
305+
"y": 9
254306
},
255307
"id": 5,
256308
"options": {
@@ -296,6 +348,7 @@
296348
"type": "loki",
297349
"uid": "${datasource}"
298350
},
351+
"description": "The logs related to the application. Log lines containing `[ShinyProxy]` are generated by ShinyProxy. Log lines containing `[App]` are generated by the app container.",
299352
"fieldConfig": {
300353
"defaults": {},
301354
"overrides": []
@@ -304,7 +357,7 @@
304357
"h": 27,
305358
"w": 24,
306359
"x": 0,
307-
"y": 2
360+
"y": 11
308361
},
309362
"id": 2,
310363
"options": {

overlays/monitoring/components/container-sharing/configs/dashboards/shinyproxy-delegate-app-resources.json

Lines changed: 65 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,63 @@
2727
"graphTooltip": 0,
2828
"links": [],
2929
"panels": [
30+
{
31+
"collapsed": false,
32+
"gridPos": {
33+
"h": 1,
34+
"w": 24,
35+
"x": 0,
36+
"y": 0
37+
},
38+
"id": 11,
39+
"panels": [],
40+
"title": "Description",
41+
"type": "row"
42+
},
43+
{
44+
"fieldConfig": {
45+
"defaults": {},
46+
"overrides": []
47+
},
48+
"gridPos": {
49+
"h": 7,
50+
"w": 24,
51+
"x": 0,
52+
"y": 1
53+
},
54+
"id": 12,
55+
"options": {
56+
"code": {
57+
"language": "plaintext",
58+
"showLineNumbers": false,
59+
"showMiniMap": false
60+
},
61+
"content": "This dashboard shows the resources (CPU and memory) consumed by delegate apps. This are the containers used by apps using pre-initialization or container-sharing.\n\n\n**Tips:**\n\n- use the filters on the top of page\n- the app metadata is only shown when a single id is selected\n- change the time range in the top-right corner of the page\n- disable the automatic refresh (in the top-right corner) if the dashboard takes a long time to load\n- when the time range exceeds 7 days, the dashboard might fail to load the data\n- use the calendar button (in the time range selector) to load data on specific dates or times\n- select a single id to view the exact values \n- some panels might be empty when an app fails to startup or crashes shortly (1-2 minutes) after startup",
62+
"mode": "markdown"
63+
},
64+
"pluginVersion": "11.6.1",
65+
"title": "",
66+
"type": "text"
67+
},
68+
{
69+
"collapsed": false,
70+
"gridPos": {
71+
"h": 1,
72+
"w": 24,
73+
"x": 0,
74+
"y": 8
75+
},
76+
"id": 10,
77+
"panels": [],
78+
"title": "",
79+
"type": "row"
80+
},
3081
{
3182
"datasource": {
3283
"type": "prometheus",
3384
"uid": "${datasource}"
3485
},
35-
"description": "",
86+
"description": "The time at which the delegate app was (automatically) launched. Only shown if a single id is selected. ",
3687
"fieldConfig": {
3788
"defaults": {
3889
"color": {
@@ -60,7 +111,7 @@
60111
"h": 2,
61112
"w": 4,
62113
"x": 0,
63-
"y": 0
114+
"y": 9
64115
},
65116
"id": 4,
66117
"options": {
@@ -119,7 +170,7 @@
119170
"type": "prometheus",
120171
"uid": "${datasource}"
121172
},
122-
"description": "",
173+
"description": "The id of the application spec. Only shown if a single id is selected.",
123174
"fieldConfig": {
124175
"defaults": {
125176
"color": {
@@ -148,7 +199,7 @@
148199
"h": 2,
149200
"w": 4,
150201
"x": 4,
151-
"y": 0
202+
"y": 9
152203
},
153204
"id": 13,
154205
"options": {
@@ -207,7 +258,7 @@
207258
"type": "prometheus",
208259
"uid": "${datasource}"
209260
},
210-
"description": "",
261+
"description": "The status of the app. It can take up to two minutes for the status to change. Only shown if a single id is selected. \n",
211262
"fieldConfig": {
212263
"defaults": {
213264
"color": {
@@ -250,7 +301,7 @@
250301
"h": 2,
251302
"w": 4,
252303
"x": 8,
253-
"y": 0
304+
"y": 9
254305
},
255306
"id": 5,
256307
"options": {
@@ -296,6 +347,7 @@
296347
"type": "prometheus",
297348
"uid": "${datasource}"
298349
},
350+
"description": "The CPU usage of an app. The requests and limits are summed for all instances. Select a single id to view the exact requests and limits for an app.",
299351
"fieldConfig": {
300352
"defaults": {
301353
"color": {
@@ -418,7 +470,7 @@
418470
"h": 6,
419471
"w": 24,
420472
"x": 0,
421-
"y": 2
473+
"y": 11
422474
},
423475
"id": 6,
424476
"interval": "1m",
@@ -487,6 +539,7 @@
487539
"type": "prometheus",
488540
"uid": "${datasource}"
489541
},
542+
"description": "The CPU throttling of an app. An app is throttled when it tries to user more CPU resources than allowed by the `container-cpu-limit` setting. If no `container-cpu-limit` is configured, the panel will show the text `No data`.",
490543
"fieldConfig": {
491544
"defaults": {
492545
"color": {
@@ -549,7 +602,7 @@
549602
"h": 5,
550603
"w": 24,
551604
"x": 0,
552-
"y": 8
605+
"y": 17
553606
},
554607
"id": 8,
555608
"interval": "1m",
@@ -593,6 +646,7 @@
593646
"type": "prometheus",
594647
"uid": "${datasource}"
595648
},
649+
"description": "The memory usage of an app. The requests and limits are summed for all instances. Select a single id to view the exact requests and limits for an app.",
596650
"fieldConfig": {
597651
"defaults": {
598652
"color": {
@@ -735,7 +789,7 @@
735789
"h": 6,
736790
"w": 24,
737791
"x": 0,
738-
"y": 13
792+
"y": 22
739793
},
740794
"id": 12,
741795
"interval": "1m",
@@ -808,6 +862,7 @@
808862
"type": "prometheus",
809863
"uid": "${datasource}"
810864
},
865+
"description": "",
811866
"fieldConfig": {
812867
"defaults": {
813868
"color": {
@@ -899,7 +954,7 @@
899954
"h": 6,
900955
"w": 24,
901956
"x": 0,
902-
"y": 19
957+
"y": 28
903958
},
904959
"id": 10,
905960
"options": {

0 commit comments

Comments
 (0)