diff --git a/flake.lock b/flake.lock index fbc2e7d..8d31836 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1675387812, - "narHash": "sha256-fGjWMg97w1mP0cDIR9Y8qCa77sEtiIdYzqiRB+P2YcM=", + "lastModified": 1677814320, + "narHash": "sha256-Hr04bNG0Jf7tuRckPEESOUx6om+tyRwUnckpDTWqb6c=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "8de922e4e23158790970a266234a853305b1928d", + "rev": "09abc89ec873802e20b8c88d883181ba35054ef3", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "doom-snippets": { "flake": false, "locked": { - "lastModified": 1662645711, - "narHash": "sha256-XKpPCtECGZQ5bFPPDUX3oAltXOJNwAI/OktxiLnADRE=", + "lastModified": 1676839496, + "narHash": "sha256-1Ay9zi0u1lycmEeFqIxr0RWH+JvH9BnzgRzkPeWEAYY=", "owner": "doomemacs", "repo": "snippets", - "rev": "03a62fe7edf7e87fdbd925713fbd3bf292d14b00", + "rev": "fe4003014ae00b866f117cb193f711fd9d72fd11", "type": "github" }, "original": { @@ -122,27 +122,28 @@ "emacs-overlay": { "flake": false, "locked": { - "lastModified": 1675362118, - "narHash": "sha256-11CqDTkQA9P5I4InVCXmj/IaHvz4nUJaLNFiDiHVvIg=", + "lastModified": 1676366521, + "narHash": "sha256-i4UAY8t9Au9SJtsgYppa3NHSVf1YkV6yqnNIQd+Km4g=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a018577287e390e01654a8b44d57d183a51b72b2", + "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", "type": "github" }, "original": { "owner": "nix-community", "repo": "emacs-overlay", + "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", "type": "github" } }, "emacs-overlay_2": { "flake": false, "locked": { - "lastModified": 1676543864, - "narHash": "sha256-ZdPhRGbUb0cFWd+iYtoIH0CIslnnTH2fJNEkpbtJzJE=", + "lastModified": 1677867078, + "narHash": "sha256-88QSWkOL6jSUBcrKyG13tirLvE4lZ+9iAiuQBvlFL48=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4bb9abd04a46a7b52ff07af252204ca3ce6d337f", + "rev": "bc977d5c4f5c0463ac8f2bd13406625b80a18bae", "type": "github" }, "original": { @@ -318,11 +319,11 @@ }, "flake-utils_2": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1676283394, + "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "type": "github" }, "original": { @@ -437,11 +438,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674440933, - "narHash": "sha256-CASRcD/rK3fn5vUCti3jzry7zi0GsqRsBohNq9wPgLs=", + "lastModified": 1677757546, + "narHash": "sha256-tA1ukoluctzLVyWRaKtD4KlTwgXbUsGB5vcyni1OJ9I=", "owner": "nix-community", "repo": "home-manager", - "rev": "65c47ced082e3353113614f77b1bc18822dc731f", + "rev": "86bb69b0b1e10d99a30c4352f230f03106dd0f8a", "type": "github" }, "original": { @@ -530,11 +531,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1675933606, - "narHash": "sha256-y427VhPQHOKkYvkc9MMsL/2R7M11rQxzsRdRLM3htx8=", + "lastModified": 1677591639, + "narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "44ae00e02e8036a66c08f4decdece7e3bbbefee2", + "rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce", "type": "github" }, "original": { @@ -598,11 +599,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1676162277, - "narHash": "sha256-GK3cnvKNo1l0skGYXXiLJ/TLqdKyIYXd7jOlo0gN+Qw=", + "lastModified": 1677560965, + "narHash": "sha256-Tqwt5alTtMnbYUPKCYRYZqlfbjprLgDWqjMhXpFMQ6k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d863ca850a06d91365c01620dcac342574ecf46f", + "rev": "40968a3aa489191cf4b7ba85cf2a54d8a75c8daa", "type": "github" }, "original": { @@ -614,11 +615,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1676300157, - "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", + "lastModified": 1677676435, + "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", + "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", "type": "github" }, "original": { @@ -645,11 +646,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1676375384, - "narHash": "sha256-6HI3jZiuJX+KLz05cocYy2mBAWlISEKHU84ftYfxHZ8=", + "lastModified": 1677779205, + "narHash": "sha256-6DBjL9wjq86p2GczmwnHtFRnWPBPItc67gapWENBgX8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c43f676c938662072772339be6269226c77b51b8", + "rev": "96e18717904dfedcd884541e5a92bf9ff632cf39", "type": "github" }, "original": { @@ -675,11 +676,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1675940568, - "narHash": "sha256-epG6pOT9V0kS+FUqd7R6/CWkgnZx2DMT5Veqo+y6G3c=", + "lastModified": 1677468890, + "narHash": "sha256-V4MPvt4PKaHSInRLWpaF8ICdC91SH+5bdd0FGxalJIg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6ccc4a59c3f1b56d039d93da52696633e641bc71", + "rev": "3f19c04354dec3903f614eae09327a04d297835d", "type": "github" }, "original": { @@ -724,11 +725,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1673519709, - "narHash": "sha256-XtGk32Lw2iGDgH5Q4Rjhig0Iq5hpIM0EKQoptJ+nT3k=", + "lastModified": 1677411834, + "narHash": "sha256-vJ1kF56IPRkVD+KTC7o8Sz8DpTQHQbWx65bwiWQFIFQ=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "ecb62e2e317b1a4b5b8a6c0f111ed7ef18413040", + "rev": "aa224978767251cf21b6bd085739297c622d53a6", "type": "github" }, "original": { @@ -740,11 +741,11 @@ "org-contrib": { "flake": false, "locked": { - "lastModified": 1664301003, - "narHash": "sha256-8CAq/EB52RMQHNLZM0uc/1N5gKTfxGhf7WFt9sMKoD8=", + "lastModified": 1675694242, + "narHash": "sha256-4Fn33CTVTCqh5TyVAggSr8Fm8/hB8Xgl+hkxh3WCrI8=", "owner": "emacsmirror", "repo": "org-contrib", - "rev": "aa104c0bbc3113f6d3d167b20bd8d6bf6a285f0f", + "rev": "fff6c888065588527b1c1d7dd7e41c29ef767e17", "type": "github" }, "original": { @@ -859,11 +860,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1674652670, - "narHash": "sha256-ViqeZlOjQTlY0KM7YcOOjdgkxRLPMZrRKXTqtyc1I00=", + "lastModified": 1677460223, + "narHash": "sha256-4Wfy1iD5RaJiU2ub1Dh4zp4UDp1/PNhuck1FDgvvfds=", "owner": "hakimel", "repo": "reveal.js", - "rev": "b1a9842b2f4544a2fda546383db38cc7a81f6b74", + "rev": "0c9bdeab70cef5c83216132660b60b78ecf82f69", "type": "github" }, "original": { @@ -967,11 +968,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1676171095, - "narHash": "sha256-2laeSjBAAJ9e/C3uTIPb287iX8qeVLtWiilw1uxqG+A=", + "lastModified": 1677833841, + "narHash": "sha256-yHZFGe7dhBE43FFWKiWc29NuveH+nfyTT6oKyFDEMys=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c5dab21d8706afc7ceb05c23d4244dcb48d6aade", + "rev": "128e9b29ddd88ceb634a28f7dbbfee7b895f005f", "type": "github" }, "original": { @@ -999,11 +1000,11 @@ "ts-fold": { "flake": false, "locked": { - "lastModified": 1673328482, - "narHash": "sha256-6yQ35uJDAK531QNQZgloQaOQayRa8azOlOMbO8lXsHE=", + "lastModified": 1677643855, + "narHash": "sha256-HHu4kVaf4badGzAPacWmZ5eGgxzAI2RzwQNEZlROPTc=", "owner": "jcs-elpa", "repo": "ts-fold", - "rev": "75d6f9ed317b042b5bc7cb21503596d1c7a1b8c0", + "rev": "ad1d9b24127fe0105642790a1cacc779d70ec7a0", "type": "github" }, "original": { diff --git a/nixos/machines/pepe/grafana.nix b/nixos/machines/pepe/grafana.nix index 7c49b30..f6867ea 100644 --- a/nixos/machines/pepe/grafana.nix +++ b/nixos/machines/pepe/grafana.nix @@ -1,13 +1,13 @@ { config, ... }: { - services.nginx.virtualHosts.${config.services.grafana.domain} = { + services.nginx.virtualHosts.${config.services.grafana.settings.server.domain} = { extraConfig = '' allow ${config.tinc.private.subnet}; deny all; ''; locations."/" = { - proxyPass = "http://localhost:${toString config.services.grafana.port}"; + proxyPass = "http://localhost:${toString config.services.grafana.settings.server.http_port}"; proxyWebsockets = true; }; }; diff --git a/nixos/machines/pepe/telegraf.nix b/nixos/machines/pepe/telegraf.nix index d369fe3..e2b2901 100644 --- a/nixos/machines/pepe/telegraf.nix +++ b/nixos/machines/pepe/telegraf.nix @@ -1,13 +1,13 @@ let urls = [ - "https://bitwarden.ingolf-wagner.de" - "https://flix.ingolf-wagner.de" - "https://git.ingolf-wagner.de" - "https://ingolf-wagner.de" - "https://nextcloud.ingolf-wagner.de" - "https://nextcloud.ingolf-wagner.de" - "https://tech.ingolf-wagner.de" + { url = "https://bitwarden.ingolf-wagner.de"; path = ""; } + { url = "https://flix.ingolf-wagner.de"; path = "web/index.html"; } + { url = "https://git.ingolf-wagner.de"; path = ""; } + { url = "https://ingolf-wagner.de"; path = ""; } + { url = "https://nextcloud.ingolf-wagner.de"; path = "login"; } + { url = "https://tech.ingolf-wagner.de"; path = ""; } ]; + in { services.telegraf = { @@ -20,10 +20,12 @@ in # https://github.com/influxdata/telegraf/tree/master/plugins/inputs < all them plugins inputs = { x509_cert = [{ - sources = (map (url: "${url}:443") urls); + sources = (map (url: "${url.url}:443") urls); interval = "30m"; # agent.interval = "10s" is default }]; - http_response = [{ inherit urls; }]; + http_response = + let fullUrls = map ({ url, path }: "${url}/${path}") urls; + in [{ urls = fullUrls; }]; processes = { }; systemd_units = { }; internet_speed.interval = "50m";