diff --git a/nix/base-system/darwin-configuration.nix b/nix/base-system/darwin-configuration.nix index adbd2ac..f71dae8 100644 --- a/nix/base-system/darwin-configuration.nix +++ b/nix/base-system/darwin-configuration.nix @@ -71,7 +71,7 @@ + node_memory_active_bytes) / node_memory_total_bytes ''; - meta = { + config = { name_format = "`\${labels.instance} - Memory`"; yaxis = "y"; fill = "tozeroy"; @@ -84,7 +84,7 @@ / ignoring(mode) group_left sum by (job,instance)(irate(node_cpu_seconds_total[5m])) ''; - meta = { + config = { name_format = "`\${labels.instance} - \${labels.mode}`"; axis = "y"; }; @@ -106,7 +106,7 @@ query = '' stun_attempt_latency_ms ''; - meta = { + config = { name_format = "`UDP \${labels.domain} latency`"; yaxis = "y"; }; @@ -116,7 +116,7 @@ query = '' ping_latency ''; - meta = { + config = { name_format = "`Ping \${labels.device} latency`"; yaxis = "y"; }; @@ -130,6 +130,7 @@ yaxes = [ { anchor = "y"; + type = "log"; } ]; plots = [ @@ -138,7 +139,7 @@ query = '' irate(node_network_receive_bytes_total{device=~"(lo|en).*"}[5m]) ''; - meta = { + config = { name_format = "`\${labels.device} Rx`"; yaxis = "y"; }; @@ -148,7 +149,7 @@ query = '' irate(node_network_transmit_bytes_total{device=~"(lo|en).*"}[5m]) ''; - meta = { + config = { name_format = "`\${labels.device} Tx`"; yaxis = "y"; }; diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock index 7da1394..ac45fe7 100644 --- a/nix/base-system/flake.lock +++ b/nix/base-system/flake.lock @@ -347,11 +347,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1711068625, - "narHash": "sha256-kNfh3rmFfHKTng6Aun1UZ/atl51XobRjLIeYRJQ6628=", + "lastModified": 1716397295, + "narHash": "sha256-dGJ2TvmOrgenBLvbYQBk9zfx5g+LCG8qdjQWMNF8Hws=", "owner": "zaphar", "repo": "Heracles", - "rev": "471d159af752b62f8774d1e4462f2111059583da", + "rev": "ae669767c82965e1db334c178f211fa4c4586df6", "type": "github" }, "original": {