From b3d5e78e5d37cab0a87f21b1fa5534b3f92290f8 Mon Sep 17 00:00:00 2001 From: klaasg Date: Thu, 27 Apr 2023 01:44:20 +0200 Subject: [PATCH] 12UL 2023 Update by bobby nutty francis flynn redfast00 klagoeth --- config_prod.env | 6 +- docker-compose.yml | 1 - grafana/Dockerfile | 1 + grafana/config.monitoring | 2 +- .../dashboards/ExternalLapperStats.json | 9 +- .../dashboards/IllionGrafiek.json | 143 +- .../dashboards/NodeExporterFull.json | 1545 +++++++++-------- .../dashboards/NodeExporterOverview.json | 190 +- .../dashboards/NodeExporterUseMethod.json | 38 +- grafana/provisioning/dashboards/home.json | 17 +- .../provisioning/dashboards/lap-overview.json | 98 +- .../provisioning/dashboards/lap-times.json | 195 +-- .../provisioning/dashboards/snmp-network.json | 1038 ++++++++--- .../provisioning/dashboards/status-page.json | 1319 ++++++++++---- prometheus/http_hosts.template.yml | 5 + prometheus/ping_hosts.template.yml | 56 +- start.sh | 2 +- timesync/timesync.py | 9 + 18 files changed, 3007 insertions(+), 1667 deletions(-) diff --git a/config_prod.env b/config_prod.env index c29c8bf..1e12fe1 100644 --- a/config_prod.env +++ b/config_prod.env @@ -1,5 +1,5 @@ -MONITORING_MASTER_PASSWORD=supersecretpassword -MONITORING_DB_PASSWORD=foobar +MONITORING_MASTER_PASSWORD=veranderditmaar +MONITORING_DB_PASSWORD=enditook RONNY01_IP=172.12.50.101 RONNY01_PORT=8000 @@ -32,4 +32,4 @@ CLIENT1_IP=172.12.50.21 CLIENT2_IP=172.12.50.22 -ROUTER_IP=172.12.50.1 \ No newline at end of file +ROUTER_IP=172.12.50.1 diff --git a/docker-compose.yml b/docker-compose.yml index 583bcd5..a4ac211 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,6 @@ services: - "--web.console.templates=/usr/share/prometheus/consoles" network_mode: host depends_on: - depends_on: - blackbox - snmp # ports: diff --git a/grafana/Dockerfile b/grafana/Dockerfile index 12cf47e..3eb9c7e 100644 --- a/grafana/Dockerfile +++ b/grafana/Dockerfile @@ -4,6 +4,7 @@ FROM grafana/grafana:9.3.6 RUN grafana-cli plugins install grafana-piechart-panel RUN grafana-cli plugins install simpod-json-datasource RUN grafana-cli plugins install marcusolsson-json-datasource +RUN grafana-cli plugins install grafana-clock-panel EXPOSE 3000 diff --git a/grafana/config.monitoring b/grafana/config.monitoring index e45e542..05cc94b 100644 --- a/grafana/config.monitoring +++ b/grafana/config.monitoring @@ -1,2 +1,2 @@ -GF_SECURITY_ADMIN_PASSWORD=supersecretpassword +GF_SECURITY_ADMIN_PASSWORD=veranderditmaar GF_USERS_ALLOW_SIGN_UP=false diff --git a/grafana/provisioning/dashboards/ExternalLapperStats.json b/grafana/provisioning/dashboards/ExternalLapperStats.json index ff1c0cb..4c68c0d 100644 --- a/grafana/provisioning/dashboards/ExternalLapperStats.json +++ b/grafana/provisioning/dashboards/ExternalLapperStats.json @@ -24,7 +24,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 13, "links": [], "liveNow": false, "panels": [ @@ -76,7 +75,7 @@ }, "showHeader": true }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "body": "", @@ -171,7 +170,7 @@ }, "showHeader": true }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "cacheDurationSeconds": 300, @@ -242,7 +241,7 @@ }, "showHeader": true }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "body": "", @@ -289,7 +288,7 @@ "type": "table" } ], - "schemaVersion": 36, + "schemaVersion": 37, "style": "dark", "tags": [], "templating": { diff --git a/grafana/provisioning/dashboards/IllionGrafiek.json b/grafana/provisioning/dashboards/IllionGrafiek.json index 8004f0a..9d870a5 100644 --- a/grafana/provisioning/dashboards/IllionGrafiek.json +++ b/grafana/provisioning/dashboards/IllionGrafiek.json @@ -24,8 +24,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 14, - "iteration": 1678357333017, "links": [], "liveNow": false, "panels": [ @@ -40,6 +38,8 @@ "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -100,7 +100,8 @@ "max" ], "displayMode": "table", - "placement": "right" + "placement": "right", + "showLegend": true }, "tooltip": { "mode": "single", @@ -113,11 +114,12 @@ "type": "postgres", "uid": "P153BFFACB2904795" }, + "editorMode": "code", "format": "time_series", "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "SELECT\n $__time(\"timestamp\"),\n station_id::text,\n avg(\"rssi\") as \"rssi\"\nFROM detection\nWHERE\n $__timeFilter(\"timestamp\") AND baton_id IN ([[baton]])\nGROUP BY 1, 2\nORDER BY 1", + "rawSql": "SELECT\n $__time(\"timestamp\" - interval '2 hour'),\n station_id::text,\n -- avg(\"rssi\") as \"rssi\"\n rssi\nFROM detection\nWHERE\n $__timeFilter(\"timestamp\" - interval '2 hour') AND baton_id IN ([[baton]])\n-- GROUP BY 1, 2\nORDER BY 1", "refId": "A", "select": [ [ @@ -135,6 +137,23 @@ } ] ], + "sql": { + "columns": [ + { + "parameters": [], + "type": "function" + } + ], + "groupBy": [ + { + "property": { + "type": "string" + }, + "type": "groupBy" + } + ], + "limit": 50 + }, "table": "detection", "timeColumn": "\"timestamp\"", "timeColumnType": "timestamp", @@ -170,6 +189,8 @@ "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -213,32 +234,7 @@ }, "unit": "dBm" }, - "overrides": [ - { - "__systemRef": "hideSeriesFrom", - "matcher": { - "id": "byNames", - "options": { - "mode": "exclude", - "names": [ - "rssi 1" - ], - "prefix": "All except:", - "readOnly": true - } - }, - "properties": [ - { - "id": "custom.hideFrom", - "value": { - "legend": false, - "tooltip": false, - "viz": true - } - } - ] - } - ] + "overrides": [] }, "gridPos": { "h": 10, @@ -255,7 +251,8 @@ "max" ], "displayMode": "table", - "placement": "right" + "placement": "right", + "showLegend": true }, "tooltip": { "mode": "single", @@ -268,11 +265,12 @@ "type": "postgres", "uid": "P153BFFACB2904795" }, + "editorMode": "code", "format": "time_series", "group": [], "metricColumn": "none", "rawQuery": true, - "rawSql": "SELECT\n $__time(\"timestamp\"),\n baton_id::text,\n avg(\"rssi\") as \"rssi\"\nFROM detection\nWHERE\n $__timeFilter(\"timestamp\")\nGROUP BY 1, 2\nORDER BY 1", + "rawSql": "SELECT\n $__time(\"timestamp\" - interval '2 hour'),\n baton_id::text,\n avg(\"rssi\") as \"rssi\"\nFROM detection\nWHERE\n $__timeFilter(\"timestamp\" - interval '2 hour')\nGROUP BY 1, 2\nORDER BY 1", "refId": "A", "select": [ [ @@ -290,6 +288,23 @@ } ] ], + "sql": { + "columns": [ + { + "parameters": [], + "type": "function" + } + ], + "groupBy": [ + { + "property": { + "type": "string" + }, + "type": "groupBy" + } + ], + "limit": 50 + }, "table": "detection", "timeColumn": "\"timestamp\"", "timeColumnType": "timestamp", @@ -315,44 +330,88 @@ "type": "timeseries" } ], - "refresh": false, - "schemaVersion": 36, + "refresh": "", + "schemaVersion": 37, "style": "dark", "tags": [], "templating": { "list": [ { "current": { - "selected": true, + "selected": false, "text": [ - "1" + "C (HILOK)", + "B (VTK)", + "K (VLK)", + "D (VGK)", + "F (VEK - Moeder Lies)", + "G (Wetenschappen - VLAK - VETO)", + "H (none)", + "I (Hermes - GFK)", + "J (Politeia)", + "L (HK)", + "M (VRG)", + "N (VPPK)", + "A (none)", + "P (SK)", + "T (Lombrosiana - VBK)", + "Q (LILA)", + "R (Antilopen)", + "O (none)", + "Y (HILOK Roze)", + "U (Blandinia)", + "V (none)", + "W (none)", + "X (none)" ], "value": [ - "1" + "2", + "3", + "4", + "5", + "7", + "8", + "9", + "10", + "11", + "12", + "13", + "14", + "15", + "16", + "17", + "18", + "19", + "20", + "21", + "22", + "23", + "24", + "25" ] }, "datasource": { "type": "postgres", "uid": "P153BFFACB2904795" }, - "definition": "select id from baton", + "definition": "select b.id as __value, b.name || ' (' || COALESCE(t.name, 'none') || ')' as __text from baton b\nleft join team t on b.id = t.baton_id", "hide": 0, "includeAll": false, "multi": true, "name": "baton", "options": [], - "query": "select id from baton", + "query": "select b.id as __value, b.name || ' (' || COALESCE(t.name, 'none') || ')' as __text from baton b\nleft join team t on b.id = t.baton_id", "refresh": 1, "regex": "", "skipUrlSync": false, - "sort": 0, + "sort": 1, "type": "query" } ] }, "time": { - "from": "2022-03-31T18:10:56.000Z", - "to": "2022-03-31T18:12:31.000Z" + "from": "now-40s", + "to": "now" }, "timepicker": {}, "timezone": "", diff --git a/grafana/provisioning/dashboards/NodeExporterFull.json b/grafana/provisioning/dashboards/NodeExporterFull.json index 546a8c9..1727d9c 100644 --- a/grafana/provisioning/dashboards/NodeExporterFull.json +++ b/grafana/provisioning/dashboards/NodeExporterFull.json @@ -27,8 +27,6 @@ "fiscalYearStartMonth": 0, "gnetId": 12486, "graphTooltip": 0, - "id": 16, - "iteration": 1651066532680, "links": [], "liveNow": false, "panels": [ @@ -36,7 +34,7 @@ "collapsed": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, @@ -52,7 +50,7 @@ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Busy state of all CPU cores together", "fieldConfig": { @@ -112,9 +110,13 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "expr": "(((count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu))) - avg(sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[5m])))) * 100) / count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu))", "hide": false, "intervalFactor": 1, @@ -129,7 +131,7 @@ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Busy state of all CPU cores together (5 min average)", "fieldConfig": { @@ -189,9 +191,13 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "expr": "avg(node_load5{instance=\"$node\",job=\"$job\"}) / count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu)) * 100", "format": "time_series", "hide": false, @@ -206,7 +212,7 @@ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Busy state of all CPU cores together (15 min average)", "fieldConfig": { @@ -266,7 +272,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "expr": "avg(node_load15{instance=\"$node\",job=\"$job\"}) / count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu)) * 100", @@ -282,7 +288,7 @@ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Non available RAM memory", "fieldConfig": { @@ -336,7 +342,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "expr": "((node_memory_MemTotal_bytes{instance=\"$node\",job=\"$job\"} - node_memory_MemFree_bytes{instance=\"$node\",job=\"$job\"}) / (node_memory_MemTotal_bytes{instance=\"$node\",job=\"$job\"} )) * 100", @@ -361,7 +367,7 @@ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Used Swap", "fieldConfig": { @@ -421,7 +427,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "expr": "((node_memory_SwapTotal_bytes{instance=\"$node\",job=\"$job\"} - node_memory_SwapFree_bytes{instance=\"$node\",job=\"$job\"}) / (node_memory_SwapTotal_bytes{instance=\"$node\",job=\"$job\"} )) * 100", @@ -436,7 +442,7 @@ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Used Root FS", "fieldConfig": { @@ -496,7 +502,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "expr": "100 - ((node_filesystem_avail_bytes{instance=\"$node\",job=\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"} * 100) / node_filesystem_size_bytes{instance=\"$node\",job=\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"})", @@ -512,7 +518,7 @@ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Total number of CPU cores", "fieldConfig": { @@ -571,7 +577,7 @@ }, "textMode": "auto" }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "expr": "count(count(node_cpu_seconds_total{instance=\"$node\",job=\"$job\"}) by (cpu))", @@ -588,7 +594,7 @@ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "System uptime", "fieldConfig": { @@ -649,7 +655,7 @@ }, "textMode": "auto" }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "expr": "node_time_seconds{instance=\"$node\",job=\"$job\"} - node_boot_time_seconds{instance=\"$node\",job=\"$job\"}", @@ -664,7 +670,7 @@ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Total RootFS", "fieldConfig": { @@ -728,7 +734,7 @@ }, "textMode": "auto" }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "expr": "node_filesystem_size_bytes{instance=\"$node\",job=\"$job\",mountpoint=\"/\",fstype!=\"rootfs\"}", @@ -745,7 +751,7 @@ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Total RAM", "fieldConfig": { @@ -805,7 +811,7 @@ }, "textMode": "auto" }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "expr": "node_memory_MemTotal_bytes{instance=\"$node\",job=\"$job\"}", @@ -820,7 +826,7 @@ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Total SWAP", "fieldConfig": { @@ -880,7 +886,7 @@ }, "textMode": "auto" }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "expr": "node_memory_SwapTotal_bytes{instance=\"$node\",job=\"$job\"}", @@ -893,10 +899,10 @@ "type": "stat" }, { - "collapsed": false, + "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, @@ -905,606 +911,607 @@ "y": 5 }, "id": 263, - "panels": [], - "title": "Basic CPU / Mem / Net / Disk", - "type": "row" - }, - { - "aliasColors": { - "Busy": "#EAB839", - "Busy Iowait": "#890F02", - "Busy other": "#1F78C1", - "Idle": "#052B51", - "Idle - Waiting for something to happen": "#052B51", - "guest": "#9AC48A", - "idle": "#052B51", - "iowait": "#EAB839", - "irq": "#BF1B00", - "nice": "#C15C17", - "softirq": "#E24D42", - "steal": "#FCE2DE", - "system": "#508642", - "user": "#5195CE" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": { - "type": "prometheus", - "uid": "ocBf6n87k" - }, - "decimals": 2, - "description": "Basic CPU info", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 7, - "w": 12, - "x": 0, - "y": 6 - }, - "hiddenSeries": false, - "id": 77, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sideWidth": 250, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "maxPerRow": 6, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": true, - "pluginVersion": "8.5.0", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "Busy Iowait", - "color": "#890F02" - }, - { - "alias": "Idle", - "color": "#7EB26D" - }, - { - "alias": "Busy System", - "color": "#EAB839" - }, - { - "alias": "Busy User", - "color": "#0A437C" - }, - { - "alias": "Busy Other", - "color": "#6D1F62" - } - ], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode=\"system\",instance=\"$node\",job=\"$job\"}[5m])) * 100", - "format": "time_series", - "hide": false, - "intervalFactor": 2, - "legendFormat": "Busy System", - "refId": "A", - "step": 240 - }, - { - "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode='user',instance=\"$node\",job=\"$job\"}[5m])) * 100", - "format": "time_series", - "hide": false, - "intervalFactor": 2, - "legendFormat": "Busy User", - "refId": "B", - "step": 240 - }, - { - "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode='iowait',instance=\"$node\",job=\"$job\"}[5m])) * 100", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "Busy Iowait", - "refId": "C", - "step": 240 - }, - { - "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode=~\".*irq\",instance=\"$node\",job=\"$job\"}[5m])) * 100", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "Busy IRQs", - "refId": "D", - "step": 240 - }, - { - "expr": "sum (irate(node_cpu_seconds_total{mode!='idle',mode!='user',mode!='system',mode!='iowait',mode!='irq',mode!='softirq',instance=\"$node\",job=\"$job\"}[5m])) * 100", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "Busy Other", - "refId": "E", - "step": 240 - }, - { - "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[5m])) * 100", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "Idle", - "refId": "F", - "step": 240 - } - ], - "thresholds": [], - "timeRegions": [], - "title": "CPU Basic", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "short", - "label": "", - "logBase": 1, - "max": "100", - "min": "0", - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": false - } - ], - "yaxis": { - "align": false - } - }, - { - "aliasColors": { - "Apps": "#629E51", - "Buffers": "#614D93", - "Cache": "#6D1F62", - "Cached": "#511749", - "Committed": "#508642", - "Free": "#0A437C", - "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF", - "Inactive": "#584477", - "PageTables": "#0A50A1", - "Page_Tables": "#0A50A1", - "RAM_Free": "#E0F9D7", - "SWAP Used": "#BF1B00", - "Slab": "#806EB7", - "Slab_Cache": "#E0752D", - "Swap": "#BF1B00", - "Swap Used": "#BF1B00", - "Swap_Cache": "#C15C17", - "Swap_Free": "#2F575E", - "Unused": "#EAB839" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": { - "type": "prometheus", - "uid": "ocBf6n87k" - }, - "decimals": 2, - "description": "Basic memory usage", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 7, - "w": 12, - "x": 12, - "y": 6 - }, - "hiddenSeries": false, - "id": 78, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sideWidth": 350, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "maxPerRow": 6, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "8.5.0", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "RAM Total", - "color": "#E0F9D7", - "fill": 0, - "stack": false - }, - { - "alias": "RAM Cache + Buffer", - "color": "#052B51" - }, - { - "alias": "RAM Free", - "color": "#7EB26D" - }, - { - "alias": "Avaliable", - "color": "#DEDAF7", - "fill": 0, - "stack": false - } - ], - "spaceLength": 10, - "stack": true, - "steppedLine": false, - "targets": [ - { - "expr": "node_memory_MemTotal_bytes{instance=\"$node\",job=\"$job\"}", - "format": "time_series", - "hide": false, - "intervalFactor": 2, - "legendFormat": "RAM Total", - "refId": "A", - "step": 240 - }, - { - "expr": "node_memory_MemTotal_bytes{instance=\"$node\",job=\"$job\"} - node_memory_MemFree_bytes{instance=\"$node\",job=\"$job\"} - (node_memory_Cached_bytes{instance=\"$node\",job=\"$job\"} + node_memory_Buffers_bytes{instance=\"$node\",job=\"$job\"})", - "format": "time_series", - "hide": false, - "intervalFactor": 2, - "legendFormat": "RAM Used", - "refId": "B", - "step": 240 - }, - { - "expr": "node_memory_Cached_bytes{instance=\"$node\",job=\"$job\"} + node_memory_Buffers_bytes{instance=\"$node\",job=\"$job\"}", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "RAM Cache + Buffer", - "refId": "C", - "step": 240 - }, - { - "expr": "node_memory_MemFree_bytes{instance=\"$node\",job=\"$job\"}", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "RAM Free", - "refId": "D", - "step": 240 - }, - { - "expr": "(node_memory_SwapTotal_bytes{instance=\"$node\",job=\"$job\"} - node_memory_SwapFree_bytes{instance=\"$node\",job=\"$job\"})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "SWAP Used", - "refId": "E", - "step": 240 - } - ], - "thresholds": [], - "timeRegions": [], - "title": "Memory Basic", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bytes", - "label": "", - "logBase": 1, - "min": "0", - "show": true - }, - { - "format": "short", - "logBase": 1, - "show": false - } - ], - "yaxis": { - "align": false - } - }, - { - "aliasColors": { - "Recv_bytes_eth2": "#7EB26D", - "Recv_bytes_lo": "#0A50A1", - "Recv_drop_eth2": "#6ED0E0", - "Recv_drop_lo": "#E0F9D7", - "Recv_errs_eth2": "#BF1B00", - "Recv_errs_lo": "#CCA300", - "Trans_bytes_eth2": "#7EB26D", - "Trans_bytes_lo": "#0A50A1", - "Trans_drop_eth2": "#6ED0E0", - "Trans_drop_lo": "#E0F9D7", - "Trans_errs_eth2": "#BF1B00", - "Trans_errs_lo": "#CCA300", - "recv_bytes_lo": "#0A50A1", - "recv_drop_eth0": "#99440A", - "recv_drop_lo": "#967302", - "recv_errs_eth0": "#BF1B00", - "recv_errs_lo": "#890F02", - "trans_bytes_eth0": "#7EB26D", - "trans_bytes_lo": "#0A50A1", - "trans_drop_eth0": "#99440A", - "trans_drop_lo": "#967302", - "trans_errs_eth0": "#BF1B00", - "trans_errs_lo": "#890F02" - }, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": { - "type": "prometheus", - "uid": "ocBf6n87k" - }, - "description": "Basic network info per interface", - "fieldConfig": { - "defaults": { - "links": [] - }, - "overrides": [] - }, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 7, - "w": 12, - "x": 0, - "y": 13 - }, - "hiddenSeries": false, - "id": 74, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "hideEmpty": false, - "hideZero": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "8.5.0", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [ - { - "alias": "/.*trans.*/", - "transform": "negative-Y" - } - ], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "irate(node_network_receive_bytes_total{instance=\"$node\",job=\"$job\"}[5m])*8", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "recv {{device}}", - "refId": "A", - "step": 240 - }, - { - "expr": "irate(node_network_transmit_bytes_total{instance=\"$node\",job=\"$job\"}[5m])*8", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "trans {{device}} ", - "refId": "B", - "step": 240 - } - ], - "thresholds": [], - "timeRegions": [], - "title": "Network Traffic Basic", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ + "panels": [ { - "format": "bps", - "logBase": 1, - "show": true + "aliasColors": { + "Busy": "#EAB839", + "Busy Iowait": "#890F02", + "Busy other": "#1F78C1", + "Idle": "#052B51", + "Idle - Waiting for something to happen": "#052B51", + "guest": "#9AC48A", + "idle": "#052B51", + "iowait": "#EAB839", + "irq": "#BF1B00", + "nice": "#C15C17", + "softirq": "#E24D42", + "steal": "#FCE2DE", + "system": "#508642", + "user": "#5195CE" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "decimals": 2, + "description": "Basic CPU info", + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, + "fill": 4, + "fillGradient": 0, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 2 + }, + "hiddenSeries": false, + "id": 77, + "legend": { + "alignAsTable": false, + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "sideWidth": 250, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "maxPerRow": 6, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": true, + "pluginVersion": "9.3.6", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "alias": "Busy Iowait", + "color": "#890F02" + }, + { + "alias": "Idle", + "color": "#7EB26D" + }, + { + "alias": "Busy System", + "color": "#EAB839" + }, + { + "alias": "Busy User", + "color": "#0A437C" + }, + { + "alias": "Busy Other", + "color": "#6D1F62" + } + ], + "spaceLength": 10, + "stack": true, + "steppedLine": false, + "targets": [ + { + "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode=\"system\",instance=\"$node\",job=\"$job\"}[5m])) * 100", + "format": "time_series", + "hide": false, + "intervalFactor": 2, + "legendFormat": "Busy System", + "refId": "A", + "step": 240 + }, + { + "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode='user',instance=\"$node\",job=\"$job\"}[5m])) * 100", + "format": "time_series", + "hide": false, + "intervalFactor": 2, + "legendFormat": "Busy User", + "refId": "B", + "step": 240 + }, + { + "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode='iowait',instance=\"$node\",job=\"$job\"}[5m])) * 100", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "Busy Iowait", + "refId": "C", + "step": 240 + }, + { + "expr": "sum by (instance)(irate(node_cpu_seconds_total{mode=~\".*irq\",instance=\"$node\",job=\"$job\"}[5m])) * 100", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "Busy IRQs", + "refId": "D", + "step": 240 + }, + { + "expr": "sum (irate(node_cpu_seconds_total{mode!='idle',mode!='user',mode!='system',mode!='iowait',mode!='irq',mode!='softirq',instance=\"$node\",job=\"$job\"}[5m])) * 100", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "Busy Other", + "refId": "E", + "step": 240 + }, + { + "expr": "sum by (mode)(irate(node_cpu_seconds_total{mode='idle',instance=\"$node\",job=\"$job\"}[5m])) * 100", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "Idle", + "refId": "F", + "step": 240 + } + ], + "thresholds": [], + "timeRegions": [], + "title": "CPU Basic", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "short", + "label": "", + "logBase": 1, + "max": "100", + "min": "0", + "show": true + }, + { + "format": "short", + "logBase": 1, + "show": false + } + ], + "yaxis": { + "align": false + } }, { - "format": "pps", - "label": "", - "logBase": 1, - "show": false - } - ], - "yaxis": { - "align": false - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": { - "type": "prometheus", - "uid": "ocBf6n87k" - }, - "decimals": 3, - "description": "Disk space used of all filesystems mounted", - "fieldConfig": { - "defaults": { - "links": [] + "aliasColors": { + "Apps": "#629E51", + "Buffers": "#614D93", + "Cache": "#6D1F62", + "Cached": "#511749", + "Committed": "#508642", + "Free": "#0A437C", + "Hardware Corrupted - Amount of RAM that the kernel identified as corrupted / not working": "#CFFAFF", + "Inactive": "#584477", + "PageTables": "#0A50A1", + "Page_Tables": "#0A50A1", + "RAM_Free": "#E0F9D7", + "SWAP Used": "#BF1B00", + "Slab": "#806EB7", + "Slab_Cache": "#E0752D", + "Swap": "#BF1B00", + "Swap Used": "#BF1B00", + "Swap_Cache": "#C15C17", + "Swap_Free": "#2F575E", + "Unused": "#EAB839" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "decimals": 2, + "description": "Basic memory usage", + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, + "fill": 4, + "fillGradient": 0, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 2 + }, + "hiddenSeries": false, + "id": 78, + "legend": { + "alignAsTable": false, + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "sideWidth": 350, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "maxPerRow": 6, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "9.3.6", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "alias": "RAM Total", + "color": "#E0F9D7", + "fill": 0, + "stack": false + }, + { + "alias": "RAM Cache + Buffer", + "color": "#052B51" + }, + { + "alias": "RAM Free", + "color": "#7EB26D" + }, + { + "alias": "Avaliable", + "color": "#DEDAF7", + "fill": 0, + "stack": false + } + ], + "spaceLength": 10, + "stack": true, + "steppedLine": false, + "targets": [ + { + "expr": "node_memory_MemTotal_bytes{instance=\"$node\",job=\"$job\"}", + "format": "time_series", + "hide": false, + "intervalFactor": 2, + "legendFormat": "RAM Total", + "refId": "A", + "step": 240 + }, + { + "expr": "node_memory_MemTotal_bytes{instance=\"$node\",job=\"$job\"} - node_memory_MemFree_bytes{instance=\"$node\",job=\"$job\"} - (node_memory_Cached_bytes{instance=\"$node\",job=\"$job\"} + node_memory_Buffers_bytes{instance=\"$node\",job=\"$job\"})", + "format": "time_series", + "hide": false, + "intervalFactor": 2, + "legendFormat": "RAM Used", + "refId": "B", + "step": 240 + }, + { + "expr": "node_memory_Cached_bytes{instance=\"$node\",job=\"$job\"} + node_memory_Buffers_bytes{instance=\"$node\",job=\"$job\"}", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "RAM Cache + Buffer", + "refId": "C", + "step": 240 + }, + { + "expr": "node_memory_MemFree_bytes{instance=\"$node\",job=\"$job\"}", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "RAM Free", + "refId": "D", + "step": 240 + }, + { + "expr": "(node_memory_SwapTotal_bytes{instance=\"$node\",job=\"$job\"} - node_memory_SwapFree_bytes{instance=\"$node\",job=\"$job\"})", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "SWAP Used", + "refId": "E", + "step": 240 + } + ], + "thresholds": [], + "timeRegions": [], + "title": "Memory Basic", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": "", + "logBase": 1, + "min": "0", + "show": true + }, + { + "format": "short", + "logBase": 1, + "show": false + } + ], + "yaxis": { + "align": false + } }, - "overrides": [] - }, - "fill": 4, - "fillGradient": 0, - "gridPos": { - "h": 7, - "w": 12, - "x": 12, - "y": 13 - }, - "height": "", - "hiddenSeries": false, - "id": 152, - "legend": { - "alignAsTable": false, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 1, - "links": [], - "maxPerRow": 6, - "nullPointMode": "null", - "options": { - "alertThreshold": true - }, - "percentage": false, - "pluginVersion": "8.5.0", - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "100 - ((node_filesystem_avail_bytes{instance=\"$node\",job=\"$job\",device!~'rootfs'} * 100) / node_filesystem_size_bytes{instance=\"$node\",job=\"$job\",device!~'rootfs'})", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{mountpoint}}", - "refId": "A", - "step": 240 - } - ], - "thresholds": [], - "timeRegions": [], - "title": "Disk Space Used Basic", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "mode": "time", - "show": true, - "values": [] - }, - "yaxes": [ { - "format": "percent", - "logBase": 1, - "max": "100", - "min": "0", - "show": true + "aliasColors": { + "Recv_bytes_eth2": "#7EB26D", + "Recv_bytes_lo": "#0A50A1", + "Recv_drop_eth2": "#6ED0E0", + "Recv_drop_lo": "#E0F9D7", + "Recv_errs_eth2": "#BF1B00", + "Recv_errs_lo": "#CCA300", + "Trans_bytes_eth2": "#7EB26D", + "Trans_bytes_lo": "#0A50A1", + "Trans_drop_eth2": "#6ED0E0", + "Trans_drop_lo": "#E0F9D7", + "Trans_errs_eth2": "#BF1B00", + "Trans_errs_lo": "#CCA300", + "recv_bytes_lo": "#0A50A1", + "recv_drop_eth0": "#99440A", + "recv_drop_lo": "#967302", + "recv_errs_eth0": "#BF1B00", + "recv_errs_lo": "#890F02", + "trans_bytes_eth0": "#7EB26D", + "trans_bytes_lo": "#0A50A1", + "trans_drop_eth0": "#99440A", + "trans_drop_lo": "#967302", + "trans_errs_eth0": "#BF1B00", + "trans_errs_lo": "#890F02" + }, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "description": "Basic network info per interface", + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, + "fill": 4, + "fillGradient": 0, + "gridPos": { + "h": 7, + "w": 12, + "x": 0, + "y": 9 + }, + "hiddenSeries": false, + "id": 74, + "legend": { + "alignAsTable": false, + "avg": false, + "current": false, + "hideEmpty": false, + "hideZero": false, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "sort": "current", + "sortDesc": true, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "9.3.6", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [ + { + "alias": "/.*trans.*/", + "transform": "negative-Y" + } + ], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "irate(node_network_receive_bytes_total{instance=\"$node\",job=\"$job\"}[5m])*8", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "recv {{device}}", + "refId": "A", + "step": 240 + }, + { + "expr": "irate(node_network_transmit_bytes_total{instance=\"$node\",job=\"$job\"}[5m])*8", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "trans {{device}} ", + "refId": "B", + "step": 240 + } + ], + "thresholds": [], + "timeRegions": [], + "title": "Network Traffic Basic", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bps", + "logBase": 1, + "show": true + }, + { + "format": "pps", + "label": "", + "logBase": 1, + "show": false + } + ], + "yaxis": { + "align": false + } }, { - "format": "short", - "logBase": 1, - "show": true + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "decimals": 3, + "description": "Disk space used of all filesystems mounted", + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, + "fill": 4, + "fillGradient": 0, + "gridPos": { + "h": 7, + "w": 12, + "x": 12, + "y": 9 + }, + "height": "", + "hiddenSeries": false, + "id": 152, + "legend": { + "alignAsTable": false, + "avg": false, + "current": false, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "sort": "current", + "sortDesc": false, + "total": false, + "values": false + }, + "lines": true, + "linewidth": 1, + "links": [], + "maxPerRow": 6, + "nullPointMode": "null", + "options": { + "alertThreshold": true + }, + "percentage": false, + "pluginVersion": "9.3.6", + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "100 - ((node_filesystem_avail_bytes{instance=\"$node\",job=\"$job\",device!~'rootfs'} * 100) / node_filesystem_size_bytes{instance=\"$node\",job=\"$job\",device!~'rootfs'})", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{mountpoint}}", + "refId": "A", + "step": 240 + } + ], + "thresholds": [], + "timeRegions": [], + "title": "Disk Space Used Basic", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "mode": "time", + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "percent", + "logBase": 1, + "max": "100", + "min": "0", + "show": true + }, + { + "format": "short", + "logBase": 1, + "show": true + } + ], + "yaxis": { + "align": false + } } ], - "yaxis": { - "align": false - } + "title": "Basic CPU / Mem / Net / Disk", + "type": "row" }, { "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 20 + "y": 6 }, "id": 265, "panels": [ @@ -1526,7 +1533,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "description": "", @@ -1710,7 +1717,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "description": "", @@ -1890,7 +1897,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fieldConfig": { "defaults": { @@ -1996,7 +2003,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 3, "description": "", @@ -2096,7 +2103,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fieldConfig": { @@ -2291,7 +2298,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 3, "description": "", @@ -2427,7 +2434,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 3, "description": "", @@ -2528,13 +2535,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 21 + "y": 7 }, "id": 266, "panels": [ @@ -2563,7 +2570,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fieldConfig": { @@ -2578,7 +2585,7 @@ "h": 10, "w": 12, "x": 0, - "y": 8 + "y": 4 }, "hiddenSeries": false, "id": 136, @@ -2603,7 +2610,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2686,7 +2693,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fieldConfig": { @@ -2701,7 +2708,7 @@ "h": 10, "w": 12, "x": 12, - "y": 8 + "y": 4 }, "hiddenSeries": false, "id": 135, @@ -2726,7 +2733,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2818,7 +2825,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fieldConfig": { @@ -2833,7 +2840,7 @@ "h": 10, "w": 12, "x": 0, - "y": 18 + "y": 14 }, "hiddenSeries": false, "id": 191, @@ -2858,7 +2865,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -2963,7 +2970,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fieldConfig": { @@ -2978,7 +2985,7 @@ "h": 10, "w": 12, "x": 12, - "y": 18 + "y": 14 }, "hiddenSeries": false, "id": 130, @@ -3002,7 +3009,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -3093,16 +3100,22 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, "fill": 2, "fillGradient": 0, "gridPos": { "h": 10, "w": 12, "x": 0, - "y": 28 + "y": 24 }, "hiddenSeries": false, "id": 138, @@ -3124,9 +3137,10 @@ "maxPerRow": 6, "nullPointMode": "null", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -3238,16 +3252,22 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, + "fieldConfig": { + "defaults": { + "links": [] + }, + "overrides": [] + }, "fill": 2, "fillGradient": 0, "gridPos": { "h": 10, "w": 12, "x": 12, - "y": 28 + "y": 24 }, "hiddenSeries": false, "id": 131, @@ -3268,9 +3288,10 @@ "maxPerRow": 2, "nullPointMode": "null", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -3354,7 +3375,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fill": 2, @@ -3363,7 +3384,7 @@ "h": 10, "w": 12, "x": 0, - "y": 38 + "y": 34 }, "hiddenSeries": false, "id": 70, @@ -3480,7 +3501,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fill": 2, @@ -3489,7 +3510,7 @@ "h": 10, "w": 12, "x": 12, - "y": 38 + "y": 34 }, "hiddenSeries": false, "id": 159, @@ -3589,7 +3610,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fill": 2, @@ -3598,7 +3619,7 @@ "h": 10, "w": 12, "x": 0, - "y": 48 + "y": 44 }, "hiddenSeries": false, "id": 129, @@ -3709,7 +3730,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fill": 2, @@ -3718,7 +3739,7 @@ "h": 10, "w": 12, "x": 12, - "y": 48 + "y": 44 }, "hiddenSeries": false, "id": 160, @@ -3827,7 +3848,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fill": 2, @@ -3836,7 +3857,7 @@ "h": 10, "w": 12, "x": 0, - "y": 58 + "y": 54 }, "hiddenSeries": false, "id": 140, @@ -3952,7 +3973,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fill": 2, @@ -3961,7 +3982,7 @@ "h": 10, "w": 12, "x": 12, - "y": 58 + "y": 54 }, "hiddenSeries": false, "id": 71, @@ -4069,7 +4090,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fill": 2, @@ -4078,7 +4099,7 @@ "h": 10, "w": 12, "x": 0, - "y": 68 + "y": 64 }, "hiddenSeries": false, "id": 128, @@ -4196,7 +4217,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fill": 2, @@ -4205,7 +4226,7 @@ "h": 10, "w": 12, "x": 12, - "y": 68 + "y": 64 }, "hiddenSeries": false, "id": 137, @@ -4314,7 +4335,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fill": 2, @@ -4323,7 +4344,7 @@ "h": 10, "w": 12, "x": 0, - "y": 78 + "y": 74 }, "hiddenSeries": false, "id": 132, @@ -4404,13 +4425,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 22 + "y": 8 }, "id": 267, "panels": [ @@ -4421,7 +4442,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -4521,7 +4542,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -4639,7 +4660,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fill": 2, @@ -4771,7 +4792,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 2, "fill": 2, @@ -4862,13 +4883,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 23 + "y": 9 }, "id": 293, "panels": [ @@ -4879,7 +4900,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fill": 2, @@ -4993,7 +5014,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fill": 2, @@ -5080,7 +5101,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fill": 2, @@ -5181,7 +5202,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fill": 2, @@ -5278,13 +5299,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 24 + "y": 10 }, "id": 312, "panels": [ @@ -5295,7 +5316,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -5390,7 +5411,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Requires --collector.processes", "fill": 2, @@ -5479,7 +5500,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -5567,7 +5588,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -5686,7 +5707,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Requires --collector.processes", "fill": 2, @@ -5790,7 +5811,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -5891,7 +5912,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -5995,13 +6016,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 25 + "y": 11 }, "id": 269, "panels": [ @@ -6012,7 +6033,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -6108,7 +6129,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -6211,7 +6232,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Requires --collector.interrupts", "fill": 2, @@ -6310,7 +6331,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -6397,7 +6418,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -6484,7 +6505,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -6571,7 +6592,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -6672,13 +6693,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 26 + "y": 12 }, "id": 304, "panels": [ @@ -6689,7 +6710,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -6826,7 +6847,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Requires --collector.thermal_zone", "fill": 2, @@ -6929,7 +6950,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "Requires --collector.powersupplyclass", "fill": 2, @@ -7018,13 +7039,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 27 + "y": 13 }, "id": 296, "panels": [ @@ -7035,7 +7056,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fieldConfig": { "defaults": { @@ -7129,7 +7150,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fieldConfig": { "defaults": { @@ -7280,13 +7301,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 28 + "y": 14 }, "id": 270, "panels": [ @@ -7297,7 +7318,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fieldConfig": { @@ -7484,7 +7505,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fieldConfig": { @@ -7673,7 +7694,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fieldConfig": { @@ -7864,7 +7885,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fieldConfig": { @@ -8043,7 +8064,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fieldConfig": { @@ -8232,7 +8253,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fieldConfig": { @@ -8419,7 +8440,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fieldConfig": { @@ -8599,7 +8620,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fieldConfig": { @@ -8785,13 +8806,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 29 + "y": 15 }, "id": 271, "panels": [ @@ -8802,7 +8823,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "decimals": 3, "description": "", @@ -8912,7 +8933,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fill": 2, @@ -9002,7 +9023,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fill": 2, @@ -9098,7 +9119,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fill": 2, @@ -9190,7 +9211,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fill": 2, @@ -9292,13 +9313,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 30 + "y": 16 }, "id": 272, "panels": [ @@ -9314,7 +9335,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -9416,7 +9437,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -9520,7 +9541,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -9624,7 +9645,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -9728,7 +9749,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -9824,7 +9845,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -9928,7 +9949,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -10025,7 +10046,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -10116,7 +10137,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -10212,7 +10233,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -10313,7 +10334,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -10400,7 +10421,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -10488,7 +10509,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -10576,7 +10597,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -10664,7 +10685,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -10770,7 +10791,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -10862,7 +10883,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -10961,13 +10982,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 31 + "y": 17 }, "id": 273, "panels": [ @@ -10978,7 +10999,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -11106,7 +11127,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -11215,7 +11236,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -11306,7 +11327,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -11406,7 +11427,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -11516,13 +11537,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 32 + "y": 18 }, "id": 274, "panels": [ @@ -11533,7 +11554,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fieldConfig": { "defaults": { @@ -11647,7 +11668,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fieldConfig": { "defaults": { @@ -11748,7 +11769,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -11854,7 +11875,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -11951,7 +11972,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -12061,7 +12082,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -12186,7 +12207,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -12297,7 +12318,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fill": 2, @@ -12424,7 +12445,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -12533,7 +12554,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fill": 2, @@ -12653,7 +12674,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "fill": 2, "fillGradient": 0, @@ -12755,13 +12776,13 @@ "collapsed": true, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "gridPos": { "h": 1, "w": 24, "x": 0, - "y": 33 + "y": 19 }, "id": 279, "panels": [ @@ -12772,7 +12793,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fieldConfig": { @@ -12869,7 +12890,7 @@ "dashes": false, "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "", "fieldConfig": { @@ -12982,7 +13003,7 @@ } ], "refresh": "5m", - "schemaVersion": 36, + "schemaVersion": 37, "style": "dark", "tags": [ "linux" @@ -12991,7 +13012,7 @@ "list": [ { "current": { - "selected": true, + "selected": false, "text": "Prometheus", "value": "Prometheus" }, @@ -13010,14 +13031,10 @@ }, { "current": { - "selected": true, + "selected": false, "text": "node", "value": "node" }, - "datasource": { - "type": "prometheus", - "uid": "ocBf6n87k" - }, "definition": "", "hide": 0, "includeAll": false, @@ -13041,12 +13058,8 @@ { "current": { "selected": true, - "text": "172.12.50.105:9100", - "value": "172.12.50.105:9100" - }, - "datasource": { - "type": "prometheus", - "uid": "ocBf6n87k" + "text": "172.12.50.22:9100", + "value": "172.12.50.22:9100" }, "definition": "label_values(node_uname_info{job=\"$job\"}, instance)", "hide": 0, @@ -13124,4 +13137,4 @@ "uid": "rYdddlPWj", "version": 1, "weekStart": "" -} \ No newline at end of file +} diff --git a/grafana/provisioning/dashboards/NodeExporterOverview.json b/grafana/provisioning/dashboards/NodeExporterOverview.json index 016106f..f765736 100644 --- a/grafana/provisioning/dashboards/NodeExporterOverview.json +++ b/grafana/provisioning/dashboards/NodeExporterOverview.json @@ -26,15 +26,13 @@ "fiscalYearStartMonth": 0, "gnetId": 13702, "graphTooltip": 0, - "id": 15, - "iteration": 1651066452859, "links": [], "liveNow": false, "panels": [ { "datasource": { "type": "prometheus", - "uid": "ocBf6n87k" + "uid": "PBFA97CFB590B2093" }, "description": "- *Load* - CPU capasity used (load average for last 1 minute divided by CPU cores count)\n- *CPU* - CPU usage\n- *Memory* - memory usage\n- *Filesystem* - filesystem usage\n- *Disk read* - maximum among all disks read rate\n- *Dist write* - maximum among all disks write rate\n- *Net recv* - maximum among all NIC's receive rate\n- *Net trans* - maximum among all NIC's transmit rate\n- *Net sock* - used network sockets \n- *TCP estab* - TCP established connections\n- *TCP tw* - TCP sockets in TIME-WAIT status", "fieldConfig": { @@ -580,6 +578,18 @@ "value": 78 } ] + }, + { + "matcher": { + "id": "byName", + "options": "Host" + }, + "properties": [ + { + "id": "custom.width", + "value": 99 + } + ] } ] }, @@ -606,9 +616,14 @@ } ] }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", "exemplar": true, "expr": "node_uname_info{job=~\"$job\"}", "format": "table", @@ -618,6 +633,10 @@ "refId": "A" }, { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "exemplar": true, "expr": "(1 - avg(rate(node_cpu_seconds_total{job=~\"$job\",mode=\"idle\"}[$__rate_interval])) by (instance)) * 100", "format": "table", @@ -627,6 +646,10 @@ "refId": "C" }, { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "expr": "(1 - (node_memory_MemAvailable_bytes{job=~\"$job\"} / (node_memory_MemTotal_bytes{job=~\"$job\"}))) * 100", "format": "table", "instant": true, @@ -635,6 +658,10 @@ "refId": "D" }, { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "expr": "max((1 - (node_filesystem_free_bytes{job=~\"$job\"} / node_filesystem_size_bytes{job=~\"$job\"})) * 100) by (instance)", "format": "table", "instant": true, @@ -643,6 +670,10 @@ "refId": "F" }, { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "exemplar": true, "expr": "max(rate(node_disk_read_bytes_total{job=~\"$job\"}[$__rate_interval])) by (instance)", "format": "table", @@ -652,6 +683,10 @@ "refId": "G" }, { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "exemplar": true, "expr": "max(rate(node_disk_written_bytes_total{job=~\"$job\"}[$__rate_interval])) by (instance)", "format": "table", @@ -661,6 +696,10 @@ "refId": "H" }, { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "expr": "node_netstat_Tcp_CurrEstab{job=~\"$job\"} - 0", "format": "table", "instant": true, @@ -669,6 +708,10 @@ "refId": "I" }, { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "expr": "node_sockstat_TCP_tw{job=~\"$job\"} - 0", "format": "table", "instant": true, @@ -677,6 +720,10 @@ "refId": "J" }, { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "exemplar": true, "expr": "max(rate(node_network_receive_bytes_total{job=~\"$job\"}[$__rate_interval])*8) by (instance)", "format": "table", @@ -686,6 +733,10 @@ "refId": "K" }, { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "exemplar": true, "expr": "max(rate(node_network_transmit_bytes_total{job=~\"$job\"}[$__rate_interval])*8) by (instance)", "format": "table", @@ -695,6 +746,10 @@ "refId": "L" }, { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "exemplar": true, "expr": "avg(node_load1{job=~\"$job\"} * 100) by (instance) / count (node_cpu_seconds_total{job=~\"$job\", mode=\"system\"}) by (instance)", "format": "table", @@ -704,6 +759,10 @@ "refId": "M" }, { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, "expr": "node_sockstat_sockets_used{job=~\"$job\"}", "format": "table", "instant": true, @@ -768,68 +827,50 @@ "job 5": true, "job 6": true, "machine": true, - "nodename": true, + "nodename": false, "release": true, "sysname": true, "version": true }, "indexByName": { - "Time 1": 16, - "Time 10": 44, - "Time 11": 48, - "Time 12": 49, - "Time 13": 50, - "Time 14": 51, - "Time 2": 25, - "Time 3": 29, - "Time 4": 34, - "Time 5": 36, - "Time 6": 37, - "Time 7": 38, - "Time 8": 39, - "Time 9": 40, - "Value #A": 15, - "Value #B": 3, - "Value #C": 5, - "Value #D": 6, - "Value #E": 2, - "Value #F": 7, - "Value #G": 8, - "Value #H": 9, - "Value #I": 13, - "Value #J": 14, - "Value #K": 10, - "Value #L": 11, - "Value #M": 4, - "Value #N": 12, - "__name__ 1": 17, - "__name__ 2": 26, - "__name__ 3": 52, - "datacenter 1": 0, - "datacenter 2": 27, - "datacenter 3": 30, - "datacenter 4": 41, - "datacenter 5": 45, - "datacenter 6": 53, - "domainname": 18, - "hostname 1": 1, - "hostname 2": 33, - "hostname 3": 35, - "hostname 4": 42, - "hostname 5": 46, - "hostname 6": 54, - "instance": 32, - "job 1": 19, - "job 2": 28, - "job 3": 31, - "job 4": 43, - "job 5": 47, - "job 6": 55, - "machine": 20, - "nodename": 21, - "release": 22, - "sysname": 23, - "version": 24 + "Time 1": 13, + "Time 10": 34, + "Time 11": 36, + "Time 12": 37, + "Time 2": 21, + "Time 3": 24, + "Time 4": 27, + "Time 5": 28, + "Time 6": 29, + "Time 7": 30, + "Time 8": 31, + "Time 9": 32, + "Value #A": 12, + "Value #C": 2, + "Value #D": 3, + "Value #F": 4, + "Value #G": 5, + "Value #H": 6, + "Value #I": 10, + "Value #J": 11, + "Value #K": 7, + "Value #L": 8, + "Value #M": 1, + "Value #N": 9, + "__name__ 1": 14, + "__name__ 2": 22, + "domainname": 15, + "instance": 26, + "job 1": 16, + "job 2": 23, + "job 3": 25, + "job 4": 33, + "job 5": 35, + "machine": 17, + "nodename": 0, + "release": 18, + "sysname": 19, + "version": 20 }, "renameByName": { "Difference": "Core-LA1", @@ -848,7 +889,8 @@ "Value #M": "Load", "Value #N": "Net sock", "datacenter 1": "DC", - "hostname 1": "Node" + "hostname 1": "Node", + "nodename": "Host" } } } @@ -858,7 +900,7 @@ } ], "refresh": "30s", - "schemaVersion": 36, + "schemaVersion": 37, "style": "dark", "tags": [ "prometheus", @@ -868,16 +910,16 @@ "list": [ { "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, - "datasource": { - "type": "prometheus", - "uid": "ocBf6n87k" + "selected": true, + "text": [ + "All" + ], + "value": [ + "$__all" + ] }, "definition": "label_values(node_uname_info, job)", - "hide": 2, + "hide": 1, "includeAll": true, "label": "Job", "multi": true, @@ -885,7 +927,7 @@ "options": [], "query": { "query": "label_values(node_uname_info, job)", - "refId": "Prometheus-job-Variable-Query" + "refId": "StandardVariableQuery" }, "refresh": 1, "regex": "", @@ -899,7 +941,7 @@ ] }, "time": { - "from": "now-30m", + "from": "now-15m", "to": "now" }, "timepicker": { @@ -930,4 +972,4 @@ "uid": "gbGKmy-Gzdsfdskjfmkl", "version": 1, "weekStart": "" -} \ No newline at end of file +} diff --git a/grafana/provisioning/dashboards/NodeExporterUseMethod.json b/grafana/provisioning/dashboards/NodeExporterUseMethod.json index 116b64a..00efc70 100644 --- a/grafana/provisioning/dashboards/NodeExporterUseMethod.json +++ b/grafana/provisioning/dashboards/NodeExporterUseMethod.json @@ -26,8 +26,6 @@ "fiscalYearStartMonth": 0, "gnetId": 13971, "graphTooltip": 0, - "id": 17, - "iteration": 1651069310021, "links": [], "liveNow": false, "panels": [ @@ -84,7 +82,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -174,7 +172,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -277,7 +275,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -363,7 +361,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -465,7 +463,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -568,7 +566,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -688,7 +686,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -774,7 +772,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -851,12 +849,14 @@ "uid": "$datasource" }, "fill": 10, + "fillGradient": 0, "gridPos": { "h": 7, "w": 24, "x": 0, "y": 33 }, + "hiddenSeries": false, "id": 9, "legend": { "avg": false, @@ -871,7 +871,11 @@ "linewidth": 0, "links": [], "nullPointMode": "null as zero", + "options": { + "alertThreshold": true + }, "percentage": false, + "pluginVersion": "9.3.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -891,6 +895,7 @@ } ], "thresholds": [], + "timeRegions": [], "title": "Disk Space Utilisation", "tooltip": { "shared": true, @@ -916,18 +921,21 @@ "logBase": 1, "show": false } - ] + ], + "yaxis": { + "align": false + } } ], "refresh": "10s", - "schemaVersion": 36, + "schemaVersion": 37, "style": "dark", "tags": [], "templating": { "list": [ { "current": { - "selected": true, + "selected": false, "text": "Prometheus", "value": "Prometheus" }, @@ -974,9 +982,9 @@ "30d" ] }, - "timezone": "utc", + "timezone": "", "title": "Node Exporter - USE Method / Cluster 2", "uid": "5g3BhUQ7k", "version": 1, "weekStart": "" -} \ No newline at end of file +} diff --git a/grafana/provisioning/dashboards/home.json b/grafana/provisioning/dashboards/home.json index a7a3e53..7965bb3 100644 --- a/grafana/provisioning/dashboards/home.json +++ b/grafana/provisioning/dashboards/home.json @@ -24,7 +24,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 3, "links": [], "liveNow": false, "panels": [ @@ -49,7 +48,7 @@ "showStarred": true, "tags": [] }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "title": "Home", "type": "dashlist" }, @@ -118,7 +117,7 @@ "text": {}, "textMode": "auto" }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "datasource": { @@ -172,25 +171,25 @@ "stateFilter": { "error": true, "firing": true, - "inactive": true, "noData": false, - "normal": false, + "normal": true, "pending": true - } + }, + "viewMode": "list" }, "title": "Alerts", "type": "alertlist" } ], "refresh": "5s", - "schemaVersion": 36, + "schemaVersion": 37, "style": "dark", "tags": [], "templating": { "list": [] }, "time": { - "from": "now-6h", + "from": "now-3h", "to": "now" }, "timepicker": {}, @@ -199,4 +198,4 @@ "uid": "YjSujy5nk", "version": 1, "weekStart": "" -} \ No newline at end of file +} diff --git a/grafana/provisioning/dashboards/lap-overview.json b/grafana/provisioning/dashboards/lap-overview.json index 69ca55e..9beefe1 100644 --- a/grafana/provisioning/dashboards/lap-overview.json +++ b/grafana/provisioning/dashboards/lap-overview.json @@ -25,7 +25,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 7, "links": [], "liveNow": false, "panels": [ @@ -199,12 +198,13 @@ ] }, "gridPos": { - "h": 14, + "h": 18, "w": 24, "x": 0, "y": 0 }, "id": 4, + "interval": "10s", "options": { "footer": { "fields": "", @@ -221,7 +221,7 @@ } ] }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { "cacheDurationSeconds": 0, @@ -410,18 +410,100 @@ } ], "type": "table" + }, + { + "datasource": { + "type": "postgres", + "uid": "P153BFFACB2904795" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 24, + "x": 0, + "y": 18 + }, + "id": 6, + "interval": "10s", + "options": { + "colorMode": "value", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "/^laps$/", + "values": true + }, + "text": { + "titleSize": 50, + "valueSize": 150 + }, + "textMode": "auto" + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "postgres", + "uid": "P153BFFACB2904795" + }, + "editorMode": "code", + "format": "table", + "rawQuery": true, + "rawSql": "SELECT t.name as team_name, COUNT(*) as laps\nFROM team t join lap l ON t.id = l.team_id\nWHERE lap_source_id = 5\nGROUP BY team_name\nORDER BY laps DESC\nLIMIT 3", + "refId": "A", + "sql": { + "columns": [ + { + "parameters": [], + "type": "function" + } + ], + "groupBy": [ + { + "property": { + "type": "string" + }, + "type": "groupBy" + } + ], + "limit": 50 + } + } + ], + "type": "stat" } ], - "refresh": "5s", - "schemaVersion": 36, + "refresh": "", + "schemaVersion": 37, "style": "dark", "tags": [], "templating": { "list": [] }, "time": { - "from": "2023-03-07T22:41:47.858Z", - "to": "2023-03-07T22:51:47.858Z" + "from": "now-15m", + "to": "now" }, "timepicker": { "refresh_intervals": [ @@ -442,4 +524,4 @@ "uid": "y9DWmy_Wk", "version": 3, "weekStart": "" -} \ No newline at end of file +} diff --git a/grafana/provisioning/dashboards/lap-times.json b/grafana/provisioning/dashboards/lap-times.json index 3e9f3e9..a252534 100644 --- a/grafana/provisioning/dashboards/lap-times.json +++ b/grafana/provisioning/dashboards/lap-times.json @@ -24,8 +24,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 4, - "iteration": 1678301154197, "links": [], "liveNow": false, "panels": [ @@ -40,6 +38,8 @@ "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -88,7 +88,7 @@ }, "gridPos": { "h": 11, - "w": 19, + "w": 17, "x": 0, "y": 0 }, @@ -101,7 +101,8 @@ "mean" ], "displayMode": "table", - "placement": "right" + "placement": "right", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -148,72 +149,56 @@ }, { "datasource": { - "type": "marcusolsson-json-datasource", - "uid": "P3B066C7CF800AEFC" + "type": "postgres", + "uid": "P153BFFACB2904795" }, "fieldConfig": { "defaults": { "color": { "mode": "thresholds" }, - "custom": { - "align": "auto", - "displayMode": "auto", - "inspect": false - }, "mappings": [], "thresholds": { - "mode": "percentage", + "mode": "absolute", "steps": [ { "color": "green", "value": null }, { - "color": "dark-red", - "value": 10 - } - ] - } - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "timestamp (max)" - }, - "properties": [ - { - "id": "unit", - "value": "dateTimeAsIsoNoDateIfToday" + "color": "#EAB839", + "value": 90 }, { - "id": "displayName", - "value": "Last lap" - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "team_name" - }, - "properties": [ - { - "id": "displayName", - "value": "Team name" + "color": "semi-dark-red", + "value": 120 } ] }, + "unit": "s" + }, + "overrides": [ { "matcher": { "id": "byName", - "options": "Team name" + "options": "since" }, "properties": [ { - "id": "custom.width", - "value": 237 + "id": "mappings", + "value": [ + { + "options": { + "match": "null", + "result": { + "color": "semi-dark-orange", + "index": 0, + "text": "team has no laps" + } + }, + "type": "special" + } + ] } ] } @@ -221,87 +206,68 @@ }, "gridPos": { "h": 22, - "w": 5, - "x": 19, + "w": 7, + "x": 17, "y": 0 }, "id": 6, + "interval": "3s", "options": { - "footer": { - "fields": "", - "reducer": [ - "sum" + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" ], - "show": false + "fields": "/^since$/", + "values": true }, - "showHeader": true, - "sortBy": [ - { - "desc": false, - "displayName": "Last lap" - } - ] + "text": { + "titleSize": 15 + }, + "textMode": "value_and_name" }, - "pluginVersion": "8.5.0", + "pluginVersion": "9.3.6", "targets": [ { - "cacheDurationSeconds": 0, "datasource": { - "type": "marcusolsson-json-datasource", - "uid": "P3B066C7CF800AEFC" + "type": "postgres", + "uid": "P153BFFACB2904795" }, - "fields": [ - { - "jsonPath": "$.[*].timestamp", - "language": "jsonpath", - "name": "", - "type": "time" - }, - { - "jsonPath": "$.[*].team_name", - "language": "jsonpath", - "name": "" - } - ], - "method": "GET", - "queryParams": "", + "editorMode": "code", + "format": "table", + "rawQuery": true, + "rawSql": "select EXTRACT(EPOCH FROM (now()-max(timestamp))) as since, t.name as name\nfrom lap\n right join lap_source ls on (lap.lap_source_id = ls.id and ls.name = 'robust-lapper')\n right join team t on lap.team_id = t.id\ngroup by team_id, t.name", "refId": "A", - "urlPath": "/monitoring/team-lap-times/$Lapper" - } - ], - "title": "Panel Title", - "transformations": [ - { - "id": "groupBy", - "options": { - "fields": { - "team_name": { - "aggregations": [], - "operation": "groupby" - }, - "timestamp": { - "aggregations": [ - "max" - ], - "operation": "aggregate" + "sql": { + "columns": [ + { + "parameters": [], + "type": "function" } - } - } - }, - { - "id": "convertFieldType", - "options": { - "conversions": [ + ], + "groupBy": [ { - "destinationType": "time", - "targetField": "timestamp (max)" + "property": { + "type": "string" + }, + "type": "groupBy" } ], - "fields": {} + "limit": 50 } } ], - "type": "table" + "title": "Time since last lap", + "transformations": [ + { + "id": "sortBy", + "options": {} + } + ], + "type": "stat" }, { "datasource": { @@ -314,6 +280,8 @@ "mode": "palette-classic" }, "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -362,7 +330,7 @@ }, "gridPos": { "h": 11, - "w": 19, + "w": 17, "x": 0, "y": 11 }, @@ -375,7 +343,8 @@ "mean" ], "displayMode": "table", - "placement": "right" + "placement": "right", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -420,8 +389,8 @@ "type": "timeseries" } ], - "refresh": "10s", - "schemaVersion": 36, + "refresh": "5s", + "schemaVersion": 37, "style": "dark", "tags": [], "templating": { @@ -468,6 +437,6 @@ "timezone": "", "title": "Lap times", "uid": "t3OIEkaVk", - "version": 1, + "version": 4, "weekStart": "" -} \ No newline at end of file +} diff --git a/grafana/provisioning/dashboards/snmp-network.json b/grafana/provisioning/dashboards/snmp-network.json index 9297fc1..ebf18b0 100644 --- a/grafana/provisioning/dashboards/snmp-network.json +++ b/grafana/provisioning/dashboards/snmp-network.json @@ -1,237 +1,803 @@ { - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": { - "type": "grafana", - "uid": "-- Grafana --" - }, - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "name": "Annotations & Alerts", - "target": { - "limit": 100, - "matchAny": false, - "tags": [], - "type": "dashboard" - }, - "type": "dashboard" - } - ] - }, - "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": 15, - "links": [], - "liveNow": false, - "panels": [ - { - "datasource": { - "type": "prometheus", - "uid": "PBFA97CFB590B2093" - }, - "description": "Traffic on the mikrotik router per bridge network", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "binBps" - }, - "overrides": [] - }, - "gridPos": { - "h": 9, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 2, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "9.3.6", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "PBFA97CFB590B2093" - }, - "editorMode": "code", - "expr": "rate(ifHCInOctets{ifName!~\"ether.*\"}[$__rate_interval])", - "legendFormat": "{{ifName}}", - "range": true, - "refId": "A" - } - ], - "title": "Router traffic IN", - "type": "timeseries" - }, - { - "datasource": { - "type": "prometheus", - "uid": "PBFA97CFB590B2093" - }, - "description": "Traffic on the mikrotik router per bridge network", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 0, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "auto", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green" - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "binBps" - }, - "overrides": [] - }, - "gridPos": { - "h": 9, - "w": 24, - "x": 0, - "y": 9 - }, - "id": 3, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "single", - "sort": "none" - } - }, - "pluginVersion": "9.3.6", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "PBFA97CFB590B2093" - }, - "editorMode": "code", - "expr": "rate(ifHCOutOctets{ifName!~\"ether.*\"}[$__rate_interval])", - "legendFormat": "{{ifName}}", - "range": true, - "refId": "A" - } - ], - "title": "Router traffic OUT", - "type": "timeseries" - } - ], - "refresh": "5s", - "schemaVersion": 37, - "style": "dark", - "tags": [], - "templating": { - "list": [] - }, - "time": { - "from": "now-1h", - "to": "now" - }, - "timepicker": {}, - "timezone": "", - "title": "Network Traffic", - "uid": "N80PqzyVk", - "version": 4, - "weekStart": "" - } \ No newline at end of file + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "grafana", + "uid": "-- Grafana --" + }, + "enable": true, + "hide": true, + "iconColor": "rgba(0, 211, 255, 1)", + "name": "Annotations & Alerts", + "target": { + "limit": 100, + "matchAny": false, + "tags": [], + "type": "dashboard" + }, + "type": "dashboard" + } + ] + }, + "editable": true, + "fiscalYearStartMonth": 0, + "graphTooltip": 0, + "links": [], + "liveNow": false, + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "description": "Traffic on the mikrotik router per bridge network", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "binBps" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 2, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "expr": "rate(ifHCInOctets{ifName!~\"ether.*\"}[$__rate_interval])", + "legendFormat": "{{ifName}}", + "range": true, + "refId": "A" + } + ], + "title": "Router traffic IN", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "description": "Traffic on the mikrotik router per bridge network", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "auto", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "binBps" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 24, + "x": 0, + "y": 8 + }, + "id": 3, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "expr": "rate(ifHCOutOctets{ifName!~\"ether.*\"}[$__rate_interval])", + "legendFormat": "{{ifName}}", + "range": true, + "refId": "A" + } + ], + "title": "Router traffic OUT", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "left", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 71, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineStyle": { + "fill": "solid" + }, + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "red", + "value": 0 + }, + { + "color": "green", + "value": 1 + } + ] + }, + "unit": "bytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 6, + "x": 0, + "y": 15 + }, + "id": 11, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "expr": "rate(ifHCInOctets{ifName=\"uplinkStatic\"}[$__rate_interval])", + "legendFormat": "InOctects", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "expr": "-rate(ifHCOutOctets{ifName=\"uplinkStatic\"}[$__rate_interval])", + "hide": false, + "legendFormat": "OutOctets", + "range": true, + "refId": "B" + } + ], + "title": "UplinkStatic", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "left", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 71, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineStyle": { + "fill": "solid" + }, + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "red", + "value": 0 + }, + { + "color": "green", + "value": 1 + } + ] + }, + "unit": "bytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 14, + "w": 12, + "x": 6, + "y": 15 + }, + "id": 12, + "options": { + "legend": { + "calcs": [ + "last", + "mean", + "max" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "expr": "rate(ifHCInOctets{ifName=\"uplinkDHCP\"}[$__rate_interval])", + "legendFormat": "InOctects", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "expr": "-rate(ifHCOutOctets{ifName=\"uplinkDHCP\"}[$__rate_interval])", + "hide": false, + "legendFormat": "OutOctets", + "range": true, + "refId": "B" + } + ], + "title": "UplinkDHCP", + "type": "timeseries" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "0": { + "color": "red", + "index": 1, + "text": "Offline" + }, + "1": { + "color": "green", + "index": 0, + "text": "Online" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "green", + "value": 1 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 6, + "x": 18, + "y": 15 + }, + "id": 7, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "last" + ], + "fields": "", + "values": false + }, + "text": { + "titleSize": 17, + "valueSize": 10 + }, + "textMode": "auto" + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "exemplar": true, + "expr": "probe_success{service=\"switch\", job=\"blackbox-ping\"}", + "legendFormat": "{{name}}", + "range": true, + "refId": "A" + } + ], + "title": "Switch Status", + "transformations": [ + { + "id": "seriesToRows", + "options": {} + }, + { + "id": "sortBy", + "options": { + "fields": {}, + "sort": [ + { + "field": "Metric" + } + ] + } + }, + { + "id": "prepareTimeSeries", + "options": { + "format": "many" + } + } + ], + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "0": { + "color": "red", + "index": 1, + "text": "Offline" + }, + "1": { + "color": "green", + "index": 0, + "text": "Online" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "green", + "value": 1 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 5, + "w": 6, + "x": 18, + "y": 20 + }, + "id": 5, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "last" + ], + "fields": "", + "values": false + }, + "text": { + "titleSize": 20, + "valueSize": 10 + }, + "textMode": "auto" + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "exemplar": true, + "expr": "probe_success{service=\"AP\", job=\"blackbox-ping\"}", + "interval": "", + "legendFormat": "{{name}}", + "range": true, + "refId": "A" + } + ], + "title": "AP Status", + "transformations": [ + { + "disabled": true, + "id": "seriesToRows", + "options": {} + }, + { + "disabled": true, + "id": "sortBy", + "options": { + "fields": {}, + "sort": [ + { + "field": "Metric" + } + ] + } + }, + { + "disabled": true, + "id": "prepareTimeSeries", + "options": { + "format": "many" + } + } + ], + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "left", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 71, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineStyle": { + "fill": "solid" + }, + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": { + "group": "A", + "mode": "none" + }, + "thresholdsStyle": { + "mode": "off" + } + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "red", + "value": 0 + }, + { + "color": "green", + "value": 1 + } + ] + }, + "unit": "pps" + }, + "overrides": [] + }, + "gridPos": { + "h": 7, + "w": 6, + "x": 0, + "y": 22 + }, + "id": 13, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "expr": "rate(ifHCInUcastPkts{ifName=\"uplinkStatic\"}[$__rate_interval])", + "legendFormat": "InOctects", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "expr": "-rate(ifHCOutUcastPkts{ifName=\"uplinkStatic\"}[$__rate_interval])", + "hide": false, + "legendFormat": "OutOctets", + "range": true, + "refId": "B" + } + ], + "title": "UplinkStatic (ucast)", + "type": "timeseries" + } + ], + "refresh": "5s", + "schemaVersion": 37, + "style": "dark", + "tags": [], + "templating": { + "list": [] + }, + "time": { + "from": "now-1h", + "to": "now" + }, + "timepicker": {}, + "timezone": "", + "title": "Network Traffic", + "uid": "N80PqzyVk", + "version": 1, + "weekStart": "" +} diff --git a/grafana/provisioning/dashboards/status-page.json b/grafana/provisioning/dashboards/status-page.json index 6e5a95c..45ad08b 100644 --- a/grafana/provisioning/dashboards/status-page.json +++ b/grafana/provisioning/dashboards/status-page.json @@ -82,7 +82,7 @@ "overrides": [] }, "gridPos": { - "h": 8, + "h": 9, "w": 2, "x": 0, "y": 0 @@ -117,8 +117,547 @@ "title": "Client1", "transformations": [ { - "id": "seriesToRows", - "options": {} + "id": "seriesToRows", + "options": {} + }, + { + "id": "sortBy", + "options": { + "fields": {}, + "sort": [ + { + "field": "Metric" + } + ] + } + }, + { + "id": "prepareTimeSeries", + "options": { + "format": "many" + } + } + ], + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "0": { + "color": "red", + "index": 1, + "text": "Offline" + }, + "1": { + "color": "green", + "index": 0, + "text": "Online" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "green", + "value": 1 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 8, + "x": 2, + "y": 0 + }, + "id": 31, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "last" + ], + "fields": "", + "values": false + }, + "text": { + "titleSize": 20, + "valueSize": 10 + }, + "textMode": "auto" + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "exemplar": true, + "expr": "probe_success{service=\"AP\", job=\"blackbox-ping\"}", + "interval": "", + "legendFormat": "{{name}}", + "range": true, + "refId": "A" + } + ], + "title": "AP Status", + "transformations": [ + { + "disabled": true, + "id": "seriesToRows", + "options": {} + }, + { + "disabled": true, + "id": "sortBy", + "options": { + "fields": {}, + "sort": [ + { + "field": "Metric" + } + ] + } + }, + { + "disabled": true, + "id": "prepareTimeSeries", + "options": { + "format": "many" + } + } + ], + "type": "stat" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "0": { + "color": "red", + "index": 1, + "text": "Offline" + }, + "1": { + "color": "green", + "index": 0, + "text": "Online" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "green", + "value": 1 + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 4, + "w": 6, + "x": 10, + "y": 0 + }, + "id": 32, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "auto", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "last" + ], + "fields": "", + "values": false + }, + "text": { + "titleSize": 17, + "valueSize": 10 + }, + "textMode": "auto" + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "exemplar": true, + "expr": "probe_success{service=\"switch\", job=\"blackbox-ping\"}", + "legendFormat": "{{name}}", + "range": true, + "refId": "A" + } + ], + "title": "Switch Status", + "transformations": [ + { + "id": "seriesToRows", + "options": {} + }, + { + "id": "sortBy", + "options": { + "fields": {}, + "sort": [ + { + "field": "Metric" + } + ] + } + }, + { + "id": "prepareTimeSeries", + "options": { + "format": "many" + } + } + ], + "type": "stat" + }, + { + "datasource": { + "type": "postgres", + "uid": "P153BFFACB2904795" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "orange", + "value": 10 + }, + { + "color": "red", + "value": 20 + } + ] + }, + "unit": "s" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "extract" + }, + "properties": [ + { + "id": "mappings", + "value": [ + { + "options": { + "match": "null", + "result": { + "color": "blue", + "index": 0, + "text": "No detections yet" + } + }, + "type": "special" + } + ] + } + ] + } + ] + }, + "gridPos": { + "h": 3, + "w": 8, + "x": 16, + "y": 0 + }, + "id": 29, + "interval": "2s", + "maxDataPoints": 1000, + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "center", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "/^extract$/", + "values": true + }, + "text": { + "titleSize": 16, + "valueSize": 10 + }, + "textMode": "value_and_name" + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "cacheDurationSeconds": 300, + "datasource": { + "type": "postgres", + "uid": "P153BFFACB2904795" + }, + "editorMode": "code", + "fields": [ + { + "jsonPath": "" + } + ], + "format": "table", + "group": [], + "method": "GET", + "metricColumn": "none", + "queryParams": "", + "rawQuery": true, + "rawSql": "select EXTRACT(EPOCH FROM (now() - max(timestamp))), s.name\nfrom detection\n right join station s on detection.station_id = s.id\ngroup by detection.station_id, s.id, s.name\norder by s.name;", + "refId": "A", + "select": [ + [ + { + "params": [ + "battery" + ], + "type": "column" + } + ] + ], + "sql": { + "columns": [ + { + "parameters": [], + "type": "function" + } + ], + "groupBy": [ + { + "property": { + "type": "string" + }, + "type": "groupBy" + } + ], + "limit": 50 + }, + "table": "detection", + "timeColumn": "\"timestamp\"", + "timeColumnType": "timestamp", + "urlPath": "", + "where": [ + { + "name": "$__timeFilter", + "params": [], + "type": "macro" + } + ] + } + ], + "title": "Station latest detection", + "transformations": [], + "type": "stat" + }, + { + "datasource": { + "type": "postgres", + "uid": "P153BFFACB2904795" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "mappings": [ + { + "options": { + "match": "null", + "result": { + "color": "orange", + "index": 0 + } + }, + "type": "special" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "orange", + "value": 70 + }, + { + "color": "green", + "value": 80 + } + ] + }, + "unit": "percent" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "battery" + }, + "properties": [ + { + "id": "mappings", + "value": [ + { + "options": { + "match": "null", + "result": { + "color": "blue", + "index": 0, + "text": "No data in past minute" + } + }, + "type": "special" + } + ] + } + ] + } + ] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 16, + "y": 3 + }, + "id": 20, + "interval": "5s", + "options": { + "colorMode": "background", + "graphMode": "area", + "justifyMode": "center", + "orientation": "auto", + "reduceOptions": { + "calcs": [ + "lastNotNull" + ], + "fields": "/^battery$/", + "values": true + }, + "text": { + "titleSize": 22, + "valueSize": 12 + }, + "textMode": "value_and_name" + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "postgres", + "uid": "P153BFFACB2904795" + }, + "editorMode": "code", + "format": "table", + "rawQuery": true, + "rawSql": "SELECT DISTINCT ON (baton.name) name,\n CASE\n -- To see last battery not regarding time, chaneg seconds into years\n WHEN (detection.timestamp >= now() - interval '60 SECONDS') THEN detection.battery\n END\n AS battery\nFROM detection right join baton ON baton.id = detection.baton_id\nORDER BY name, timestamp DESC, battery ASC", + "refId": "A", + "sql": { + "columns": [ + { + "parameters": [ + { + "name": "battery", + "type": "functionParameter" + } + ], + "type": "function" + } + ], + "groupBy": [ + { + "property": { + "type": "string" + }, + "type": "groupBy" + } + ], + "limit": 50 + }, + "table": "detection" + } + ], + "title": "Battery percentage", + "transformations": [ + { + "id": "calculateField", + "options": { + "alias": "battery_is_null", + "mode": "reduceRow", + "reduce": { + "include": [ + "battery" + ], + "reducer": "allIsNull" + }, + "replaceFields": false + } }, { "id": "sortBy", @@ -126,15 +665,32 @@ "fields": {}, "sort": [ { - "field": "Metric" + "desc": false, + "field": "name" } ] } }, { - "id": "prepareTimeSeries", + "id": "sortBy", "options": { - "format": "many" + "fields": {}, + "sort": [ + { + "desc": false, + "field": "battery_is_null" + } + ] + } + }, + { + "id": "organize", + "options": { + "excludeByName": { + "battery_is_null": true + }, + "indexByName": {}, + "renameByName": {} } } ], @@ -184,10 +740,10 @@ "overrides": [] }, "gridPos": { - "h": 8, - "w": 8, + "h": 5, + "w": 9, "x": 2, - "y": 0 + "y": 4 }, "id": 9, "options": { @@ -197,12 +753,15 @@ "orientation": "auto", "reduceOptions": { "calcs": [ - "lastNotNull" + "last" ], "fields": "", "values": false }, - "text": {}, + "text": { + "titleSize": 33, + "valueSize": 25 + }, "textMode": "auto" }, "pluginVersion": "9.3.6", @@ -230,6 +789,18 @@ "interval": "", "legendFormat": "{{name}}", "refId": "B" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "expr": "probe_success{job=\"blackbox\", service=\"livesite\"}", + "hide": false, + "legendFormat": "{{name}}", + "range": true, + "refId": "C" } ], "title": "Service status", @@ -250,8 +821,9 @@ "options": { "match": "null", "result": { - "color": "dark-red", - "index": 0 + "color": "red", + "index": 0, + "text": "No time" } }, "type": "special" @@ -274,30 +846,16 @@ }, "unit": "s" }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "name" - }, - "properties": [ - { - "id": "color", - "value": { - "mode": "continuous-BlYlRd" - } - } - ] - } - ] + "overrides": [] }, "gridPos": { - "h": 8, - "w": 6, - "x": 10, - "y": 0 + "h": 5, + "w": 5, + "x": 11, + "y": 4 }, "id": 17, + "interval": "1s", "options": { "colorMode": "background", "graphMode": "area", @@ -310,7 +868,10 @@ "fields": "/^abs_offset$/", "values": true }, - "text": {}, + "text": { + "titleSize": 14, + "valueSize": 15 + }, "textMode": "auto" }, "pluginVersion": "9.3.6", @@ -353,128 +914,8 @@ }, { "datasource": { - "type": "postgres", - "uid": "P153BFFACB2904795" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "color": "orange", - "index": 0 - } - }, - "type": "special" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "red", - "value": null - }, - { - "color": "orange", - "value": 70 - }, - { - "color": "green", - "value": 80 - } - ] - }, - "unit": "percent" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 0 - }, - "id": 20, - "interval": "10s", - "options": { - "colorMode": "background", - "graphMode": "area", - "justifyMode": "center", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "/^battery$/", - "values": true - }, - "text": {}, - "textMode": "auto" - }, - "pluginVersion": "9.3.6", - "targets": [ - { - "datasource": { - "type": "postgres", - "uid": "P153BFFACB2904795" - }, - "editorMode": "code", - "format": "table", - "rawQuery": true, - "rawSql": "SELECT DISTINCT ON (baton.name) name, detection.battery as battery, detection.timestamp as timestamp, detection.id\nFROM detection right join baton ON baton.id = detection.baton_id\nORDER BY name, timestamp DESC, battery ASC", - "refId": "A", - "sql": { - "columns": [ - { - "parameters": [ - { - "name": "battery", - "type": "functionParameter" - } - ], - "type": "function" - } - ], - "groupBy": [ - { - "property": { - "type": "string" - }, - "type": "groupBy" - } - ], - "limit": 50 - }, - "table": "detection" - } - ], - "title": "Battery percentage", - "transformations": [ - { - "id": "sortBy", - "options": { - "fields": {}, - "sort": [ - { - "desc": false, - "field": "name" - } - ] - } - } - ], - "type": "stat" - }, - { - "datasource": { - "type": "prometheus", - "uid": "PBFA97CFB590B2093" + "type": "datasource", + "uid": "-- Mixed --" }, "fieldConfig": { "defaults": { @@ -497,21 +938,23 @@ "value": null }, { - "color": "dark-green", + "color": "green", "value": 1 } ] - } + }, + "unit": "none" }, "overrides": [] }, "gridPos": { "h": 14, - "w": 6, + "w": 5, "x": 0, - "y": 8 + "y": 9 }, "id": 15, + "interval": "2s", "options": { "basemap": { "config": {}, @@ -529,13 +972,13 @@ "layers": [ { "config": { - "showLegend": true, + "showLegend": false, "style": { "color": { - "field": "Value #A", - "fixed": "dark-green" + "field": "Value", + "fixed": "green" }, - "opacity": 1, + "opacity": 0.5, "rotation": { "fixed": 0, "max": 360, @@ -543,59 +986,144 @@ "mode": "mod" }, "size": { - "fixed": 10, + "fixed": 25, "max": 15, - "min": 2 + "min": 1 }, "symbol": { - "fixed": "img/icons/marker/square.svg", + "field": "", + "fixed": "img/icons/unicons/abacus.svg", "mode": "fixed" }, + "text": { + "field": "dbname", + "fixed": "", + "mode": "field" + }, "textConfig": { "fontSize": 12, "offsetX": 0, - "offsetY": 0, + "offsetY": -25, "textAlign": "center", "textBaseline": "middle" } } }, "location": { - "mode": "coords" + "mode": "auto" }, - "name": "Layer 1", + "name": "Station Layer", "type": "markers" + }, + { + "config": { + "showLegend": false, + "style": { + "color": { + "fixed": "blue" + }, + "opacity": 0, + "rotation": { + "fixed": 0, + "max": 360, + "min": -360, + "mode": "mod" + }, + "size": { + "fixed": 1, + "max": 15, + "min": 2 + }, + "symbol": { + "fixed": "img/icons/marker/cross.svg", + "mode": "fixed" + }, + "text": { + "field": "team_name", + "fixed": "", + "mode": "field" + }, + "textConfig": { + "fontSize": 20, + "offsetX": 0, + "textAlign": "center", + "textBaseline": "middle" + } + } + }, + "location": { + "mode": "auto" + }, + "name": "Team Layer", + "tooltip": true, + "type": "markers" + } + ], + "tooltip": { + "mode": "details" + }, + "view": { + "allLayers": true, + "id": "coords", + "lat": 51.042569, + "lon": 3.725906, + "zoom": 17.4 + } + }, + "pluginVersion": "9.3.6", + "targets": [ + { + "datasource": { + "type": "postgres", + "uid": "P153BFFACB2904795" + }, + "editorMode": "code", + "format": "table", + "hide": false, + "rawQuery": true, + "rawSql": "-- cursed query\nSELECT inner2.team_name AS team_name, s.coord_x AS lat, s.coord_y AS lon, s.name as dbname\nFROM (SELECT inner1.team_name AS team_name, d.station_id\n FROM (SELECT t.name as team_name, MAX(d.timestamp) as timestamp\n FROM detection d\n join team t on d.baton_id = t.baton_id\n join station s on d.station_id = s.id\n WHERE t.name IN ([[TEAM_NAME]])\n GROUP BY t.name) inner1\n join detection d ON d.timestamp = inner1.timestamp) inner2\nright join station s on s.id = inner2.station_id", + "refId": "team_latest_detection_data", + "sql": { + "columns": [ + { + "parameters": [], + "type": "function" + } + ], + "groupBy": [ + { + "property": { + "type": "string" + }, + "type": "groupBy" + } + ], + "limit": 50 } - ], - "tooltip": { - "mode": "details" }, - "view": { - "allLayers": true, - "id": "coords", - "lat": 51.042569, - "lon": 3.725806, - "zoom": 17.68 - } - }, - "pluginVersion": "9.3.6", - "targets": [ { "datasource": { "type": "prometheus", "uid": "PBFA97CFB590B2093" }, "editorMode": "code", - "exemplar": true, + "exemplar": false, "expr": "probe_success{job=\"blackbox-ping\", service=\"station\"}", "format": "table", + "instant": true, "interval": "", "legendFormat": "{{name}}", - "range": true, - "refId": "A" + "range": false, + "refId": "pings" } ], "title": "Map", + "transformations": [ + { + "id": "merge", + "options": {} + } + ], "type": "geomap" }, { @@ -642,8 +1170,9 @@ "options": { "match": "null", "result": { - "color": "orange", - "index": 0 + "color": "blue", + "index": 0, + "text": "Not yet seen" } }, "type": "special" @@ -657,8 +1186,8 @@ "gridPos": { "h": 14, "w": 7, - "x": 6, - "y": 8 + "x": 5, + "y": 9 }, "id": 19, "options": { @@ -759,31 +1288,15 @@ }, { "datasource": { - "type": "marcusolsson-json-datasource", - "uid": "P3B066C7CF800AEFC" + "type": "datasource", + "uid": "-- Mixed --" }, "fieldConfig": { "defaults": { "color": { - "mode": "thresholds" + "mode": "continuous-RdYlGr" }, - "mappings": [ - { - "options": { - "false": { - "color": "green", - "index": 1, - "text": "No" - }, - "true": { - "color": "red", - "index": 0, - "text": "YES" - } - }, - "type": "value" - } - ], + "mappings": [], "thresholds": { "mode": "absolute", "steps": [ @@ -792,15 +1305,16 @@ "value": null } ] - } + }, + "unit": "ms" }, "overrides": [] }, "gridPos": { "h": 14, - "w": 3, - "x": 13, - "y": 8 + "w": 4, + "x": 12, + "y": 9 }, "id": 21, "options": { @@ -812,10 +1326,13 @@ "calcs": [ "lastNotNull" ], - "fields": "/^rebooted$/", + "fields": "/^uptime_ms$/", "values": true }, - "text": {}, + "text": { + "titleSize": 25, + "valueSize": 15 + }, "textMode": "auto" }, "pluginVersion": "9.3.6", @@ -837,6 +1354,7 @@ "name": "" } ], + "hide": true, "method": "GET", "params": [ [ @@ -847,164 +1365,27 @@ "queryParams": "", "refId": "A", "urlPath": "/monitoring/batons" - } - ], - "title": "Baton restarted", - "transformations": [ - { - "id": "sortBy", - "options": { - "fields": {}, - "sort": [ - { - "desc": false, - "field": "name" - } - ] - } - } - ], - "type": "stat" - }, - { - "datasource": { - "type": "postgres", - "uid": "P153BFFACB2904795" - }, - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "orange", - "value": 5 - }, - { - "color": "red", - "value": 10 - } - ] - }, - "unit": "s" - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "stationId" - }, - "properties": [ - { - "id": "mappings", - "value": [ - { - "options": { - "2": { - "index": 0, - "text": "Ronny01" - }, - "4": { - "index": 1, - "text": "Ronny02" - }, - "5": { - "index": 5, - "text": "Ronny03" - }, - "6": { - "index": 4, - "text": "Ronny04" - }, - "7": { - "index": 6, - "text": "Ronny05" - }, - "8": { - "index": 2, - "text": "Ronny06" - }, - "9": { - "index": 3, - "text": "Ronny07" - } - }, - "type": "value" - } - ] - } - ] - } - ] - }, - "gridPos": { - "h": 3, - "w": 8, - "x": 16, - "y": 8 - }, - "id": 29, - "interval": "2s", - "maxDataPoints": 1000, - "options": { - "colorMode": "background", - "graphMode": "area", - "justifyMode": "center", - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "/^extract$/", - "values": true }, - "text": {}, - "textMode": "value_and_name" - }, - "pluginVersion": "9.3.6", - "targets": [ { - "cacheDurationSeconds": 300, "datasource": { "type": "postgres", "uid": "P153BFFACB2904795" }, "editorMode": "code", - "fields": [ - { - "jsonPath": "" - } - ], "format": "table", - "group": [], - "method": "GET", - "metricColumn": "none", - "queryParams": "", + "hide": false, "rawQuery": true, - "rawSql": "select EXTRACT(EPOCH FROM (now() - max(timestamp))), s.name\nfrom detection\n join station s on detection.station_id = s.id\ngroup by detection.station_id, s.id, s.name\norder by s.name;", - "refId": "A", - "select": [ - [ - { - "params": [ - "battery" - ], - "type": "column" - } - ] - ], + "rawSql": "SELECT uptime_ms, b.name\nfrom detection\njoin baton b on b.id = detection.baton_id\nwhere timestamp in (SELECT max(timestamp) FROM detection group by baton_id)", + "refId": "B", "sql": { "columns": [ { - "parameters": [], + "parameters": [ + { + "name": "uptime_ms", + "type": "functionParameter" + } + ], "type": "function" } ], @@ -1018,21 +1399,24 @@ ], "limit": 50 }, - "table": "detection", - "timeColumn": "\"timestamp\"", - "timeColumnType": "timestamp", - "urlPath": "", - "where": [ - { - "name": "$__timeFilter", - "params": [], - "type": "macro" - } - ] + "table": "detection" + } + ], + "title": "Baton uptime/restarted", + "transformations": [ + { + "id": "sortBy", + "options": { + "fields": {}, + "sort": [ + { + "desc": false, + "field": "name" + } + ] + } } ], - "title": "Station latest detection", - "transformations": [], "type": "stat" }, { @@ -1108,7 +1492,10 @@ "fields": "", "values": false }, - "text": {}, + "text": { + "titleSize": 16, + "valueSize": 10 + }, "textMode": "auto" }, "pluginVersion": "9.3.6", @@ -1221,7 +1608,10 @@ "fields": "", "values": false }, - "text": {}, + "text": { + "titleSize": 16, + "valueSize": 10 + }, "textMode": "auto" }, "pluginVersion": "9.3.6", @@ -1457,6 +1847,147 @@ } ], "type": "state-timeline" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "gridPos": { + "h": 2, + "w": 11, + "x": 0, + "y": 23 + }, + "id": 35, + "options": { + "bgColor": "", + "clockType": "24 hour", + "countdownSettings": { + "endCountdownTime": "2023-04-26T14:58:50+02:00", + "endText": "00:00:00" + }, + "countupSettings": { + "beginCountupTime": "2023-04-26T09:00:00+02:00", + "beginText": "00:00:00" + }, + "dateSettings": { + "dateFormat": "YYYY-MM-DD", + "fontSize": "20px", + "fontWeight": "normal", + "locale": "", + "showDate": false + }, + "mode": "countup", + "refresh": "sec", + "timeSettings": { + "fontSize": "40px", + "fontWeight": "bold" + }, + "timezone": "", + "timezoneSettings": { + "fontSize": "12px", + "fontWeight": "normal", + "showTimezone": false, + "zoneFormat": "offsetAbbv" + } + }, + "pluginVersion": "2.1.3", + "type": "grafana-clock-panel" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "gridPos": { + "h": 4, + "w": 5, + "x": 11, + "y": 23 + }, + "id": 34, + "options": { + "bgColor": "", + "clockType": "24 hour", + "countdownSettings": { + "endCountdownTime": "2023-04-26T14:58:50+02:00", + "endText": "00:00:00" + }, + "countupSettings": { + "beginCountupTime": "2023-04-26T14:58:50+02:00", + "beginText": "00:00:00" + }, + "dateSettings": { + "dateFormat": "YYYY-MM-DD", + "fontSize": "20px", + "fontWeight": "normal", + "locale": "", + "showDate": false + }, + "mode": "time", + "refresh": "sec", + "timeSettings": { + "fontSize": "80px", + "fontWeight": "bold" + }, + "timezone": "", + "timezoneSettings": { + "fontSize": "12px", + "fontWeight": "normal", + "showTimezone": false, + "zoneFormat": "offsetAbbv" + } + }, + "pluginVersion": "2.1.3", + "type": "grafana-clock-panel" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "gridPos": { + "h": 2, + "w": 11, + "x": 0, + "y": 25 + }, + "id": 36, + "options": { + "bgColor": "", + "clockType": "24 hour", + "countdownSettings": { + "endCountdownTime": "2023-04-26T21:00:00+02:00", + "endText": "00:00:00" + }, + "countupSettings": { + "beginCountupTime": "2023-04-26T09:00:00+02:00", + "beginText": "00:00:00" + }, + "dateSettings": { + "dateFormat": "YYYY-MM-DD", + "fontSize": "20px", + "fontWeight": "normal", + "locale": "", + "showDate": false + }, + "mode": "countdown", + "refresh": "sec", + "timeSettings": { + "fontSize": "40px", + "fontWeight": "bold" + }, + "timezone": "", + "timezoneSettings": { + "fontSize": "12px", + "fontWeight": "normal", + "showTimezone": false, + "zoneFormat": "offsetAbbv" + } + }, + "pluginVersion": "2.1.3", + "type": "grafana-clock-panel" } ], "refresh": "5s", @@ -1464,7 +1995,37 @@ "style": "dark", "tags": [], "templating": { - "list": [] + "list": [ + { + "current": { + "selected": true, + "text": [ + "HILOK", + "VTK" + ], + "value": [ + "HILOK", + "VTK" + ] + }, + "datasource": { + "type": "postgres", + "uid": "P153BFFACB2904795" + }, + "definition": "select name as team_name from team", + "hide": 0, + "includeAll": false, + "multi": true, + "name": "TEAM_NAME", + "options": [], + "query": "select name as team_name from team", + "refresh": 2, + "regex": "", + "skipUrlSync": false, + "sort": 0, + "type": "query" + } + ] }, "time": { "from": "now-5m", @@ -1474,6 +2035,6 @@ "timezone": "", "title": "Status Page", "uid": "p1pzxREnk", - "version": 1, + "version": 27, "weekStart": "" } diff --git a/prometheus/http_hosts.template.yml b/prometheus/http_hosts.template.yml index 11844db..b6e24ff 100644 --- a/prometheus/http_hosts.template.yml +++ b/prometheus/http_hosts.template.yml @@ -43,3 +43,8 @@ labels: service: manualcount name: emanualcount +- targets: + - live.12urenloop.be + labels: + service: livesite + name: livesite diff --git a/prometheus/ping_hosts.template.yml b/prometheus/ping_hosts.template.yml index eccc0c7..ee0ed4c 100644 --- a/prometheus/ping_hosts.template.yml +++ b/prometheus/ping_hosts.template.yml @@ -3,50 +3,43 @@ labels: service: station name: ronny01 - lat: 51.04199 - lon: 3.72566 + dbname: RONNY1 - targets: - $RONNY02_IP labels: service: station name: ronny02 - lat: 51.04198 - lon: 3.72610 + dbname: RONNY2 - targets: - $RONNY03_IP labels: service: station name: ronny03 - lat: 51.04238 - lon: 3.72633 + dbname: RONNY3 - targets: - $RONNY04_IP labels: service: station name: ronny04 - lat: 51.04294 - lon: 3.72636 + dbname: RONNY4 - targets: - $RONNY05_IP labels: service: station name: ronny05 - lat: 51.04319 - lon: 3.72580 + dbname: RONNY5 - targets: - $RONNY06_IP labels: service: station name: ronny06 - lat: 51.04281 - lon: 3.72565 + dbname: RONNY6 - targets: - $RONNY07_IP labels: service: station name: ronny07 - lat: 51.04226 - lon: 3.72565 + dbname: RONNY7 - targets: - $CLIENT1_IP labels: @@ -57,3 +50,38 @@ labels: service: client2 name: client2 +- targets: + - 172.12.10.156 + labels: + service: switch + name: switch-peterman +- targets: + - 172.12.10.160 + labels: + service: switch + name: switch-kassa +- targets: + - 172.12.10.162 + labels: + service: switch + name: switch-ledwall +- targets: + - 172.12.10.153 + labels: + service: AP + name: ap-peterman +- targets: + - 172.12.10.143 + labels: + service: AP + name: ap-12ul +- targets: + - 172.12.10.149 + labels: + service: AP + name: ap-buysse +- targets: + - 172.12.10.161 + labels: + service: AP + name: ap-kassa diff --git a/start.sh b/start.sh index 6bfe1cd..e0ae3f1 100755 --- a/start.sh +++ b/start.sh @@ -31,4 +31,4 @@ envsubst < timesync/config.template.py \ > timesync/config.py # Starting monitoring -docker-compose up --build +docker-compose up --build -d diff --git a/timesync/timesync.py b/timesync/timesync.py index 02a75cf..e0f1a32 100644 --- a/timesync/timesync.py +++ b/timesync/timesync.py @@ -59,6 +59,15 @@ def serialize_timemeasurement(name, measurement): def fetch_routine(): while True: + try: + data = requests.get(TELRAAM_STATION_URL + '/station', timeout=1).json() + if 'name' in data[0]: + station_urls.clear() + for station_obj in data: + station_urls[station_obj['name']] = station_obj['url'] + logging.info("Telraam fetch stations success") + except: + logging.error("Telraam fetch stations failed") logging.info(f"Will refresh every {REFRESH_INTERVAL} s") # # FETCH TIMESYNC logging.info("Starting timestamp fetch routine")