Skip to content
Snippets Groups Projects
Commit 4b1e6034 authored by Hannes Feldt's avatar Hannes Feldt
Browse files

bump

parent 4dc66cf7
No related branches found
No related tags found
No related merge requests found
Pipeline #54512 failed
job "central-management" { job "central-management" {
datacenters = ["dc1"] datacenters = ["nl-east"]
type = "service" type = "service"
constraint { constraint {
...@@ -27,7 +27,7 @@ job "central-management" { ...@@ -27,7 +27,7 @@ job "central-management" {
service { service {
name = "s3-storage" name = "s3-storage"
port = "9000" port = "http_api"
connect { connect {
sidecar_service {} sidecar_service {}
} }
...@@ -76,7 +76,7 @@ job "central-management" { ...@@ -76,7 +76,7 @@ job "central-management" {
service { service {
name = "mimir" name = "mimir"
port = "8080" port = "http"
connect { connect {
sidecar_service { sidecar_service {
...@@ -195,14 +195,14 @@ job "central-management" { ...@@ -195,14 +195,14 @@ job "central-management" {
network { network {
mode ="bridge" mode ="bridge"
port "http" { port "http" {
static = 3001 static = 3000
to = 3000 to = 3000
} }
} }
service { service {
name = "grafana" name = "grafana"
port = "3000" port = "http"
connect { connect {
sidecar_service { sidecar_service {
...@@ -241,6 +241,11 @@ job "central-management" { ...@@ -241,6 +241,11 @@ job "central-management" {
extra_hosts = [ extra_hosts = [
"prometheus:127.0.0.1" "prometheus:127.0.0.1"
] ]
mount {
type = "bind"
source = "local/grafana.ini"
target = "/etc/grafana/grafana.ini"
}
} }
env { env {
...@@ -250,7 +255,23 @@ job "central-management" { ...@@ -250,7 +255,23 @@ job "central-management" {
GF_DATABASE_NAME = "grafana" GF_DATABASE_NAME = "grafana"
GF_DATABASE_USER = "postgres" GF_DATABASE_USER = "postgres"
GF_DATABASE_PASSWORD = "password" 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 { resources {
...@@ -273,7 +294,7 @@ job "central-management" { ...@@ -273,7 +294,7 @@ job "central-management" {
service { service {
name = "postgres" name = "postgres"
port = "5432" port = "postgres"
task = "postgres" task = "postgres"
connect { connect {
...@@ -320,7 +341,7 @@ job "central-management" { ...@@ -320,7 +341,7 @@ job "central-management" {
service { service {
name = "prometheus" name = "prometheus"
port = "9090" port = "prometheus"
connect { connect {
sidecar_service { sidecar_service {
proxy { proxy {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment