From 961a17f1adc2b3d531a7ad3ad3162abb20a128e2 Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Tue, 11 Jul 2023 14:59:37 +0200 Subject: [PATCH] chore: publish 0.3.0+v1.6.0 release --- abra.sh | 2 +- compose.grafana.yml | 2 +- compose.prometheus.yml | 2 +- compose.yml | 6 +++--- grafana_custom.ini | 7 ++++++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/abra.sh b/abra.sh index 6a1822d..47450f9 100644 --- a/abra.sh +++ b/abra.sh @@ -4,7 +4,7 @@ export GRAFANA_DASHBOARDS_YML_VERSION=v1 export GRAFANA_SWARM_DASHBOARD_JSON_VERSION=v1 export GRAFANA_STACKS_DASHBOARD_JSON_VERSION=v1 export GRAFANA_TRAEFIK_DASHBOARD_JSON_VERSION=v1 -export GRAFANA_CUSTOM_INI_VERSION=v2 +export GRAFANA_CUSTOM_INI_VERSION=v3 export PROMTAIL_YML_VERSION=v2 export LOKI_YML_VERSION=v2 export PROMETHEUS_YML_VERSION=v1 diff --git a/compose.grafana.yml b/compose.grafana.yml index 6450f7f..e280775 100644 --- a/compose.grafana.yml +++ b/compose.grafana.yml @@ -2,7 +2,7 @@ version: '3.8' services: grafana: - image: grafana/grafana:9.5.2 + image: grafana/grafana:10.0.2 volumes: - grafana-data:/var/lib/grafana:rw secrets: diff --git a/compose.prometheus.yml b/compose.prometheus.yml index eb9c160..83208bb 100644 --- a/compose.prometheus.yml +++ b/compose.prometheus.yml @@ -2,7 +2,7 @@ version: '3.8' services: prometheus: - image: prom/prometheus:v2.44.0 + image: prom/prometheus:v2.45.0 secrets: - basic_auth_admin_password volumes: diff --git a/compose.yml b/compose.yml index 43c982d..5dadaec 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: prom/node-exporter:v1.5.0 + image: prom/node-exporter:v1.6.0 user: root environment: - NODE_ID={{.Node.ID}} @@ -37,11 +37,11 @@ services: - "traefik.http.routers.${STACK_NAME}-node.tls=true" - "traefik.http.routers.${STACK_NAME}-node.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}-node.middlewares=basicauth@file" - - "coop-cloud.${STACK_NAME}.version=0.2.0+v1.5.0" + - "coop-cloud.${STACK_NAME}.version=0.3.0+v1.6.0" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" cadvisor: - image: gcr.io/cadvisor/cadvisor:v0.47.1 + image: gcr.io/cadvisor/cadvisor:v0.47.2 command: - "-logtostderr" - "--enable_metrics=cpu,cpuLoad,disk,memory,network" diff --git a/grafana_custom.ini b/grafana_custom.ini index 29b5dc1..e252f8c 100644 --- a/grafana_custom.ini +++ b/grafana_custom.ini @@ -10,6 +10,7 @@ auto_assign_org_role = Admin {{ if eq (env "OIDC_ENABLED") "1" }} [auth] disable_login_form = true +oauth_allow_insecure_email_lookup=true # https://github.com/grafana/grafana/issues/70203 [auth.generic_oauth] enabled = true @@ -30,4 +31,8 @@ enabled = false {{ end }} [plugins] -enable_alpha = true \ No newline at end of file +enable_alpha = true + +[database] +type = sqlite3 +wal = true \ No newline at end of file