From d01de7fc4a56a6eca55bdfe83a901110c0b10cb4 Mon Sep 17 00:00:00 2001 From: clerie Date: Sat, 16 Aug 2025 22:01:06 +0200 Subject: [PATCH 1/2] hosts/monitoring-3: Add dashboards to deployment --- hosts/monitoring-3/dashboards/home.json | 77 +++++++ .../monitoring-3/dashboards/nixos-status.json | 135 +++++++++++ hosts/monitoring-3/dashboards/smokeping.json | 211 ++++++++++++++++++ 3 files changed, 423 insertions(+) create mode 100644 hosts/monitoring-3/dashboards/home.json create mode 100644 hosts/monitoring-3/dashboards/nixos-status.json create mode 100644 hosts/monitoring-3/dashboards/smokeping.json diff --git a/hosts/monitoring-3/dashboards/home.json b/hosts/monitoring-3/dashboards/home.json new file mode 100644 index 0000000..270909e --- /dev/null +++ b/hosts/monitoring-3/dashboards/home.json @@ -0,0 +1,77 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "datasource", + "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": 10, + "links": [], + "panels": [ + { + "fieldConfig": { + "defaults": {}, + "overrides": [] + }, + "gridPos": { + "h": 11, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 2, + "options": { + "includeVars": false, + "keepTime": false, + "maxItems": 10, + "query": "", + "showFolderNames": true, + "showHeadings": false, + "showRecentlyViewed": false, + "showSearch": true, + "showStarred": false, + "tags": [] + }, + "pluginVersion": "12.0.2+security-01", + "title": "Dashboards", + "type": "dashlist" + } + ], + "preload": false, + "refresh": "", + "schemaVersion": 41, + "tags": [], + "templating": { + "list": [] + }, + "time": { + "from": "now-6h", + "to": "now" + }, + "timepicker": { + "hidden": true + }, + "timezone": "browser", + "title": "Home", + "uid": "OqTN9p2nz", + "version": 1 +} diff --git a/hosts/monitoring-3/dashboards/nixos-status.json b/hosts/monitoring-3/dashboards/nixos-status.json new file mode 100644 index 0000000..9970853 --- /dev/null +++ b/hosts/monitoring-3/dashboards/nixos-status.json @@ -0,0 +1,135 @@ +{ + "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": [], + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "continuous-RdYlGr" + }, + "custom": { + "axisPlacement": "auto", + "fillOpacity": 70, + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": false, + "lineWidth": 0, + "spanNulls": false + }, + "mappings": [ + { + "options": { + "0": { + "index": 1, + "text": "mismatch" + }, + "1": { + "index": 0, + "text": "sync" + } + }, + "type": "value" + } + ], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "red" + } + ] + } + }, + "overrides": [] + }, + "gridPos": { + "h": 23, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 2, + "options": { + "alignValue": "left", + "legend": { + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "mergeValues": true, + "rowHeight": 0.9, + "showValue": "auto", + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.0.2+security-01", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "builder", + "expr": "nixos_current_system_is_sync", + "legendFormat": "{{instance}}", + "range": true, + "refId": "A" + } + ], + "title": "Config is Sync", + "type": "state-timeline" + } + ], + "preload": false, + "refresh": "5m", + "schemaVersion": 41, + "tags": [], + "templating": { + "list": [] + }, + "time": { + "from": "now-7d", + "to": "now" + }, + "timepicker": {}, + "timezone": "", + "title": "NixOS Status", + "uid": "W4j3nz1Vz", + "version": 3 +} diff --git a/hosts/monitoring-3/dashboards/smokeping.json b/hosts/monitoring-3/dashboards/smokeping.json new file mode 100644 index 0000000..d1b0c5d --- /dev/null +++ b/hosts/monitoring-3/dashboards/smokeping.json @@ -0,0 +1,211 @@ +{ + "annotations": { + "list": [ + { + "builtIn": 1, + "datasource": { + "type": "datasource", + "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": 11, + "links": [], + "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "barWidthFactor": 0.6, + "drawStyle": "line", + "fillOpacity": 0, + "gradientMode": "none", + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "insertNulls": 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": "s" + }, + "overrides": [] + }, + "gridPos": { + "h": 22, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 2, + "options": { + "legend": { + "calcs": [], + "displayMode": "list", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "hideZeros": false, + "mode": "single", + "sort": "none" + } + }, + "pluginVersion": "12.0.2+security-01", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "exemplar": true, + "expr": "probe_icmp_duration_seconds{job=\"blackbox_icmp6\", target=~\"$target\", instance=~\"$instance\", phase=\"rtt\"} > 0 ", + "interval": "", + "legendFormat": "IPv6 {{target}} ({{instance}})", + "range": true, + "refId": "A" + }, + { + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "editorMode": "code", + "exemplar": true, + "expr": "probe_icmp_duration_seconds{job=\"blackbox_icmp4\", target=~\"$target\", instance=~\"$instance\", phase=\"rtt\"} > 0", + "hide": false, + "interval": "", + "legendFormat": "IPv4 {{target}} ({{instance}})", + "range": true, + "refId": "B" + } + ], + "title": "Smokeping", + "type": "timeseries" + } + ], + "preload": false, + "refresh": "", + "schemaVersion": 41, + "tags": [], + "templating": { + "list": [ + { + "current": { + "text": "All", + "value": "$__all" + }, + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "definition": "label_values(probe_icmp_duration_seconds{phase=\"rtt\"}, target)", + "includeAll": true, + "label": "Target:", + "multi": true, + "name": "target", + "options": [], + "query": { + "query": "label_values(probe_icmp_duration_seconds{phase=\"rtt\"}, target)", + "refId": "StandardVariableQuery" + }, + "refresh": 1, + "regex": "", + "type": "query" + }, + { + "current": { + "text": [ + "All" + ], + "value": [ + "$__all" + ] + }, + "datasource": { + "type": "prometheus", + "uid": "PBFA97CFB590B2093" + }, + "definition": "label_values(probe_icmp_duration_seconds{phase=\"rtt\"}, instance)", + "includeAll": true, + "label": "Instance:", + "multi": true, + "name": "instance", + "options": [], + "query": { + "query": "label_values(probe_icmp_duration_seconds{phase=\"rtt\"}, instance)", + "refId": "StandardVariableQuery" + }, + "refresh": 1, + "regex": "", + "type": "query" + } + ] + }, + "time": { + "from": "now-30m", + "to": "now" + }, + "timepicker": {}, + "timezone": "", + "title": "Smokeping", + "uid": "IytTVZL7z", + "version": 9 +} From 2d78fa9140b5ab8d3be4fa672454fdeb9c249eff Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Sun, 17 Aug 2025 03:03:19 +0200 Subject: [PATCH 2/2] Update nixpkgs 2025-08-17-01-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ba0c6b0..57bd04e 100644 --- a/flake.lock +++ b/flake.lock @@ -646,11 +646,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1753549186, - "narHash": "sha256-Znl7rzuxKg/Mdm6AhimcKynM7V3YeNDIcLjBuoBcmNs=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17f6bd177404d6d43017595c5264756764444ab8", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": {