Skip to content

Commit 36d0ac4

Browse files
LEDfanLEDfan
committed
Fix #35061: rename delegate_app_info to delegate_app_status
1 parent 66780dd commit 36d0ac4

3 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎src/main/resources/configs/docker/monitoring/grafana/dashboards/shinyproxy-delegate-app-logs.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
},
9292
"editorMode": "code",
9393
"exemplar": false,
94-
"expr": "max(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}) by (proxy_created_timestamp)",
94+
"expr": "max(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}) by (proxy_created_timestamp)",
9595
"format": "table",
9696
"instant": false,
9797
"range": true,
@@ -178,7 +178,7 @@
178178
},
179179
"editorMode": "code",
180180
"exemplar": false,
181-
"expr": "max(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}) by (spec_id)",
181+
"expr": "max(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}) by (spec_id)",
182182
"format": "table",
183183
"instant": false,
184184
"range": true,
@@ -279,7 +279,7 @@
279279
},
280280
"editorMode": "code",
281281
"exemplar": false,
282-
"expr": "delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}",
282+
"expr": "delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}",
283283
"format": "table",
284284
"instant": false,
285285
"range": true,
@@ -368,13 +368,13 @@
368368
"type": "prometheus",
369369
"uid": "${prometheus}"
370370
},
371-
"definition": "label_values(delegate_app_info, proxy_namespace)",
371+
"definition": "label_values(delegate_app_status, proxy_namespace)",
372372
"includeAll": true,
373373
"multi": true,
374374
"name": "namespace",
375375
"options": [],
376376
"query": {
377-
"query": "label_values(delegate_app_info, proxy_namespace)",
377+
"query": "label_values(delegate_app_status, proxy_namespace)",
378378
"refId": "StandardVariableQuery"
379379
},
380380
"refresh": 2,
@@ -390,13 +390,13 @@
390390
"type": "prometheus",
391391
"uid": "${prometheus}"
392392
},
393-
"definition": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\"}, shinyproxy_realm)",
393+
"definition": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\"}, shinyproxy_realm)",
394394
"includeAll": true,
395395
"multi": true,
396396
"name": "realm",
397397
"options": [],
398398
"query": {
399-
"query": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\"}, shinyproxy_realm)",
399+
"query": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\"}, shinyproxy_realm)",
400400
"refId": "StandardVariableQuery"
401401
},
402402
"refresh": 2,
@@ -412,13 +412,13 @@
412412
"type": "prometheus",
413413
"uid": "${prometheus}"
414414
},
415-
"definition": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\"}, spec_id)",
415+
"definition": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\"}, spec_id)",
416416
"includeAll": true,
417417
"multi": true,
418418
"name": "app",
419419
"options": [],
420420
"query": {
421-
"query": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\"}, spec_id)",
421+
"query": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\"}, spec_id)",
422422
"refId": "StandardVariableQuery"
423423
},
424424
"refresh": 2,
@@ -433,13 +433,13 @@
433433
"type": "prometheus",
434434
"uid": "${prometheus}"
435435
},
436-
"definition": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\"}, proxy_id)",
436+
"definition": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\"}, proxy_id)",
437437
"includeAll": true,
438438
"multi": true,
439439
"name": "id",
440440
"options": [],
441441
"query": {
442-
"query": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\"}, proxy_id)",
442+
"query": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\"}, proxy_id)",
443443
"refId": "StandardVariableQuery"
444444
},
445445
"refresh": 2,

‎src/main/resources/configs/docker/monitoring/grafana/dashboards/shinyproxy-delegate-app-resources.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
},
9191
"editorMode": "code",
9292
"exemplar": false,
93-
"expr": "max(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}) by (proxy_created_timestamp)",
93+
"expr": "max(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}) by (proxy_created_timestamp)",
9494
"format": "table",
9595
"instant": false,
9696
"range": true,
@@ -177,7 +177,7 @@
177177
},
178178
"editorMode": "code",
179179
"exemplar": false,
180-
"expr": "max(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}) by (spec_id)",
180+
"expr": "max(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}) by (spec_id)",
181181
"format": "table",
182182
"instant": false,
183183
"range": true,
@@ -278,7 +278,7 @@
278278
},
279279
"editorMode": "code",
280280
"exemplar": false,
281-
"expr": "delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}",
281+
"expr": "delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", spec_id=~\"$app\", proxy_id=\"$id\"}",
282282
"format": "table",
283283
"instant": false,
284284
"range": true,
@@ -949,13 +949,13 @@
949949
"type": "prometheus",
950950
"uid": "${datasource}"
951951
},
952-
"definition": "label_values(delegate_app_info, proxy_namespace)",
952+
"definition": "label_values(delegate_app_status, proxy_namespace)",
953953
"includeAll": true,
954954
"multi": true,
955955
"name": "namespace",
956956
"options": [],
957957
"query": {
958-
"query": "label_values(delegate_app_info, proxy_namespace)",
958+
"query": "label_values(delegate_app_status, proxy_namespace)",
959959
"refId": "StandardVariableQuery"
960960
},
961961
"refresh": 2,
@@ -971,13 +971,13 @@
971971
"type": "prometheus",
972972
"uid": "${datasource}"
973973
},
974-
"definition": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\"}, shinyproxy_realm)",
974+
"definition": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\"}, shinyproxy_realm)",
975975
"includeAll": true,
976976
"multi": true,
977977
"name": "realm",
978978
"options": [],
979979
"query": {
980-
"query": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\"}, shinyproxy_realm)",
980+
"query": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\"}, shinyproxy_realm)",
981981
"refId": "StandardVariableQuery"
982982
},
983983
"refresh": 2,
@@ -993,13 +993,13 @@
993993
"type": "prometheus",
994994
"uid": "${datasource}"
995995
},
996-
"definition": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\"}, spec_id)",
996+
"definition": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\"}, spec_id)",
997997
"includeAll": true,
998998
"multi": true,
999999
"name": "app",
10001000
"options": [],
10011001
"query": {
1002-
"query": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\"}, spec_id)",
1002+
"query": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\"}, spec_id)",
10031003
"refId": "StandardVariableQuery"
10041004
},
10051005
"refresh": 2,
@@ -1014,13 +1014,13 @@
10141014
"type": "prometheus",
10151015
"uid": "${datasource}"
10161016
},
1017-
"definition": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\"}, proxy_id)",
1017+
"definition": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\"}, proxy_id)",
10181018
"includeAll": true,
10191019
"multi": true,
10201020
"name": "id",
10211021
"options": [],
10221022
"query": {
1023-
"query": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\"}, proxy_id)",
1023+
"query": "label_values(delegate_app_status{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\"}, proxy_id)",
10241024
"refId": "StandardVariableQuery"
10251025
},
10261026
"refresh": 2,

‎src/main/resources/configs/docker/monitoring/grafana/dashboards/shinyproxy-seats.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,14 @@
287287
"type": "prometheus",
288288
"uid": "${datasource}"
289289
},
290-
"definition": "label_values(delegate_app_info,proxy_namespace)",
290+
"definition": "label_values(delegate_app_status,proxy_namespace)",
291291
"includeAll": true,
292292
"multi": true,
293293
"name": "namespace",
294294
"options": [],
295295
"query": {
296296
"qryType": 1,
297-
"query": "label_values(delegate_app_info,proxy_namespace)",
297+
"query": "label_values(delegate_app_status,proxy_namespace)",
298298
"refId": "PrometheusVariableQueryEditor-VariableQuery"
299299
},
300300
"refresh": 2,
@@ -310,14 +310,14 @@
310310
"type": "prometheus",
311311
"uid": "${datasource}"
312312
},
313-
"definition": "label_values(delegate_app_info{proxy_namespace=~\"$namespace\"},shinyproxy_realm)",
313+
"definition": "label_values(delegate_app_status{proxy_namespace=~\"$namespace\"},shinyproxy_realm)",
314314
"includeAll": true,
315315
"multi": true,
316316
"name": "realm",
317317
"options": [],
318318
"query": {
319319
"qryType": 1,
320-
"query": "label_values(delegate_app_info{proxy_namespace=~\"$namespace\"},shinyproxy_realm)",
320+
"query": "label_values(delegate_app_status{proxy_namespace=~\"$namespace\"},shinyproxy_realm)",
321321
"refId": "PrometheusVariableQueryEditor-VariableQuery"
322322
},
323323
"refresh": 2,
@@ -333,14 +333,14 @@
333333
"type": "prometheus",
334334
"uid": "${datasource}"
335335
},
336-
"definition": "label_values(delegate_app_info{proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\"},shinyproxy_instance)",
336+
"definition": "label_values(delegate_app_status{proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\"},shinyproxy_instance)",
337337
"includeAll": true,
338338
"multi": true,
339339
"name": "instance",
340340
"options": [],
341341
"query": {
342342
"qryType": 1,
343-
"query": "label_values(delegate_app_info{proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\"},shinyproxy_instance)",
343+
"query": "label_values(delegate_app_status{proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\"},shinyproxy_instance)",
344344
"refId": "PrometheusVariableQueryEditor-VariableQuery"
345345
},
346346
"refresh": 2,
@@ -356,15 +356,15 @@
356356
"type": "prometheus",
357357
"uid": "${datasource}"
358358
},
359-
"definition": "label_values(delegate_app_info{proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", shinyproxy_instance=~\"$instance\"},spec_id)",
359+
"definition": "label_values(delegate_app_status{proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", shinyproxy_instance=~\"$instance\"},spec_id)",
360360
"includeAll": true,
361361
"label": "app",
362362
"multi": true,
363363
"name": "spec_id",
364364
"options": [],
365365
"query": {
366366
"qryType": 1,
367-
"query": "label_values(delegate_app_info{proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", shinyproxy_instance=~\"$instance\"},spec_id)",
367+
"query": "label_values(delegate_app_status{proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", shinyproxy_instance=~\"$instance\"},spec_id)",
368368
"refId": "PrometheusVariableQueryEditor-VariableQuery"
369369
},
370370
"refresh": 2,

0 commit comments

Comments
 (0)