diff --git a/nix-system-configs/modules/system/build_machine.nix b/nix-system-configs/modules/system/build_machine.nix index c957e74..40c791d 100644 --- a/nix-system-configs/modules/system/build_machine.nix +++ b/nix-system-configs/modules/system/build_machine.nix @@ -42,7 +42,6 @@ in { (choose [./modules/local/hostname_username.nix ../local/hostname_username.nix]) (choose [./modules/local/networking_local.nix ../local/networking_local.nix]) (choose [./modules/lix-default.nix ../lix-default.nix]) - (choose [./modules/toolsets/grafana_metric.nix ../toolsets/grafana_metric.nix]) (choose [./modules/secrets-config/sops-build-machine.nix ../secrets-config/sops-build-machine.nix]) ## TODO: Make this more elegant and less risky for unexpected errors happening. ] diff --git a/nix-system-configs/modules/system/compose-songsheet.nix b/nix-system-configs/modules/system/compose-songsheet.nix index 4e30c81..a26c324 100644 --- a/nix-system-configs/modules/system/compose-songsheet.nix +++ b/nix-system-configs/modules/system/compose-songsheet.nix @@ -38,7 +38,6 @@ in { # Optionally: (choose [ ./modules/toolsets/remote_building.nix ../toolsets/remote_building.nix ]) ## Compose modules for Portainer service - (choose [./modules/toolsets/grafana_metric.nix ../toolsets/grafana_metric.nix]) (choose [./modules/songsheet/wavelog/docker-compose.nix ../songsheet/wavelog/docker-compose.nix]) (choose [./modules/secrets-config/sops-composesongsheet.nix ../secrets-config/sops-composesongsheet.nix]) ]; diff --git a/nix-system-configs/modules/system/database.nix b/nix-system-configs/modules/system/database.nix index d190b57..106670e 100644 --- a/nix-system-configs/modules/system/database.nix +++ b/nix-system-configs/modules/system/database.nix @@ -34,9 +34,8 @@ in { (choose [./modules/desktop-manager/gnome.nix ../desktop-manager/gnome.nix]) (choose [./modules/local/hostname_username.nix ../local/hostname_username.nix]) (choose [./modules/local/networking_local.nix ../local/networking_local.nix]) - # (choose [./modules/bootloader/seabios-assigned-iso-at-birth.nix ../bootloader/seabios-assigned-iso-at-birth.nix]) + (choose [./modules/bootloader/seabios-assigned-iso-at-birth.nix ../bootloader/seabios-assigned-iso-at-birth.nix]) (choose [./modules/lix-default.nix ../lix-default.nix]) - (choose [./modules/toolsets/grafana_metric.nix ../toolsets/grafana_metric.nix]) (choose [./modules/secrets-config/sops-database.nix ../secrets-config/sops-database.nix]) (choose [./modules/system_scripts/gcloud_backup.nix ../system_scripts/gcloud_backup.nix]) ## TODO: Make this more elegant and less risky for unexpected errors happening. diff --git a/nix-system-configs/modules/system/forgejo.nix b/nix-system-configs/modules/system/forgejo.nix index e836c3b..6c96867 100644 --- a/nix-system-configs/modules/system/forgejo.nix +++ b/nix-system-configs/modules/system/forgejo.nix @@ -63,7 +63,6 @@ in { (choose [./modules/toolsets/remote_building.nix ../toolsets/remote_building.nix]) (choose [./modules/bootloader/seabios-assigned-proxmox-at-birth.nix ../bootloader/seabios-assigned-proxmox-at-birth.nix]) (choose [./modules/lix-default.nix ../lix-default.nix]) - (choose [./modules/toolsets/grafana_metric.nix ../toolsets/grafana_metric.nix]) ]; config = { diff --git a/nix-system-configs/modules/system/gramethus.nix b/nix-system-configs/modules/system/gramethus.nix index d26361f..2a08dae 100644 --- a/nix-system-configs/modules/system/gramethus.nix +++ b/nix-system-configs/modules/system/gramethus.nix @@ -76,62 +76,6 @@ in { # Prevents Grafana from phoning home #analytics.reporting_enabled = false; }; - - provision = { - enable = true; - # ============== Declarative Config ================ - - datasources.settings.datasources = [ - # Provisioning a built-in data source - { - name = "Prometheus - Forgejo"; - type = "prometheus"; - url = "http://10.1.1.4:9001"; - isDefault = false; - editable = true; - } - - { - name = "Loki - Forgejo"; - type = "loki"; - url = "http://10.1.1.4:3100"; - isDefault = false; - editable = true; - } - - { - name = "Prometheus - Build Machine"; - type = "prometheus"; - url = "http://10.1.1.3:9001"; - isDefault = false; - editable = true; - } - - { - name = "Loki - Build Machine"; - type = "loki"; - url = "http://10.1.1.3:3100"; - isDefault = false; - editable = true; - } - - { - name = "Prometheus - Database"; - type = "prometheus"; - url = "http://10.1.1.251:9001"; - isDefault = false; - editable = true; - } - - { - name = "Loki - Database"; - type = "loki"; - url = "http://10.1.1.251:3100"; - isDefault = false; - editable = true; - } - ]; - }; }; services.prometheus = { @@ -273,5 +217,7 @@ in { networking.firewall.allowedTCPPorts = [3000]; networking.firewall.allowedUDPPorts = [3000]; + + # ============== Declarative Config ================ }; } diff --git a/nix-system-configs/modules/toolsets/grafana_metric.nix b/nix-system-configs/modules/toolsets/grafana_metric.nix index 6d0ab33..5cc95f9 100644 --- a/nix-system-configs/modules/toolsets/grafana_metric.nix +++ b/nix-system-configs/modules/toolsets/grafana_metric.nix @@ -136,16 +136,4 @@ networking.firewall.allowedTCPPorts = [3100 9001]; networking.firewall.allowedUDPPorts = [3100 9001]; - - systemd.services."loki-create-dirs" = { - description = "Create Loki runtime/storage directories"; - after = ["network.target"]; - serviceConfig = { - Type = "oneshot"; - ExecStart = '' ${pkgs.bash}/bin/bash -c "set -eu; \ - mkdir -p /var/loki /var/loki/compactor - ''; - }; - wantedBy = ["multi-user.target"]; - }; }