don't rotate grafana password

2 files changed, 15 insertions, 8 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'