diff --git a/grafana-central.nomad b/grafana-central.nomad index e3bb13611b8d9c68fab2ec6a59e8a99787a5642d..875250a5bc27c587618667686b95a89b24dfe82b 100644 --- a/grafana-central.nomad +++ b/grafana-central.nomad @@ -1,5 +1,5 @@ job "central-management" { - datacenters = ["dc1"] + datacenters = ["nl-east"] type = "service" constraint { @@ -27,7 +27,7 @@ job "central-management" { service { name = "s3-storage" - port = "9000" + port = "http_api" connect { sidecar_service {} } @@ -76,7 +76,7 @@ job "central-management" { service { name = "mimir" - port = "8080" + port = "http" connect { sidecar_service { @@ -195,14 +195,14 @@ job "central-management" { network { mode ="bridge" port "http" { - static = 3001 + static = 3000 to = 3000 } } service { name = "grafana" - port = "3000" + port = "http" connect { sidecar_service { @@ -241,6 +241,11 @@ job "central-management" { extra_hosts = [ "prometheus:127.0.0.1" ] + mount { + type = "bind" + source = "local/grafana.ini" + target = "/etc/grafana/grafana.ini" + } } env { @@ -250,7 +255,23 @@ job "central-management" { GF_DATABASE_NAME = "grafana" GF_DATABASE_USER = "postgres" GF_DATABASE_PASSWORD = "password" + GF_AUTH_GENERIC_OAUTH_ENABLED = "true" + GF_AUTH_GENERIC_OAUTH_CLIENT_ID = "grafanadop94" + GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET = "F94JfdTjhNe4BFmewHEJZgqm3UIvZL0O" + } + template { + data = <<EOH + [auth.generic_oauth] + name = ASTRON Keycloak + allow_sign_up = true + auto_login = false + scopes = email profile roles + auth_url = https://keycloak.astron.nl/auth/realms/SDC/protocol/openid-connect/auth + token_url = https://keycloak.astron.nl/auth/realms/SDC/protocol/openid-connect/token + api_url = https://keycloak.astron.nl/auth/realms/SDC/protocol/openid-connect/userinfo + EOH + destination = "local/grafana.ini" } resources { @@ -273,7 +294,7 @@ job "central-management" { service { name = "postgres" - port = "5432" + port = "postgres" task = "postgres" connect { @@ -320,7 +341,7 @@ job "central-management" { service { name = "prometheus" - port = "9090" + port = "prometheus" connect { sidecar_service { proxy {