From bdd4290e8ddd3b60328f41d1dcafa002a9b807c7 Mon Sep 17 00:00:00 2001 From: teutat3s Date: Thu, 27 Jun 2024 16:53:25 +0200 Subject: [PATCH 1/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-flake': 'github:srid/nixos-flake/6335b2f05f007b95ac2438b0a55498f9f20e73f7' (2024-06-22) → 'github:srid/nixos-flake/8cefa1e7af06d366f5d3fd7c97e9edbf4d38c476' (2024-06-26) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/dd457de7e08c6d06789b1f5b88fc9327f4d96309' (2024-06-19) → 'github:nixos/nixpkgs/89c49874fb15f4124bf71ca5f42a04f2ee5825fd' (2024-06-26) • Updated input 'simple-nixos-mailserver/flake-compat': 'github:edolstra/flake-compat/009399224d5e398d03b22badca40a37ac85412a1' (2022-11-17) → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) • Updated input 'simple-nixos-mailserver/utils': 'github:numtide/flake-utils/5021eac20303a61fafe17224c087f5519baed54d' (2020-11-14) → 'github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605' (2024-02-28) • Added input 'simple-nixos-mailserver/utils/systems': 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09) • Updated input 'unstable': 'github:nixos/nixpkgs/a71e967ef3694799d0c418c98332f7ff4cc5f6af' (2024-06-22) → 'github:nixos/nixpkgs/2893f56de08021cffd9b6b6dfc70fd9ccd51eb60' (2024-06-24) --- flake.lock | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 84e3884..8f2c047 100644 --- a/flake.lock +++ b/flake.lock @@ -147,11 +147,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-flake": { "locked": { - "lastModified": 1719079946, - "narHash": "sha256-A3JUcPH00buqBgjmi0lWUZIql9+8Y7CMSXGoUXcm+yk=", + "lastModified": 1719437091, + "narHash": "sha256-UIZasVC36DS5dli1VimK0VgL6JKuxDG9cMxKq1I6OQ0=", "owner": "srid", "repo": "nixos-flake", - "rev": "6335b2f05f007b95ac2438b0a55498f9f20e73f7", + "rev": "8cefa1e7af06d366f5d3fd7c97e9edbf4d38c476", "type": "github" }, "original": { @@ -330,11 +330,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1718835956, - "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", + "lastModified": 1719426051, + "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", + "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "type": "github" }, "original": { @@ -478,6 +478,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "triton-vmtools": { "inputs": { "flake-utils": "flake-utils_3", @@ -504,11 +519,11 @@ }, "unstable": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -537,12 +552,15 @@ } }, "utils_2": { + "inputs": { + "systems": "systems_5" + }, "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { From b4dd570b2d01886d66acf4e7c8f54516f8a0391d Mon Sep 17 00:00:00 2001 From: teutat3s Date: Thu, 27 Jun 2024 18:39:27 +0200 Subject: [PATCH 2/3] docs: use IPv4 for ZFS remote unlocking --- docs/unlocking-zfs-pool.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/unlocking-zfs-pool.md b/docs/unlocking-zfs-pool.md index 686f140..5b5d4ea 100644 --- a/docs/unlocking-zfs-pool.md +++ b/docs/unlocking-zfs-pool.md @@ -6,13 +6,13 @@ accessing the server via SSH as user `root` on port 2222. Nachtigall: ``` -ssh root@nachtigall.pub.solar -p2222 +ssh -4 root@nachtigall.pub.solar -p2222 ``` Metronom: ``` -ssh root@metronom.pub.solar -p2222 +ssh -4 root@metronom.pub.solar -p2222 ``` After connecting, paste the encryption passphrase you can find in the shared From 7ce66f38fc3916e749e684de7ff154c358f2d72a Mon Sep 17 00:00:00 2001 From: teutat3s Date: Thu, 27 Jun 2024 18:39:47 +0200 Subject: [PATCH 3/3] grafana: update dashboard json, select nachtigall by default --- .../node-exporter-full_rev33.json | 142 +++++++++--------- 1 file changed, 67 insertions(+), 75 deletions(-) diff --git a/modules/grafana/grafana-dashboards/node-exporter-full_rev33.json b/modules/grafana/grafana-dashboards/node-exporter-full_rev33.json index 9df57f0..a2b7995 100644 --- a/modules/grafana/grafana-dashboards/node-exporter-full_rev33.json +++ b/modules/grafana/grafana-dashboards/node-exporter-full_rev33.json @@ -1,47 +1,4 @@ { - "__inputs": [ - { - "name": "DS_PROMETHEUS", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__elements": {}, - "__requires": [ - { - "type": "panel", - "id": "gauge", - "name": "Gauge", - "version": "" - }, - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "9.4.3" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "1.0.0" - }, - { - "type": "panel", - "id": "stat", - "name": "Stat", - "version": "" - }, - { - "type": "panel", - "id": "timeseries", - "name": "Time series", - "version": "" - } - ], "annotations": { "list": [ { @@ -69,7 +26,6 @@ "fiscalYearStartMonth": 0, "gnetId": 1860, "graphTooltip": 1, - "id": null, "links": [ { "icon": "external link", @@ -171,6 +127,8 @@ "id": 20, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": ["lastNotNull"], @@ -178,9 +136,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.7", "targets": [ { "datasource": { @@ -257,6 +216,8 @@ "id": 155, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": ["lastNotNull"], @@ -264,9 +225,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.7", "targets": [ { "datasource": { @@ -343,6 +305,8 @@ "id": 19, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": ["lastNotNull"], @@ -350,9 +314,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.7", "targets": [ { "datasource": { @@ -419,6 +384,8 @@ "id": 16, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": ["lastNotNull"], @@ -426,9 +393,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.7", "targets": [ { "datasource": { @@ -521,6 +489,8 @@ "id": 21, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": ["lastNotNull"], @@ -528,9 +498,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.7", "targets": [ { "datasource": { @@ -605,6 +576,8 @@ "id": 154, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": ["lastNotNull"], @@ -612,9 +585,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.7", "targets": [ { "datasource": { @@ -693,9 +667,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.7", "targets": [ { "datasource": { @@ -772,9 +747,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.7", "targets": [ { "datasource": { @@ -857,9 +833,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.7", "targets": [ { "datasource": { @@ -940,9 +917,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.7", "targets": [ { "datasource": { @@ -1021,9 +999,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.7", "targets": [ { "datasource": { @@ -1081,6 +1060,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1094,6 +1074,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "smooth", "lineWidth": 1, "pointSize": 5, @@ -1361,6 +1342,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1374,6 +1356,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1879,6 +1862,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1892,6 +1876,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2347,6 +2332,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -2360,6 +2346,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -13021,8 +13008,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -13226,8 +13212,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -23154,8 +23139,7 @@ ], "refresh": "", "revision": 1, - "schemaVersion": 38, - "style": "dark", + "schemaVersion": 39, "tags": ["linux"], "templating": { "list": [ @@ -23178,7 +23162,11 @@ "type": "datasource" }, { - "current": {}, + "current": { + "selected": false, + "text": "node-exporter", + "value": "node-exporter" + }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -23204,7 +23192,11 @@ "useTags": false }, { - "current": {}, + "current": { + "selected": true, + "text": "nachtigall", + "value": "nachtigall" + }, "datasource": { "type": "prometheus", "uid": "${DS_PROMETHEUS}" @@ -23274,6 +23266,6 @@ "timezone": "browser", "title": "Node Exporter Full", "uid": "rYdddlPWk", - "version": 87, + "version": 2, "weekStart": "" }