KokaKiwi/nixcfg
1
0
Fork 0
forked from Deuxfleurs/nixcfg
Code Pull requests Activity

don't rotate grafana password

Browse source
This commit is contained in:
Alex 2023-01-01 20:44:28 +01:00
parent 3847c08181
commit d588764748
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cluster/staging/app/telemetry/deploy/telemetry.hcl → cluster/staging/app/telemetry/deploy/telemetry-service.hcl
View file

@ -1,4 +1,4 @@
job "telemetry" { job "telemetry-service" {
datacenters = ["neptune", "jupiter", "corrin"] datacenters = ["neptune", "jupiter", "corrin"]
type = "service" type = "service"
@ -139,8 +139,9 @@ job "telemetry" {
template { template {
data = <<EOH data = <<EOH
GF_INSTALL_PLUGINS=grafana-clock-panel,grafana-simple-json-datasource,grafana-piechart-panel,grafana-worldmap-panel,grafana-polystat-panel 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_SERVER_HTTP_PORT=3719
GF_SECURITY_ADMIN_PASSWORD={{ key "secrets/telemetry/grafana/admin_password" }}
EOH EOH
destination = "secrets/env" destination = "secrets/env"
env = true env = true
@ -151,6 +152,13 @@ job "telemetry" {
cpu = 800 cpu = 800
} }
restart {
interval = "30s"
attempts = 10
delay = "1m"
mode = "delay"
}
service { service {
name = "grafana" name = "grafana"
tags = [ tags = [

9
cluster/staging/app/telemetry/secrets.toml
View file

@ -1,12 +1,11 @@
[secrets."telemetry/grafana/admin_password"]
type = 'command'
command = 'openssl rand -base64 12'
[secrets."telemetry/grafana/s3_access_key"] [secrets."telemetry/grafana/s3_access_key"]
type = 'user' type = 'user'
description = 'S3 access key for grafana db' 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_secret_key"] [secrets."telemetry/grafana/s3_secret_key"]
type = 'user' type = 'user'
description = 'S3 secret key for grafana db' description = 'S3 secret key for grafana db'

2
cluster/staging/node/caribou.nix
View file

@ -15,7 +15,7 @@
deuxfleurs.ipv6 = "2001:910:1204:1::23"; deuxfleurs.ipv6 = "2001:910:1204:1::23";
deuxfleurs.cluster_ip = "10.14.1.3"; deuxfleurs.cluster_ip = "10.14.1.3";
deuxfleurs.is_raft_server = true; deuxfleurs.is_raft_server = false;
system.stateVersion = "21.05"; system.stateVersion = "21.05";
} }

2
cluster/staging/node/piranha.nix
View file

@ -15,7 +15,7 @@
deuxfleurs.ipv6 = "2a01:cb05:8984:3c00:223:24ff:feb0:ea82"; deuxfleurs.ipv6 = "2a01:cb05:8984:3c00:223:24ff:feb0:ea82";
deuxfleurs.cluster_ip = "10.14.3.1"; deuxfleurs.cluster_ip = "10.14.3.1";
deuxfleurs.is_raft_server = false; deuxfleurs.is_raft_server = true;
system.stateVersion = "22.11"; system.stateVersion = "22.11";
} }