diff options
| -rw-r--r-- | nixos/hosts/ev/default.nix | 17 | ||||
| -rw-r--r-- | nixos/hosts/ev/ports.nix | 9 | ||||
| -rw-r--r-- | nixos/hosts/tente/default.nix | 23 | ||||
| -rw-r--r-- | nixos/hosts/tente/grafana.nix | 9 | ||||
| -rw-r--r-- | nixos/hosts/tente/ports.nix | 11 |
5 files changed, 47 insertions, 22 deletions
diff --git a/nixos/hosts/ev/default.nix b/nixos/hosts/ev/default.nix index 71f794c..b0c5ff3 100644 --- a/nixos/hosts/ev/default.nix +++ b/nixos/hosts/ev/default.nix @@ -4,6 +4,9 @@ { config, pkgs, ... }: +let + ports = import ./ports.nix; +in { imports = [ ./hardware-configuration.nix @@ -38,14 +41,14 @@ # unsure why this is necessary networking.interfaces.enp3s0.useDHCP = true; - home-automation.zigbee2mqttPort = 8080; - torrent.qbittorrentWebUiPort = 7777; + home-automation.zigbee2mqttPort = ports.zigbee2mqtt; + torrent.qbittorrentWebUiPort = ports.qbittorrent; torrent.networkNamespace = "se"; - monitoring.alloyUiPort = 3001; - monitoring.lokiPort = 3030; - monitoring.prometheusPort = 9090; - monitoring.prometheusNodeExporterPort = 9002; - hosehawk.port = 4000; + monitoring.alloyUiPort = ports.grafanaAlloy; + monitoring.lokiPort = ports.grafanaLoki; + monitoring.prometheusPort = ports.prometheus; + monitoring.prometheusNodeExporterPort = ports.prometheusNodeExporter; + hosehawk.port = ports.hosehawk; home-automation.zigbeeSerialPort = "/dev/serial/by-id/usb-ITead_Sonoff_Zigbee_3.0_USB_Dongle_Plus_e2fed465c59ded11962fd7a5a7669f5d-if00-port0"; diff --git a/nixos/hosts/ev/ports.nix b/nixos/hosts/ev/ports.nix new file mode 100644 index 0000000..ff5241c --- /dev/null +++ b/nixos/hosts/ev/ports.nix @@ -0,0 +1,9 @@ +{ + grafanaAlloy = 3001; + grafanaLoki = 3030; + hosehawk = 4000; + prometheus = 9090; + prometheusNodeExporter = 9002; + qbittorrent = 7777; + zigbee2mqtt = 8080; +} diff --git a/nixos/hosts/tente/default.nix b/nixos/hosts/tente/default.nix index 708e218..4d4a4f3 100644 --- a/nixos/hosts/tente/default.nix +++ b/nixos/hosts/tente/default.nix @@ -7,11 +7,12 @@ let baseDomain = "push-f.com"; acmeEmail = "martin@push-f.com"; + ports = import ./ports.nix; sources = import <top/npins>; helpers = import <top/helpers.nix> { inherit config lib pkgs; }; pkgs-unstable = import sources.nixpkgs-unstable {}; in -rec { +{ _module.args = { inherit pkgs-unstable; }; imports = [ ./hardware-configuration.nix @@ -117,16 +118,16 @@ rec { }; }; - grafana.port = 3000; - grafana.matrixForwarderPort = 3002; - grafana.matrixServerUrl = "http://localhost:${toString matrix.port}"; - monitoring.alloyUiPort = 3001; - monitoring.lokiPort = 3030; - monitoring.prometheusPort = 9090; - monitoring.prometheusNodeExporterPort = 9002; - exporters.sqlExporterPort = 9003; - headscale.port = 8080; - matrix.port = 8008; + grafana.port = ports.grafana; + grafana.matrixForwarderPort = ports.grafanaMatrixForwarder; + grafana.matrixServerUrl = "http://localhost:${toString ports.matrix}"; + monitoring.alloyUiPort = ports.grafanaAlloy; + monitoring.lokiPort = ports.grafanaLoki; + monitoring.prometheusPort = ports.prometheus; + monitoring.prometheusNodeExporterPort = ports.prometheusNodeExporter; + exporters.sqlExporterPort = ports.prometheusSqlExporter; + headscale.port = ports.headscale; + matrix.port = ports.matrix; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; diff --git a/nixos/hosts/tente/grafana.nix b/nixos/hosts/tente/grafana.nix index 02d26c5..f7c8789 100644 --- a/nixos/hosts/tente/grafana.nix +++ b/nixos/hosts/tente/grafana.nix @@ -2,6 +2,7 @@ let cfg = config.grafana; + evPorts = import <top/hosts/ev/ports.nix>; in { options.grafana = { @@ -42,24 +43,24 @@ in { name = "Prometheus Tente"; type = "prometheus"; - url = "http://${config.services.prometheus.listenAddress}:${toString config.services.prometheus.port}"; + url = "http://${config.services.prometheus.listenAddress}:${toString config.monitoring.prometheusPort}"; } { name = "Loki Tente"; type = "loki"; access = "proxy"; - url = "http://127.0.0.1:${toString config.services.loki.configuration.server.http_listen_port}"; + url = "http://127.0.0.1:${toString config.monitoring.lokiPort}"; } { name = "Prometheus Ev"; type = "prometheus"; - url = "http://ev.tailnet:9090"; + url = "http://ev.tailnet:${toString evPorts.prometheus}"; } { name = "Loki Ev"; type = "loki"; access = "proxy"; - url = "http://ev.tailnet:3030"; + url = "http://ev.tailnet:${toString evPorts.grafanaLoki}"; } ]; }; diff --git a/nixos/hosts/tente/ports.nix b/nixos/hosts/tente/ports.nix new file mode 100644 index 0000000..3a2b2fe --- /dev/null +++ b/nixos/hosts/tente/ports.nix @@ -0,0 +1,11 @@ +{ + grafana = 3000; + grafanaAlloy = 3001; + grafanaLoki = 3030; + grafanaMatrixForwarder = 3002; + headscale = 8080; + matrix = 8008; + prometheus = 9090; + prometheusNodeExporter = 9002; + prometheusSqlExporter = 9003; +} |