Skip to content

Commit 8580e83

Browse files
LEDfanLEDfan
committed
Fix #35057: load multiple apps in app logs and resources
1 parent 68e2fbb commit 8580e83

4 files changed

Lines changed: 39 additions & 58 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@
507507
"type": "loki",
508508
"uid": "${datasource}"
509509
},
510-
"expr": "{sp_realm_id=~\".+\", namespace=~\"$namespace\", sp_realm_id=~\"$realm\", sp_proxy_id=\"$id\", sp_proxy_id!=\"\"} | line_format `[App]: {{ __line__ }}` |~ `(?i)$filter`",
510+
"expr": "{sp_realm_id=~\".+\", namespace=~\"$namespace\", sp_realm_id=~\"$realm\", sp_proxy_id=~\"$id\", sp_proxy_id!=\"\"} | line_format `[App]: {{ __line__ }}` |~ `(?i)$filter`",
511511
"legendFormat": "",
512512
"refId": "A"
513513
},
@@ -516,7 +516,7 @@
516516
"type": "loki",
517517
"uid": "${datasource}"
518518
},
519-
"expr": "{app=\"shinyproxy\", sp_realm_id=~\"$realm\"} | json | proxyId!=\"\" | proxyId=\"$id\" | line_format `[ShinyProxy] {{.level}}: {{.message}} {{.stack_trace}}` |~ `(?i)$filter`",
519+
"expr": "{app=\"shinyproxy\", sp_realm_id=~\"$realm\"} | json | proxyId!=\"\" | proxyId=~\"$id\" | line_format `[ShinyProxy] {{.level}}: {{.message}} {{.stack_trace}}` |~ `(?i)$filter`",
520520
"hide": false,
521521
"legendFormat": "",
522522
"refId": "B"
@@ -669,8 +669,8 @@
669669
},
670670
"definition": "label_values(appInfo{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", user_id=~\"$user\", spec_id=~\"$app\", proxy_instance=~\"$instance\"}, proxy_id)",
671671
"hide": 0,
672-
"includeAll": false,
673-
"multi": false,
672+
"includeAll": true,
673+
"multi": true,
674674
"name": "id",
675675
"options": [],
676676
"query": {

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -629,10 +629,10 @@
629629
"uid": "${prometheus}"
630630
},
631631
"editorMode": "code",
632-
"expr": "irate(container_cpu_usage_seconds_total{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[5m])",
632+
"expr": "irate(container_cpu_usage_seconds_total{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[5m])",
633633
"format": "time_series",
634634
"intervalFactor": 2,
635-
"legendFormat": "CPU Usage",
635+
"legendFormat": "CPU Usage {{container_label_openanalytics_eu_sp_proxy_id}}",
636636
"range": true,
637637
"refId": "A",
638638
"step": 10
@@ -643,7 +643,7 @@
643643
"uid": "${prometheus}"
644644
},
645645
"editorMode": "code",
646-
"expr": "container_spec_cpu_quota{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} / 100000",
646+
"expr": "container_spec_cpu_quota{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} / 100000",
647647
"format": "time_series",
648648
"intervalFactor": 2,
649649
"legendFormat": "limits",
@@ -749,10 +749,10 @@
749749
"uid": "${prometheus}"
750750
},
751751
"editorMode": "code",
752-
"expr": "sum(increase(container_cpu_cfs_throttled_periods_total{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[$__rate_interval])) /sum(increase(container_cpu_cfs_periods_total{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[$__rate_interval]))",
752+
"expr": "sum(increase(container_cpu_cfs_throttled_periods_total{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[$__rate_interval])) /sum(increase(container_cpu_cfs_periods_total{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[$__rate_interval]))",
753753
"format": "time_series",
754754
"intervalFactor": 2,
755-
"legendFormat": "CPU Throttling",
755+
"legendFormat": "CPU Throttling {{container_label_openanalytics_eu_sp_proxy_id}}",
756756
"range": true,
757757
"refId": "A",
758758
"step": 10
@@ -935,10 +935,10 @@
935935
"uid": "${prometheus}"
936936
},
937937
"editorMode": "code",
938-
"expr": "sum(container_memory_working_set_bytes{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}) by (container)",
938+
"expr": "sum(container_memory_working_set_bytes{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}) by (container_label_openanalytics_eu_sp_proxy_id)",
939939
"format": "time_series",
940940
"intervalFactor": 2,
941-
"legendFormat": "Memory Usage",
941+
"legendFormat": "Memory Usage {{container_label_openanalytics_eu_sp_proxy_id}}",
942942
"range": true,
943943
"refId": "A",
944944
"step": 10
@@ -950,7 +950,7 @@
950950
},
951951
"editorMode": "code",
952952
"exemplar": true,
953-
"expr": "container_spec_memory_reservation_limit_bytes{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} > 0",
953+
"expr": "sum(container_spec_memory_reservation_limit_bytes{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} > 0)",
954954
"format": "time_series",
955955
"interval": "",
956956
"intervalFactor": 2,
@@ -964,8 +964,7 @@
964964
"type": "prometheus",
965965
"uid": "${prometheus}"
966966
},
967-
"editorMode": "code",
968-
"expr": "container_spec_memory_limit_bytes{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} > 0",
967+
"expr": "sum(container_spec_memory_limit_bytes{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} > 0)",
969968
"format": "time_series",
970969
"intervalFactor": 2,
971970
"legendFormat": "limits",
@@ -1099,8 +1098,8 @@
10991098
"uid": "${prometheus}"
11001099
},
11011100
"editorMode": "code",
1102-
"expr": "container_network_receive_bytes_total{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}",
1103-
"legendFormat": "Receive",
1101+
"expr": "sum(container_network_receive_bytes_total{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}) by (container_label_openanalytics_eu_sp_proxy_id)",
1102+
"legendFormat": "Receive {{container_label_openanalytics_eu_sp_proxy_id}}",
11041103
"range": true,
11051104
"refId": "A"
11061105
},
@@ -1111,10 +1110,10 @@
11111110
},
11121111
"editorMode": "code",
11131112
"exemplar": false,
1114-
"expr": "container_network_transmit_bytes_total{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}",
1113+
"expr": "sum(container_network_transmit_bytes_total{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}) by (container_label_openanalytics_eu_sp_proxy_id)",
11151114
"hide": false,
11161115
"interval": "",
1117-
"legendFormat": "Transmit",
1116+
"legendFormat": "Transmit {{container_label_openanalytics_eu_sp_proxy_id}}",
11181117
"range": true,
11191118
"refId": "B"
11201119
}
@@ -1247,7 +1246,8 @@
12471246
"uid": "${prometheus}"
12481247
},
12491248
"definition": "label_values(appInfo{job=~\".+\",proxy_namespace=~\"$namespace\", shinyproxy_realm=~\"$realm\", user_id=~\"$user\", spec_id=~\"$app\", proxy_instance=~\"$instance\"}, proxy_id)",
1250-
"includeAll": false,
1249+
"includeAll": true,
1250+
"multi": true,
12511251
"name": "id",
12521252
"options": [],
12531253
"query": {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@
323323
"type": "loki",
324324
"uid": "${datasource}"
325325
},
326-
"expr": "{sp_realm_id=~\".+\", namespace=~\"$namespace\", sp_realm_id=~\"$realm\", sp_proxy_id=\"$id\", sp_proxy_id!=\"\"} | line_format `[App]: {{ __line__ }}` |~ `(?i)$filter`",
326+
"expr": "{sp_realm_id=~\".+\", namespace=~\"$namespace\", sp_realm_id=~\"$realm\", sp_proxy_id=~\"$id\", sp_proxy_id!=\"\"} | line_format `[App]: {{ __line__ }}` |~ `(?i)$filter`",
327327
"legendFormat": "",
328328
"refId": "A"
329329
},
@@ -332,7 +332,7 @@
332332
"type": "loki",
333333
"uid": "${datasource}"
334334
},
335-
"expr": "{app=\"shinyproxy\", namespace=~\"$namespace\", sp_realm_id=~\"$realm\"} | json | delegateProxyId!=\"\" | delegateProxyId=\"$id\" | line_format `[ShinyProxy] {{.level}}: {{.message}} {{.stack_trace}}` |~ `(?i)$filter`",
335+
"expr": "{app=\"shinyproxy\", namespace=~\"$namespace\", sp_realm_id=~\"$realm\"} | json | delegateProxyId!=\"\" | delegateProxyId=~\"$id\" | line_format `[ShinyProxy] {{.level}}: {{.message}} {{.stack_trace}}` |~ `(?i)$filter`",
336336
"hide": false,
337337
"legendFormat": "",
338338
"refId": "B"
@@ -343,7 +343,7 @@
343343
"uid": "${datasource}"
344344
},
345345
"editorMode": "code",
346-
"expr": "{app=\"shinyproxy\", namespace=~\"$namespace\", sp_realm_id=~\"$realm\"} | json | proxyId!=\"\" | proxyId=\"$id\" | line_format `[ShinyProxy] {{.level}}: {{.message}} {{.stack_trace}}` |~ `(?i)$filter`",
346+
"expr": "{app=\"shinyproxy\", namespace=~\"$namespace\", sp_realm_id=~\"$realm\"} | json | proxyId!=\"\" | proxyId=~\"$id\" | line_format `[ShinyProxy] {{.level}}: {{.message}} {{.stack_trace}}` |~ `(?i)$filter`",
347347
"hide": false,
348348
"legendFormat": "",
349349
"queryType": "range",
@@ -434,7 +434,8 @@
434434
"uid": "${prometheus}"
435435
},
436436
"definition": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\"}, proxy_id)",
437-
"includeAll": false,
437+
"includeAll": true,
438+
"multi": true,
438439
"name": "id",
439440
"options": [],
440441
"query": {

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

Lines changed: 15 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -442,10 +442,10 @@
442442
"uid": "${datasource}"
443443
},
444444
"editorMode": "code",
445-
"expr": "irate(container_cpu_usage_seconds_total{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[5m])",
445+
"expr": "sum(irate(container_cpu_usage_seconds_total{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[5m])) by (container_label_openanalytics_eu_sp_proxy_id)",
446446
"format": "time_series",
447447
"intervalFactor": 2,
448-
"legendFormat": "CPU Usage",
448+
"legendFormat": "CPU Usage {{container_label_openanalytics_eu_sp_proxy_id}}",
449449
"range": true,
450450
"refId": "A",
451451
"step": 10
@@ -456,7 +456,7 @@
456456
"uid": "${datasource}"
457457
},
458458
"editorMode": "code",
459-
"expr": "container_spec_cpu_quota{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} / 100000",
459+
"expr": "sum(container_spec_cpu_quota{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} / 100000)",
460460
"format": "time_series",
461461
"intervalFactor": 2,
462462
"legendFormat": "limits",
@@ -562,10 +562,10 @@
562562
"uid": "${datasource}"
563563
},
564564
"editorMode": "code",
565-
"expr": "sum(increase(container_cpu_cfs_throttled_periods_total{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[$__rate_interval])) /sum(increase(container_cpu_cfs_periods_total{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[$__rate_interval]))",
565+
"expr": "sum(increase(container_cpu_cfs_throttled_periods_total{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[$__rate_interval])) by (container_label_openanalytics_eu_sp_proxy_id) / sum(increase(container_cpu_cfs_periods_total{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}[$__rate_interval])) by (container_label_openanalytics_eu_sp_proxy_id)",
566566
"format": "time_series",
567567
"intervalFactor": 2,
568-
"legendFormat": "CPU Throttling",
568+
"legendFormat": "CPU Throttling {{container_label_openanalytics_eu_sp_proxy_id}}",
569569
"range": true,
570570
"refId": "A",
571571
"step": 10
@@ -748,10 +748,10 @@
748748
"uid": "${datasource}"
749749
},
750750
"editorMode": "code",
751-
"expr": "sum(container_memory_working_set_bytes{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}) by (container)",
751+
"expr": "sum(container_memory_working_set_bytes{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}) by (container_label_openanalytics_eu_sp_proxy_id)",
752752
"format": "time_series",
753753
"intervalFactor": 2,
754-
"legendFormat": "Memory Usage",
754+
"legendFormat": "Memory Usage {{container_label_openanalytics_eu_sp_proxy_id}}",
755755
"range": true,
756756
"refId": "A",
757757
"step": 10
@@ -763,7 +763,7 @@
763763
},
764764
"editorMode": "code",
765765
"exemplar": true,
766-
"expr": "container_spec_memory_reservation_limit_bytes{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} > 0",
766+
"expr": "sum(container_spec_memory_reservation_limit_bytes{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} > 0)",
767767
"format": "time_series",
768768
"interval": "",
769769
"intervalFactor": 2,
@@ -778,7 +778,7 @@
778778
"uid": "${datasource}"
779779
},
780780
"editorMode": "code",
781-
"expr": "container_spec_memory_reservation_limit_bytes{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} > 0",
781+
"expr": "sum(container_spec_memory_reservation_limit_bytes{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"} > 0)",
782782
"format": "time_series",
783783
"intervalFactor": 2,
784784
"legendFormat": "limits",
@@ -912,8 +912,8 @@
912912
"uid": "${datasource}"
913913
},
914914
"editorMode": "code",
915-
"expr": "container_network_receive_bytes_total{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}",
916-
"legendFormat": "Receive",
915+
"expr": "sum(container_network_receive_bytes_total{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}) by (container_label_openanalytics_eu_sp_proxy_id)",
916+
"legendFormat": "Receive {{container_label_openanalytics_eu_sp_proxy_id}}",
917917
"range": true,
918918
"refId": "A"
919919
},
@@ -924,10 +924,10 @@
924924
},
925925
"editorMode": "code",
926926
"exemplar": false,
927-
"expr": "container_network_transmit_bytes_total{container_label_openanalytics_eu_sp_proxy_id=\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}",
927+
"expr": "sum(container_network_transmit_bytes_total{container_label_openanalytics_eu_sp_proxy_id=~\"$id\",container_label_openanalytics_eu_sp_proxy_id!=\"\"}) by (container_label_openanalytics_eu_sp_proxy_id)",
928928
"hide": false,
929929
"interval": "",
930-
"legendFormat": "Transmit",
930+
"legendFormat": "Transmit {{container_label_openanalytics_eu_sp_proxy_id}}",
931931
"range": true,
932932
"refId": "B"
933933
}
@@ -1015,7 +1015,8 @@
10151015
"uid": "${datasource}"
10161016
},
10171017
"definition": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\"}, proxy_id)",
1018-
"includeAll": false,
1018+
"includeAll": true,
1019+
"multi": true,
10191020
"name": "id",
10201021
"options": [],
10211022
"query": {
@@ -1039,27 +1040,6 @@
10391040
"regex": "",
10401041
"type": "datasource",
10411042
"allowCustomValue": false
1042-
},
1043-
{
1044-
"current": {},
1045-
"datasource": {
1046-
"type": "prometheus",
1047-
"uid": "${datasource}"
1048-
},
1049-
"definition": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\",proxy_id=\"$id\"}, resource_id)",
1050-
"hide": 2,
1051-
"includeAll": false,
1052-
"name": "pod",
1053-
"options": [],
1054-
"query": {
1055-
"query": "label_values(delegate_app_info{job=~\".+\",proxy_namespace=~\"$namespace\",shinyproxy_realm=~\"$realm\",spec_id=~\"$app\",proxy_id=\"$id\"}, resource_id)",
1056-
"refId": "StandardVariableQuery"
1057-
},
1058-
"refresh": 2,
1059-
"regex": "",
1060-
"sort": 5,
1061-
"type": "query",
1062-
"allowCustomValue": false
10631043
}
10641044
]
10651045
},

0 commit comments

Comments
 (0)