From b671c05db950140a3fb24af664b71fbad7205d65 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Wed, 31 Jul 2024 11:11:14 +0800 Subject: [PATCH] feat: migrate services to aqua --- .../{12kingdoms-rakushun => idols-aquamarine}/caddy.nix | 0 .../exporters/default.nix | 0 .../{12kingdoms-rakushun => idols-aquamarine}/gitea.nix | 0 .../grafana/dashboards.yml | 0 .../grafana/dashboards/README.md | 0 .../dashboards/homelab/alertmanager-9578_rev4.json | 0 .../homelab/node-exporter-full-1860_rev33.json | 0 .../dashboards/kubernetes/k8s-addons-prometheus.json | 0 .../dashboards/kubernetes/k8s-addons-trivy-operator.json | 0 .../dashboards/kubernetes/k8s-system-api-server.json | 0 .../dashboards/kubernetes/k8s-system-coredns.json | 0 .../grafana/dashboards/kubernetes/k8s-views-global.json | 0 .../dashboards/kubernetes/k8s-views-namespaces.json | 0 .../grafana/dashboards/kubernetes/k8s-views-nodes.json | 0 .../grafana/dashboards/kubernetes/k8s-views-pods.json | 0 .../grafana/datasources.yml | 0 .../grafana/default.nix | 0 .../homepage/README.md | 0 .../homepage/config/bookmarks.yaml | 0 .../homepage/config/docker.yaml | 0 .../homepage/config/kubernetes.yaml | 0 .../homepage/config/services.yaml | 0 .../homepage/config/settings.yaml | 0 .../homepage/config/widgets.yaml | 0 .../homepage/default.nix | 0 .../prometheus/README.md | 0 .../prometheus/alert_rules/coredns_embedded-exporter.yml | 0 .../prometheus/alert_rules/etcd_embedded-exporter.yml | 0 .../prometheus/alert_rules/istio_embedded-exporter.yml | 0 .../prometheus/alert_rules/kubestate-exporter.yml | 0 .../prometheus/alert_rules/node-exporter.yml | 0 .../prometheus/default.nix | 4 ++-- .../{12kingdoms-rakushun => idols-aquamarine}/restic.nix | 0 .../{12kingdoms-rakushun => idols-aquamarine}/sftpgo.nix | 0 .../transmission.nix | 0 .../uptime-kuma.nix | 0 outputs/aarch64-linux/src/12kingdoms-rakushun.nix | 9 +++------ outputs/x86_64-linux/src/idols-aquamarine.nix | 6 ++++++ 38 files changed, 11 insertions(+), 8 deletions(-) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/caddy.nix (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/exporters/default.nix (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/gitea.nix (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards.yml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards/README.md (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards/homelab/alertmanager-9578_rev4.json (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards/kubernetes/k8s-addons-prometheus.json (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards/kubernetes/k8s-system-api-server.json (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards/kubernetes/k8s-system-coredns.json (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards/kubernetes/k8s-views-global.json (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards/kubernetes/k8s-views-namespaces.json (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards/kubernetes/k8s-views-nodes.json (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/dashboards/kubernetes/k8s-views-pods.json (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/datasources.yml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/grafana/default.nix (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/homepage/README.md (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/homepage/config/bookmarks.yaml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/homepage/config/docker.yaml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/homepage/config/kubernetes.yaml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/homepage/config/services.yaml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/homepage/config/settings.yaml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/homepage/config/widgets.yaml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/homepage/default.nix (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/prometheus/README.md (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/prometheus/alert_rules/coredns_embedded-exporter.yml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/prometheus/alert_rules/etcd_embedded-exporter.yml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/prometheus/alert_rules/istio_embedded-exporter.yml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/prometheus/alert_rules/kubestate-exporter.yml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/prometheus/alert_rules/node-exporter.yml (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/prometheus/default.nix (96%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/restic.nix (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/sftpgo.nix (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/transmission.nix (100%) rename hosts/{12kingdoms-rakushun => idols-aquamarine}/uptime-kuma.nix (100%) diff --git a/hosts/12kingdoms-rakushun/caddy.nix b/hosts/idols-aquamarine/caddy.nix similarity index 100% rename from hosts/12kingdoms-rakushun/caddy.nix rename to hosts/idols-aquamarine/caddy.nix diff --git a/hosts/12kingdoms-rakushun/exporters/default.nix b/hosts/idols-aquamarine/exporters/default.nix similarity index 100% rename from hosts/12kingdoms-rakushun/exporters/default.nix rename to hosts/idols-aquamarine/exporters/default.nix diff --git a/hosts/12kingdoms-rakushun/gitea.nix b/hosts/idols-aquamarine/gitea.nix similarity index 100% rename from hosts/12kingdoms-rakushun/gitea.nix rename to hosts/idols-aquamarine/gitea.nix diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards.yml b/hosts/idols-aquamarine/grafana/dashboards.yml similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards.yml rename to hosts/idols-aquamarine/grafana/dashboards.yml diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards/README.md b/hosts/idols-aquamarine/grafana/dashboards/README.md similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards/README.md rename to hosts/idols-aquamarine/grafana/dashboards/README.md diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards/homelab/alertmanager-9578_rev4.json b/hosts/idols-aquamarine/grafana/dashboards/homelab/alertmanager-9578_rev4.json similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards/homelab/alertmanager-9578_rev4.json rename to hosts/idols-aquamarine/grafana/dashboards/homelab/alertmanager-9578_rev4.json diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json b/hosts/idols-aquamarine/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json rename to hosts/idols-aquamarine/grafana/dashboards/homelab/node-exporter-full-1860_rev33.json diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-addons-prometheus.json b/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-addons-prometheus.json similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-addons-prometheus.json rename to hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-addons-prometheus.json diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json b/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json rename to hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-addons-trivy-operator.json diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-system-api-server.json b/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-system-api-server.json similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-system-api-server.json rename to hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-system-api-server.json diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-system-coredns.json b/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-system-coredns.json similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-system-coredns.json rename to hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-system-coredns.json diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-views-global.json b/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-global.json similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-views-global.json rename to hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-global.json diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-views-namespaces.json b/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-namespaces.json similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-views-namespaces.json rename to hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-namespaces.json diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-views-nodes.json b/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-nodes.json similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-views-nodes.json rename to hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-nodes.json diff --git a/hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-views-pods.json b/hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-pods.json similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/dashboards/kubernetes/k8s-views-pods.json rename to hosts/idols-aquamarine/grafana/dashboards/kubernetes/k8s-views-pods.json diff --git a/hosts/12kingdoms-rakushun/grafana/datasources.yml b/hosts/idols-aquamarine/grafana/datasources.yml similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/datasources.yml rename to hosts/idols-aquamarine/grafana/datasources.yml diff --git a/hosts/12kingdoms-rakushun/grafana/default.nix b/hosts/idols-aquamarine/grafana/default.nix similarity index 100% rename from hosts/12kingdoms-rakushun/grafana/default.nix rename to hosts/idols-aquamarine/grafana/default.nix diff --git a/hosts/12kingdoms-rakushun/homepage/README.md b/hosts/idols-aquamarine/homepage/README.md similarity index 100% rename from hosts/12kingdoms-rakushun/homepage/README.md rename to hosts/idols-aquamarine/homepage/README.md diff --git a/hosts/12kingdoms-rakushun/homepage/config/bookmarks.yaml b/hosts/idols-aquamarine/homepage/config/bookmarks.yaml similarity index 100% rename from hosts/12kingdoms-rakushun/homepage/config/bookmarks.yaml rename to hosts/idols-aquamarine/homepage/config/bookmarks.yaml diff --git a/hosts/12kingdoms-rakushun/homepage/config/docker.yaml b/hosts/idols-aquamarine/homepage/config/docker.yaml similarity index 100% rename from hosts/12kingdoms-rakushun/homepage/config/docker.yaml rename to hosts/idols-aquamarine/homepage/config/docker.yaml diff --git a/hosts/12kingdoms-rakushun/homepage/config/kubernetes.yaml b/hosts/idols-aquamarine/homepage/config/kubernetes.yaml similarity index 100% rename from hosts/12kingdoms-rakushun/homepage/config/kubernetes.yaml rename to hosts/idols-aquamarine/homepage/config/kubernetes.yaml diff --git a/hosts/12kingdoms-rakushun/homepage/config/services.yaml b/hosts/idols-aquamarine/homepage/config/services.yaml similarity index 100% rename from hosts/12kingdoms-rakushun/homepage/config/services.yaml rename to hosts/idols-aquamarine/homepage/config/services.yaml diff --git a/hosts/12kingdoms-rakushun/homepage/config/settings.yaml b/hosts/idols-aquamarine/homepage/config/settings.yaml similarity index 100% rename from hosts/12kingdoms-rakushun/homepage/config/settings.yaml rename to hosts/idols-aquamarine/homepage/config/settings.yaml diff --git a/hosts/12kingdoms-rakushun/homepage/config/widgets.yaml b/hosts/idols-aquamarine/homepage/config/widgets.yaml similarity index 100% rename from hosts/12kingdoms-rakushun/homepage/config/widgets.yaml rename to hosts/idols-aquamarine/homepage/config/widgets.yaml diff --git a/hosts/12kingdoms-rakushun/homepage/default.nix b/hosts/idols-aquamarine/homepage/default.nix similarity index 100% rename from hosts/12kingdoms-rakushun/homepage/default.nix rename to hosts/idols-aquamarine/homepage/default.nix diff --git a/hosts/12kingdoms-rakushun/prometheus/README.md b/hosts/idols-aquamarine/prometheus/README.md similarity index 100% rename from hosts/12kingdoms-rakushun/prometheus/README.md rename to hosts/idols-aquamarine/prometheus/README.md diff --git a/hosts/12kingdoms-rakushun/prometheus/alert_rules/coredns_embedded-exporter.yml b/hosts/idols-aquamarine/prometheus/alert_rules/coredns_embedded-exporter.yml similarity index 100% rename from hosts/12kingdoms-rakushun/prometheus/alert_rules/coredns_embedded-exporter.yml rename to hosts/idols-aquamarine/prometheus/alert_rules/coredns_embedded-exporter.yml diff --git a/hosts/12kingdoms-rakushun/prometheus/alert_rules/etcd_embedded-exporter.yml b/hosts/idols-aquamarine/prometheus/alert_rules/etcd_embedded-exporter.yml similarity index 100% rename from hosts/12kingdoms-rakushun/prometheus/alert_rules/etcd_embedded-exporter.yml rename to hosts/idols-aquamarine/prometheus/alert_rules/etcd_embedded-exporter.yml diff --git a/hosts/12kingdoms-rakushun/prometheus/alert_rules/istio_embedded-exporter.yml b/hosts/idols-aquamarine/prometheus/alert_rules/istio_embedded-exporter.yml similarity index 100% rename from hosts/12kingdoms-rakushun/prometheus/alert_rules/istio_embedded-exporter.yml rename to hosts/idols-aquamarine/prometheus/alert_rules/istio_embedded-exporter.yml diff --git a/hosts/12kingdoms-rakushun/prometheus/alert_rules/kubestate-exporter.yml b/hosts/idols-aquamarine/prometheus/alert_rules/kubestate-exporter.yml similarity index 100% rename from hosts/12kingdoms-rakushun/prometheus/alert_rules/kubestate-exporter.yml rename to hosts/idols-aquamarine/prometheus/alert_rules/kubestate-exporter.yml diff --git a/hosts/12kingdoms-rakushun/prometheus/alert_rules/node-exporter.yml b/hosts/idols-aquamarine/prometheus/alert_rules/node-exporter.yml similarity index 100% rename from hosts/12kingdoms-rakushun/prometheus/alert_rules/node-exporter.yml rename to hosts/idols-aquamarine/prometheus/alert_rules/node-exporter.yml diff --git a/hosts/12kingdoms-rakushun/prometheus/default.nix b/hosts/idols-aquamarine/prometheus/default.nix similarity index 96% rename from hosts/12kingdoms-rakushun/prometheus/default.nix rename to hosts/idols-aquamarine/prometheus/default.nix index df073d47..fbfa32d6 100644 --- a/hosts/12kingdoms-rakushun/prometheus/default.nix +++ b/hosts/idols-aquamarine/prometheus/default.nix @@ -83,7 +83,7 @@ metrics_path = "/metrics"; static_configs = [ { - targets = ["${myvars.networking.hostsAddr.rakushun.ipv4}:9153"]; + targets = ["${myvars.networking.hostsAddr.aquamarine.ipv4}:9153"]; labels.type = "app"; labels.app = "v2ray"; } @@ -96,7 +96,7 @@ metrics_path = "/metrics"; static_configs = [ { - targets = ["${myvars.networking.hostsAddr.rakushun.ipv4}:10000"]; + targets = ["${myvars.networking.hostsAddr.aquamarine.ipv4}:10000"]; labels.type = "app"; labels.app = "v2ray"; } diff --git a/hosts/12kingdoms-rakushun/restic.nix b/hosts/idols-aquamarine/restic.nix similarity index 100% rename from hosts/12kingdoms-rakushun/restic.nix rename to hosts/idols-aquamarine/restic.nix diff --git a/hosts/12kingdoms-rakushun/sftpgo.nix b/hosts/idols-aquamarine/sftpgo.nix similarity index 100% rename from hosts/12kingdoms-rakushun/sftpgo.nix rename to hosts/idols-aquamarine/sftpgo.nix diff --git a/hosts/12kingdoms-rakushun/transmission.nix b/hosts/idols-aquamarine/transmission.nix similarity index 100% rename from hosts/12kingdoms-rakushun/transmission.nix rename to hosts/idols-aquamarine/transmission.nix diff --git a/hosts/12kingdoms-rakushun/uptime-kuma.nix b/hosts/idols-aquamarine/uptime-kuma.nix similarity index 100% rename from hosts/12kingdoms-rakushun/uptime-kuma.nix rename to hosts/idols-aquamarine/uptime-kuma.nix diff --git a/outputs/aarch64-linux/src/12kingdoms-rakushun.nix b/outputs/aarch64-linux/src/12kingdoms-rakushun.nix index 07dc55d3..df5a4c31 100644 --- a/outputs/aarch64-linux/src/12kingdoms-rakushun.nix +++ b/outputs/aarch64-linux/src/12kingdoms-rakushun.nix @@ -24,13 +24,10 @@ "hosts/12kingdoms-${name}" ]) ++ [ - {modules.secrets.server.application.enable = true;} - {modules.secrets.server.operation.enable = true;} - {modules.secrets.server.webserver.enable = true;} ]; - home-modules = map mylib.relativeToRoot [ - "home/linux/tui.nix" - ]; + home-modules = + map mylib.relativeToRoot [ + ]; }; inherit (inputs) nixos-rk3588; diff --git a/outputs/x86_64-linux/src/idols-aquamarine.nix b/outputs/x86_64-linux/src/idols-aquamarine.nix index 0bd12d22..0e621d34 100644 --- a/outputs/x86_64-linux/src/idols-aquamarine.nix +++ b/outputs/x86_64-linux/src/idols-aquamarine.nix @@ -26,7 +26,13 @@ "hosts/idols-${name}" ]) ++ [ + {modules.secrets.server.application.enable = true;} + {modules.secrets.server.operation.enable = true;} + {modules.secrets.server.webserver.enable = true;} ]; + home-modules = map mylib.relativeToRoot [ + "home/linux/tui.nix" + ]; }; systemArgs = modules // args;