From cefca0db5d709796fe1fc0b1b9e1721d94cedeaa Mon Sep 17 00:00:00 2001 From: Rory& Date: Wed, 10 Jul 2024 21:19:54 +0200 Subject: Node exproter changes --- flake.lock | 50 ++++++++++++++++++++++++------------------------- modules/base-server.nix | 12 ++++++++++-- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index f4741ac..80d6954 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1719827538, - "narHash": "sha256-0FgBJp60E1NFN7a/90SApfMXbzsu3vYL7cifSURp5CI=", + "lastModified": 1720386818, + "narHash": "sha256-5aObNROA/OnezQVD2LmST8ysoJyp5VeTZJP7C4TvtiU=", "owner": "famedly", "repo": "conduit", - "rev": "1f313c6807ac3125805d83495b338b27c1fce69d", + "rev": "00c9ef7b565305c3e08cdba595832c299fe87342", "type": "gitlab" }, "original": { @@ -422,11 +422,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1720045378, - "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", + "lastModified": 1720327769, + "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", + "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", "type": "github" }, "original": { @@ -508,11 +508,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1719220171, - "narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=", + "lastModified": 1720428387, + "narHash": "sha256-0vHxVNWTql555MZLb2kngrcjfNtsJKoYdyUivTibgnc=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "269411cfed6aab694e46f719277c972de96177bb", + "rev": "30ebd0beb2ed26e09bcd245d757504029f807cce", "type": "github" }, "original": { @@ -603,16 +603,16 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1719663039, - "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", + "lastModified": 1720282526, + "narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", + "rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } @@ -683,11 +683,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1718835956, - "narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", + "lastModified": 1720244366, + "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309", + "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", "type": "github" }, "original": { @@ -699,11 +699,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -715,11 +715,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719468428, - "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", + "lastModified": 1720181791, + "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", + "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", "type": "github" }, "original": { @@ -784,11 +784,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1719873517, - "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", + "lastModified": 1720321395, + "narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a11224af8d824935f363928074b4717ca2e280db", + "rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea", "type": "github" }, "original": { diff --git a/modules/base-server.nix b/modules/base-server.nix index 1a29783..93ca9f8 100755 --- a/modules/base-server.nix +++ b/modules/base-server.nix @@ -112,14 +112,13 @@ enable = true; port = 9100; enabledCollectors = [ - "logind" + #"logind" #too slow "systemd" "processes" "interrupts" # Testing: "buddyinfo" "cgroups" - "cpu_vulnerabilities" "ksmd" "lnstat" "mountstats" @@ -139,6 +138,15 @@ "btrfs" "powersupplyclass" "mdadm" + "tapestats" + "fibrechannel" + "cpu_vulnerabilities" + "watchdog" + "thermal_zone" + "logind" + "nfs" + "nfsd" + "infiniband" ]; }; }; -- cgit 1.4.1