diff --git a/grafana/dashboards/mikrotik/mikrotik_loki_logs.json b/grafana/dashboards/mikrotik/mikrotik_loki_logs.json index edb7755..df92e3d 100644 --- a/grafana/dashboards/mikrotik/mikrotik_loki_logs.json +++ b/grafana/dashboards/mikrotik/mikrotik_loki_logs.json @@ -21,11 +21,12 @@ } ] }, - "description": "Mikrotik Loki Logs ", + "description": "Mikrotik Loki Logs", "editable": true, "fiscalYearStartMonth": 0, "gnetId": 17139, "graphTooltip": 0, + "id": 7, "links": [ { "asDropdown": false, @@ -33,10 +34,11 @@ "includeVars": false, "keepTime": false, "tags": [ - "mikrotik" + "mikrotik", + "mktxp" ], "targetBlank": false, - "title": "Mikrotik MKTXP Exporter", + "title": "MKTXP Exporter", "tooltip": "", "type": "dashboards", "url": "" @@ -102,7 +104,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "9.2.0", + "pluginVersion": "9.2.1", "targets": [ { "datasource": { @@ -110,7 +112,7 @@ "uid": "P8E80F9AEF21F6940" }, "editorMode": "code", - "expr": "count_over_time({job=\"syslog\", routerboard=\"$routerboard\"} [$__interval] |~\"(?i)$topics\" |~\"(?i)$searchable_pattern\")", + "expr": "count_over_time({job=\"syslog\", routerboard=\"$routerboard\"} [$__interval] |~\"(?i)$topics\" |~\"(?i)$searchable_pattern\" !~\"(?i)$exclude\")", "legendFormat": "{{host}}", "queryType": "range", "refId": "A" @@ -209,7 +211,7 @@ "uid": "P8E80F9AEF21F6940" }, "editorMode": "code", - "expr": "count_over_time({job=\"syslog\", routerboard=\"$routerboard\"} [$__interval] | pattern \":<_>\" |~\"(?i)$topics\" |~\"(?i)$searchable_pattern\")", + "expr": "count_over_time({job=\"syslog\", routerboard=\"$routerboard\"} [$__interval] | pattern \":<_>\" |~\"(?i)$topics\" |~\"(?i)$searchable_pattern\" !~\"(?i)$exclude\")", "legendFormat": "{{prefix}}", "queryType": "range", "refId": "A" @@ -250,7 +252,7 @@ "uid": "P8E80F9AEF21F6940" }, "editorMode": "code", - "expr": "{job=\"syslog\", routerboard=\"$routerboard\"} |~\"(?i)$topics\" |~\"(?i)$searchable_pattern\"", + "expr": "{job=\"syslog\", routerboard=\"$routerboard\"} |~\"(?i)$topics\" |~\"(?i)$searchable_pattern\" !~\"(?i)$exclude\"", "legendFormat": "", "queryType": "range", "refId": "A" @@ -300,7 +302,7 @@ }, { "current": { - "selected": true, + "selected": false, "text": [ "All" ], @@ -358,9 +360,64 @@ "selected": false, "text": "wireless", "value": "wireless" + }, + { + "selected": false, + "text": "dns", + "value": "dns" + }, + { + "selected": false, + "text": "health", + "value": "health" + }, + { + "selected": false, + "text": "dhcp", + "value": "dhcp" + }, + { + "selected": false, + "text": "interface", + "value": "interface" + }, + { + "selected": false, + "text": "ipsec", + "value": "ipsec" + }, + { + "selected": false, + "text": "l2tp", + "value": "l2tp" + }, + { + "selected": false, + "text": "ppp", + "value": "ppp" + }, + { + "selected": false, + "text": "raw", + "value": "raw" + }, + { + "selected": false, + "text": "ssh", + "value": "ssh" + }, + { + "selected": false, + "text": "system", + "value": "system" + }, + { + "selected": false, + "text": "ups", + "value": "ups" } ], - "query": "account,caps,critical,error,firewall,info,warning,wireless", + "query": "account,caps,critical,error,firewall,info,warning,wireless,dns,health,dhcp,interface,ipsec,l2tp,ppp,raw,ssh,system,ups", "queryValue": "", "skipUrlSync": false, "type": "custom" @@ -371,8 +428,9 @@ "text": "", "value": "" }, + "description": "Search (case insensitive)", "hide": 0, - "label": "Search (case insensitive)", + "label": "Search", "name": "searchable_pattern", "options": [ { @@ -385,6 +443,30 @@ "skipUrlSync": false, "type": "textbox" }, + { + "current": { + "selected": false, + "text": "None", + "value": "None" + }, + "description": "Exclude pattern (case-insensitive, None includes everything)", + "hide": 0, + "includeAll": false, + "label": "Exclude", + "multi": false, + "name": "exclude", + "options": [ + { + "selected": true, + "text": "None", + "value": "None" + } + ], + "query": "None,", + "queryValue": "None", + "skipUrlSync": false, + "type": "custom" + }, { "current": { "selected": false, @@ -458,6 +540,6 @@ "timezone": "", "title": "Mikrotik Loki Logs", "uid": "awslix6doiakp-mkt-loki", - "version": 1, + "version": 8, "weekStart": "" } \ No newline at end of file