Skip to content

Commit 68e2fbb

Browse files
LEDfanLEDfan
committed
Fix #34965: allow to filter logs
1 parent e7ae184 commit 68e2fbb

4 files changed

Lines changed: 80 additions & 12 deletions

File tree

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

Lines changed: 19 additions & 2 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__ }}` ",
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}}`",
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"
@@ -715,6 +715,23 @@
715715
"sort": 5,
716716
"type": "datasource",
717717
"allowCustomValue": false
718+
},
719+
{
720+
"current": {},
721+
"description": "",
722+
"hide": 0,
723+
"label": "Filter",
724+
"name": "filter",
725+
"options": [
726+
{
727+
"selected": true,
728+
"text": "",
729+
"value": ""
730+
}
731+
],
732+
"query": "",
733+
"skipUrlSync": false,
734+
"type": "textbox"
718735
}
719736
]
720737
},

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

Lines changed: 20 additions & 3 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__ }}` ",
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}}`",
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}}`",
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",
@@ -470,6 +470,23 @@
470470
"regex": "",
471471
"type": "datasource",
472472
"sort": 5
473+
},
474+
{
475+
"current": {},
476+
"description": "",
477+
"hide": 0,
478+
"label": "Filter",
479+
"name": "filter",
480+
"options": [
481+
{
482+
"selected": true,
483+
"text": "",
484+
"value": ""
485+
}
486+
],
487+
"query": "",
488+
"skipUrlSync": false,
489+
"type": "textbox"
473490
}
474491
]
475492
},

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

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"type": "loki",
8181
"uid": "${datasource}"
8282
},
83-
"expr": "sum(count_over_time(({app=\"shinyproxy\", namespace=\"$namespace\", sp_realm_id=\"$realm\", sp_instance=~\"$instance\"} | json | level=\"WARN\")[$__interval]))",
83+
"expr": "sum(count_over_time(({app=\"shinyproxy\", namespace=\"$namespace\", sp_realm_id=\"$realm\", sp_instance=~\"$instance\"} | json | level=\"WARN\" |~ `(?i)$filter`)[$__interval]))",
8484
"queryType": "range",
8585
"refId": "A"
8686
}
@@ -142,7 +142,7 @@
142142
"type": "loki",
143143
"uid": "${datasource}"
144144
},
145-
"expr": "sum(count_over_time(({app=\"shinyproxy\", namespace=\"$namespace\", sp_realm_id=\"$realm\", sp_instance=~\"$instance\"} | json | level=\"ERROR\")[$__interval]))",
145+
"expr": "sum(count_over_time(({app=\"shinyproxy\", namespace=\"$namespace\", sp_realm_id=\"$realm\", sp_instance=~\"$instance\"} | json | level=\"ERROR\" |~ `(?i)$filter`)[$__interval]))",
146146
"queryType": "range",
147147
"refId": "A"
148148
}
@@ -178,7 +178,7 @@
178178
"type": "loki",
179179
"uid": "${datasource}"
180180
},
181-
"expr": "{app=\"shinyproxy\", namespace=\"$namespace\", sp_realm_id=\"$realm\", sp_instance=~\"$instance\"} | json | level=~\"$level\" | line_format `{{.level}} [{{ printf \"%15.15s\" .thread_name}}] {{ printf \"%-40.40s\" .logger_name}}: {{.message}} {{.stack_trace}}`",
181+
"expr": "{app=\"shinyproxy\", namespace=\"$namespace\", sp_realm_id=\"$realm\", sp_instance=~\"$instance\"} | json | level=~\"$level\" | line_format `{{.level}} [{{ printf \"%15.15s\" .thread_name}}] {{ printf \"%-40.40s\" .logger_name}}: {{.message}} {{.stack_trace}}` |~ `(?i)$filter`",
182182
"refId": "A"
183183
}
184184
],
@@ -340,6 +340,23 @@
340340
"sort": 5,
341341
"type": "datasource",
342342
"allowCustomValue": false
343+
},
344+
{
345+
"current": {},
346+
"description": "",
347+
"hide": 0,
348+
"label": "Filter",
349+
"name": "filter",
350+
"options": [
351+
{
352+
"selected": true,
353+
"text": "",
354+
"value": ""
355+
}
356+
],
357+
"query": "",
358+
"skipUrlSync": false,
359+
"type": "textbox"
343360
}
344361
]
345362
},

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

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"uid": "${datasource}"
8585
},
8686
"editorMode": "code",
87-
"expr": "sum(count_over_time(({app=\"shinyproxy-operator\", namespace=\"default\"} | pattern \"<time> [<thread>] <level> <_>\"| level=\"WARN\")[$__interval]))",
87+
"expr": "sum(count_over_time(({app=\"shinyproxy-operator\", namespace=\"default\"} | pattern \"<time> [<thread>] <level> <_>\"| level=\"WARN\" |~ `(?i)$filter`)[$__interval]))",
8888
"queryType": "range",
8989
"refId": "A"
9090
}
@@ -150,7 +150,7 @@
150150
"uid": "${datasource}"
151151
},
152152
"editorMode": "code",
153-
"expr": "sum(count_over_time(({app=\"shinyproxy-operator\", namespace=\"default\"} | pattern \"<time> [<thread>] <level> <_>\"| level=\"ERROR\")[$__interval]))",
153+
"expr": "sum(count_over_time(({app=\"shinyproxy-operator\", namespace=\"default\"} | pattern \"<time> [<thread>] <level> <_>\"| level=\"ERROR\" |~ `(?i)$filter`)[$__interval]))",
154154
"queryType": "range",
155155
"refId": "A"
156156
}
@@ -193,7 +193,7 @@
193193
"uid": "${datasource}"
194194
},
195195
"editorMode": "code",
196-
"expr": "{app=\"shinyproxy-operator\", namespace=\"default\"} | pattern \"<time> [<thread>] <level> <_>\"| level=~\"$level\"",
196+
"expr": "{app=\"shinyproxy-operator\", namespace=\"default\"} | pattern \"<time> [<thread>] <level> <_>\"| level=~\"$level\" |~ `(?i)$filter`",
197197
"queryType": "range",
198198
"refId": "A"
199199
}
@@ -278,6 +278,23 @@
278278
"type": "datasource",
279279
"sort": 5,
280280
"allowCustomValue": false
281+
},
282+
{
283+
"current": {},
284+
"description": "",
285+
"hide": 0,
286+
"label": "Filter",
287+
"name": "filter",
288+
"options": [
289+
{
290+
"selected": true,
291+
"text": "",
292+
"value": ""
293+
}
294+
],
295+
"query": "",
296+
"skipUrlSync": false,
297+
"type": "textbox"
281298
}
282299
]
283300
},
@@ -292,4 +309,4 @@
292309
"uid": "shinyproxy-operator-logs",
293310
"version": 1,
294311
"weekStart": ""
295-
}
312+
}

0 commit comments

Comments
 (0)