diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/by-name/co/constants/module.nix | 10 | ||||
| -rw-r--r-- | modules/by-name/mo/monitoring/components/grafana.nix | 44 | ||||
| -rw-r--r-- | modules/by-name/mo/monitoring/components/loki.nix | 130 | ||||
| -rw-r--r-- | modules/by-name/mo/monitoring/components/prometheus.nix | 48 | ||||
| -rw-r--r-- | modules/by-name/mo/monitoring/components/scrutiny.nix | 56 | ||||
| -rw-r--r-- | modules/by-name/ng/nginx/module.nix | 4 |
6 files changed, 186 insertions, 106 deletions
diff --git a/modules/by-name/co/constants/module.nix b/modules/by-name/co/constants/module.nix index b94020b..9127488 100644 --- a/modules/by-name/co/constants/module.nix +++ b/modules/by-name/co/constants/module.nix @@ -56,6 +56,11 @@ anubis = 342; postfix-tlspol = 343; rocie = 344; + fluent-bit = 345; + loki = 346; + grafana = 347; + node-exporter = 348; + smartctl-exporter-access = 349; # As per the NixOS file, the uids should not be greater or equal to 400; }; @@ -96,6 +101,11 @@ resolvconf # This group is not matched to an user? stalwart-mail-certificates # This group is used to connect nginx and stalwart-mail rocie + fluent-bit + loki + grafana + node-exporter + smartctl-exporter-access ; # The gid should match the uid. Thus should not be >= 400; diff --git a/modules/by-name/mo/monitoring/components/grafana.nix b/modules/by-name/mo/monitoring/components/grafana.nix index 5459878..534ac78 100644 --- a/modules/by-name/mo/monitoring/components/grafana.nix +++ b/modules/by-name/mo/monitoring/components/grafana.nix @@ -118,31 +118,43 @@ in { }; }; + users = { + groups = { + grafana = { + gid = config.vhack.constants.ids.gids.grafana; + }; + }; + users = { + grafana = { + isSystemUser = true; + group = "grafana"; + uid = lib.mkForce config.vhack.constants.ids.uids.grafana; + }; + }; + }; + vhack = { postgresql.enable = true; + + persist.directories = [ + { + directory = "/var/lib/grafana/"; + user = "grafana"; + group = "grafana"; + mode = "0700"; + } + ]; + monitoring.grafana.dashboards = [ ../dashboards/Errors.json ../dashboards/Performance.json ../dashboards/Scraping_Jobs.json ]; + + anubis.instances."${cfg.fqdn}".target = "http://${config.services.grafana.settings.server.http_addr}:${toString cfg.port}"; }; services = { - nginx = { - virtualHosts.${cfg.fqdn} = { - locations."/" = { - proxyPass = "http://${toString config.services.grafana.settings.server.http_addr}:${toString config.services.grafana.settings.server.http_port}"; - proxyWebsockets = true; - extraConfig = '' - proxy_set_header Host $host; - ''; - }; - - forceSSL = true; - enableACME = true; - }; - }; - postgresql = { ensureUsers = [ { @@ -198,7 +210,7 @@ in { folder = "Vhack"; options.path = pkgs.symlinkJoin { name = "dashboards"; - paths = map (p: pkgs.runCommand "davhackoard" {} "mkdir $out; cp ${p} $out") cfg.dashboards; + paths = map (p: pkgs.runCommand "dashoard" {} "mkdir $out; cp ${p} $out") cfg.dashboards; }; allowUiUpdates = true; disableDeletion = true; diff --git a/modules/by-name/mo/monitoring/components/loki.nix b/modules/by-name/mo/monitoring/components/loki.nix index 9a285c5..149e577 100644 --- a/modules/by-name/mo/monitoring/components/loki.nix +++ b/modules/by-name/mo/monitoring/components/loki.nix @@ -17,50 +17,56 @@ in { }; config = lib.mkIf cfg.enable { - services = { - loki = { - enable = true; - dataDir = "/var/lib/loki"; - package = pkgs.grafana-loki; - configuration = { - auth_enabled = false; - - server.http_listen_port = cfg.port; - - common = { - ring = { - instance_addr = "127.0.0.1"; - kvstore = { - store = "inmemory"; - }; - }; - - replication_factor = 1; - path_prefix = "/tmp/loki"; - }; - - schema_config = { - configs = [ - { - from = "2020-05-15"; - store = "tsdb"; - object_store = "filesystem"; - schema = "v13"; - index = { - prefix = "index_"; - period = "24h"; - }; - } - ]; - }; + vhack = { + persist.directories = [ + { + directory = "/var/lib/loki"; + user = "loki"; + group = "loki"; + mode = "0700"; + } + { + directory = "/var/lib/fluent-bit"; + user = "fluent-bit"; + group = "fluent-bit"; + mode = "0700"; + } + ]; + }; - storage_config = { - filesystem.directory = "/tmp/loki/chunks"; - }; + users = { + groups = { + fluent-bit = { + gid = config.vhack.constants.ids.gids.fluent-bit; + }; + loki = { + gid = config.vhack.constants.ids.gids.loki; }; }; + users = { + fluent-bit = { + isSystemUser = true; + group = "fluent-bit"; + uid = config.vhack.constants.ids.uids.fluent-bit; + }; + loki = { + isSystemUser = true; + group = "loki"; + uid = config.vhack.constants.ids.uids.loki; + }; + }; + }; - # I decided to switch to fluent-bit because it can be tested locally https://docs.fluentbit.io/manual/local-testing/logging-pipeline + # I decided to switch to fluent-bit because it can be tested locally https://docs.fluentbit.io/manual/local-testing/logging-pipeline + systemd.services.fluent-bit = { + serviceConfig = { + StateDirectory = "fluent-bit"; + User = "fluent-bit"; + Group = "fluent-bit"; + DynamicUser = lib.mkForce false; + }; + }; + services = { fluent-bit = { enable = true; settings = { @@ -85,7 +91,7 @@ in { path = "/var/log/journal"; # Database file to keep track of the journald cursor. - db = "/var/fluent-bit/systemd.db"; + db = "/var/lib/fluent-bit/systemd.db"; # Start reading new entries. Skip entries already stored in journald. read_from_tail = true; @@ -117,6 +123,48 @@ in { }; graceLimit = "1m"; }; + + loki = { + enable = true; + dataDir = "/var/lib/loki"; + package = pkgs.grafana-loki; + configuration = { + auth_enabled = false; + + server.http_listen_port = cfg.port; + + common = { + ring = { + instance_addr = "127.0.0.1"; + kvstore = { + store = "inmemory"; + }; + }; + + replication_factor = 1; + path_prefix = "/tmp/loki"; + }; + + schema_config = { + configs = [ + { + from = "2020-05-15"; + store = "tsdb"; + object_store = "filesystem"; + schema = "v13"; + index = { + prefix = "index_"; + period = "24h"; + }; + } + ]; + }; + + storage_config = { + filesystem.directory = "/tmp/loki/chunks"; + }; + }; + }; }; }; } diff --git a/modules/by-name/mo/monitoring/components/prometheus.nix b/modules/by-name/mo/monitoring/components/prometheus.nix index 468ece3..dbe6c06 100644 --- a/modules/by-name/mo/monitoring/components/prometheus.nix +++ b/modules/by-name/mo/monitoring/components/prometheus.nix @@ -42,16 +42,22 @@ in { config = lib.mkIf cfg.enable { vhack = { nginx.enable = true; + + persist.directories = [ + { + directory = "/var/lib/prometheus2"; + user = "prometheus"; + group = "prometheus"; + mode = "0700"; + } + ]; + monitoring.prometheus.sources = [ { name = "node"; target = "127.0.0.1:${toString prom_cfg.exporters.node.port}"; } { - name = "smartctl"; - target = "127.0.0.1:${toString prom_cfg.exporters.smartctl.port}"; - } - { name = "prometheus_internal"; target = "127.0.0.1:${toString prom_cfg.port}"; } @@ -59,18 +65,22 @@ in { name = "systemd"; target = "127.0.0.1:${toString prom_cfg.exporters.systemd.port}"; } - { - name = "netdata"; - target = "127.0.0.1:19999"; - extra = { - metrics_path = "/api/v1/allmetrics"; - params.format = ["prometheus"]; - honor_labels = true; - }; - } ]; }; + users = { + groups = { + node-exporter.gid = config.vhack.constants.ids.gids.node-exporter; + }; + users = { + node-exporter = { + isSystemUser = true; + group = "node-exporter"; + uid = config.vhack.constants.ids.uids.node-exporter; + }; + }; + }; + services = { prometheus = { enable = true; @@ -159,11 +169,6 @@ in { port = 9112; listenAddress = "127.0.0.1"; }; - smartctl = { - enable = true; - port = 9115; - listenAddress = "127.0.0.1"; - }; # services.prometheus.exporters.redis = lib.mkIf (builtins.length (lib.attrNames config.services.redis.servers) > 0) { # enable = true; # port = 9119; @@ -184,6 +189,13 @@ in { enable = true; port = 9116; listenAddress = "127.0.0.1"; + extraFlags = [ + "--systemd.collector.enable-restart-count" + "--systemd.collector.enable-file-descriptor-size" + "--systemd.collector.enable-ip-accounting" + "--log.level=info" + "--systemd.collector.unit-include=.*.service|.*.timer" + ]; }; }; }; diff --git a/modules/by-name/mo/monitoring/components/scrutiny.nix b/modules/by-name/mo/monitoring/components/scrutiny.nix index d69dcab..adb515e 100644 --- a/modules/by-name/mo/monitoring/components/scrutiny.nix +++ b/modules/by-name/mo/monitoring/components/scrutiny.nix @@ -8,18 +8,11 @@ in { options.vhack.monitoring.scrutiny = { enable = lib.mkEnableOption "scrutiny service"; - - fqdn = lib.mkOption { - type = lib.types.nullOr lib.types.str; - description = '' - If a string, this will be the domain under which the scrutiny web interface will be servced. - - If null, the web interface will not be served and only the prometheus metrics will be accessible. - ''; - }; }; - config = lib.mkIf cfg.enable { + # We don't currently _care_ about the health of the hardware, because hetzner does + # this for us (nor can we care, because it's not exposed in the VPS) + config = lib.mkIf false { vhack.monitoring = { prometheus.sources = [ { @@ -27,12 +20,29 @@ in { extra.metrics_path = "/api/metrics"; target = "127.0.0.1:${toString config.services.scrutiny.settings.web.listen.port}"; } + { + name = "smartctl"; + target = "127.0.0.1:${toString config.services.prometheus.exporters.smartctl.port}"; + } ]; grafana.dashboards = [ ../dashboards/Health.json ]; }; + users = { + groups = { + smartctl-exporter-access.gid = config.vhack.constants.ids.gids.smartctl-exporter-access; + }; + users = { + smartctl-exporter-access = { + isSystemUser = true; + group = "smartctl-exporter-access"; + uid = config.vhack.constants.ids.uids.smartctl-exporter-access; + }; + }; + }; + services = { scrutiny = { enable = true; @@ -62,27 +72,11 @@ in { enable = true; }; }; - - # nginx.statusPage = lib.mkDefault config.services.nginx.enable; - nginx = lib.mkIf (cfg.fqdn != null) { - virtualHosts."${cfg.fqdn}" = { - locations."/".proxyPass = "http://127.0.0.1:${toString config.services.scrutiny.settings.web.listen.port}"; - - enableACME = true; - forceSSL = true; - }; - }; - - netdata = { - enable = true; - config = { - # web.mode = "none"; - # web."bind to" = "127.0.0.1:19999"; - global = { - "debug log" = "syslog"; - "access log" = "syslog"; - "error log" = "syslog"; - }; + prometheus = { + exporters.smartctl = { + enable = true; + port = 9115; + listenAddress = "127.0.0.1"; }; }; }; diff --git a/modules/by-name/ng/nginx/module.nix b/modules/by-name/ng/nginx/module.nix index 734a2d2..096c09a 100644 --- a/modules/by-name/ng/nginx/module.nix +++ b/modules/by-name/ng/nginx/module.nix @@ -86,6 +86,10 @@ in { }; services.nginx = { enable = true; + + # Enable the status page for the prometheus exporter. + statusPage = lib.mkIf config.services.prometheus.enable true; + virtualHosts = redirects; }; }; |
