diff --git a/clients/quadraticserver/stats/grafana.nix b/clients/quadraticserver/stats/grafana.nix index bef488f..12f9d51 100644 --- a/clients/quadraticserver/stats/grafana.nix +++ b/clients/quadraticserver/stats/grafana.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }@attrs: +{ config, pkgs, ... }: let secretName = "grafanaSecret"; @@ -20,7 +20,6 @@ in enable = true; declarativePlugins = [ ]; settings = { - "auth.anonymous".enabled = true; analytics.feedback_links_enabled = false; users.default_theme = "system"; server = { @@ -36,23 +35,6 @@ in admin_user = "quadradical"; admin_password = "$__file{${credentialDirectory}${passwordName}}"; }; - - dashboards.default_home_dashboard_path = toString ( - (import ../../../lib/status.nix attrs) [ - { - name = "Continuwuity (Matrix)"; - service = "continuwuity.service"; - } - { - name = "Forgejo (Git)"; - service = "forgejo.service"; - } - { - name = "SearXNG (Search)"; - service = "searx.service"; - } - ] - ); }; provision = { @@ -61,7 +43,6 @@ in { name = "Prometheus"; type = "prometheus"; - uid = "prometheus"; url = with config.services.prometheus; "http://${listenAddress}:${toString port}"; jsonData.timeInterval = config.services.prometheus.globalConfig.scrape_interval; } diff --git a/clients/quadraticserver/stats/prometheus.nix b/clients/quadraticserver/stats/prometheus.nix index 2ba8dab..e0b2ac1 100644 --- a/clients/quadraticserver/stats/prometheus.nix +++ b/clients/quadraticserver/stats/prometheus.nix @@ -4,7 +4,7 @@ enable = true; listenAddress = "127.0.0.7"; - globalConfig.scrape_interval = "3s"; + globalConfig.scrape_interval = "10s"; scrapeConfigs = [ { job_name = "node"; diff --git a/lib/status.nix b/lib/status.nix deleted file mode 100644 index 7bb4e6c..0000000 --- a/lib/status.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ pkgs, lib, ... }: -services: -pkgs.writers.writeJSON "status.json" { - title = "Service Status"; - panels = map ( - { name, service }: - { - datasource = { - type = "prometheus"; - uid = "prometheus"; - }; - fieldConfig = { - defaults = { - color = { - mode = "thresholds"; - }; - mappings = [ - { - options = { - "0" = { - color = "red"; - index = 1; - text = "Failed"; - }; - "1" = { - color = "green"; - index = 0; - text = "Running"; - }; - }; - type = "value"; - } - ]; - thresholds = { - mode = "absolute"; - steps = [ - { - color = "red"; - value = 0; - } - { - color = "green"; - value = 1; - } - ]; - }; - unit = "none"; - }; - }; - targets = [ - { - expr = "node_systemd_unit_state{name=\"${service}\",state=\"active\"}"; - } - ]; - title = name; - type = "stat"; - } - ) services; -}