diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-01-01 20:44:28 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-01-01 20:44:28 +0100 |
| commit | d588764748f00d1b96fe6bc6873ff0b0fc4e11a4 (patch) | |
| tree | d0798989775a0b2fbc612355058f94ddbd2b02c8 | |
| parent | 3847c081817d93e75ec9ef8d53d2961e13df74c3 (diff) | |
| download | nixcfg-d588764748f00d1b96fe6bc6873ff0b0fc4e11a4.tar.gz nixcfg-d588764748f00d1b96fe6bc6873ff0b0fc4e11a4.zip | |
don't rotate grafana password
| -rw-r--r-- | cluster/staging/app/telemetry/deploy/telemetry-service.hcl (renamed from cluster/staging/app/telemetry/deploy/telemetry.hcl) | 14 | ||||
| -rw-r--r-- | cluster/staging/app/telemetry/secrets.toml | 9 | ||||
| -rw-r--r-- | cluster/staging/node/caribou.nix | 2 | ||||
| -rw-r--r-- | cluster/staging/node/piranha.nix | 2 |
4 files changed, 17 insertions, 10 deletions
diff --git a/cluster/staging/app/telemetry/deploy/telemetry.hcl b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl index a3dacf0..e765bb9 100644 --- a/cluster/staging/app/telemetry/deploy/telemetry.hcl +++ b/cluster/staging/app/telemetry/deploy/telemetry-service.hcl @@ -1,4 +1,4 @@ -job "telemetry" { +job "telemetry-service" { datacenters = ["neptune", "jupiter", "corrin"] type = "service" @@ -139,8 +139,9 @@ job "telemetry" { template { data = <<EOH - GF_INSTALL_PLUGINS=grafana-clock-panel,grafana-simple-json-datasource,grafana-piechart-panel,grafana-worldmap-panel,grafana-polystat-panel - GF_SERVER_HTTP_PORT=3719 +GF_INSTALL_PLUGINS=grafana-clock-panel,grafana-simple-json-datasource,grafana-piechart-panel,grafana-worldmap-panel,grafana-polystat-panel +GF_SERVER_HTTP_PORT=3719 +GF_SECURITY_ADMIN_PASSWORD={{ key "secrets/telemetry/grafana/admin_password" }} EOH destination = "secrets/env" env = true @@ -151,6 +152,13 @@ job "telemetry" { cpu = 800 } + restart { + interval = "30s" + attempts = 10 + delay = "1m" + mode = "delay" + } + service { name = "grafana" tags = [ diff --git a/cluster/staging/app/telemetry/secrets.toml b/cluster/staging/app/telemetry/secrets.toml index 56df97d..f73c5b5 100644 --- a/cluster/staging/app/telemetry/secrets.toml +++ b/cluster/staging/app/telemetry/secrets.toml @@ -1,12 +1,11 @@ -[secrets."telemetry/grafana/s3_access_key"] -type = 'user' -description = 'S3 access key for grafana db' - [secrets."telemetry/grafana/admin_password"] type = 'command' -rotate = true command = 'openssl rand -base64 12' +[secrets."telemetry/grafana/s3_access_key"] +type = 'user' +description = 'S3 access key for grafana db' + [secrets."telemetry/grafana/s3_secret_key"] type = 'user' description = 'S3 secret key for grafana db' diff --git a/cluster/staging/node/caribou.nix b/cluster/staging/node/caribou.nix index 02cb16d..f777e73 100644 --- a/cluster/staging/node/caribou.nix +++ b/cluster/staging/node/caribou.nix @@ -15,7 +15,7 @@ deuxfleurs.ipv6 = "2001:910:1204:1::23"; deuxfleurs.cluster_ip = "10.14.1.3"; - deuxfleurs.is_raft_server = true; + deuxfleurs.is_raft_server = false; system.stateVersion = "21.05"; } diff --git a/cluster/staging/node/piranha.nix b/cluster/staging/node/piranha.nix index 22f8108..bda7c1f 100644 --- a/cluster/staging/node/piranha.nix +++ b/cluster/staging/node/piranha.nix @@ -15,7 +15,7 @@ deuxfleurs.ipv6 = "2a01:cb05:8984:3c00:223:24ff:feb0:ea82"; deuxfleurs.cluster_ip = "10.14.3.1"; - deuxfleurs.is_raft_server = false; + deuxfleurs.is_raft_server = true; system.stateVersion = "22.11"; } |