Merge pull request #230 from deNBI/staging

Staging
deNBI · Oct 18, 2022 · e11a5f2 · e11a5f2
2 parents ed46103 + c40bce1
commit e11a5f2
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/dev/portal_prometheus/Dockerfile b/dev/portal_prometheus/Dockerfile
@@ -1,2 +1,2 @@
-FROM prom/prometheus:v2.38.0
+FROM prom/prometheus:v2.39.0
 ADD prometheus.yml /etc/prometheus
diff --git a/dev/site_prometheus/Dockerfile b/dev/site_prometheus/Dockerfile
@@ -1,2 +1,2 @@
-FROM prom/prometheus:v2.38.0
+FROM prom/prometheus:v2.39.0
 ADD prometheus.yml /etc/prometheus
diff --git a/docker-compose.portal.yml b/docker-compose.portal.yml
@@ -11,7 +11,7 @@ x-logging:
 services:
   # global prometheus instance scraping data from the local instances
   portal_prometheus:
-    image: "prom/prometheus:v2.38.0"
+    image: "prom/prometheus:v2.39.0"
     container_name: portal_prometheus
     networks:
       portal:
@@ -37,7 +37,7 @@ services:
       - ${POSTGRES_DATA_FOLDER}:/home/postgres/pgdata
   portal_promscale:
     container_name: portal_promscale
-    image: "timescale/promscale:0.14.0"
+    image: "timescale/promscale:0.15.0"
     ports:
       - 9201:9201/tcp
     restart: on-failure
@@ -52,7 +52,7 @@ services:
       PROMSCALE_DB_URI: postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}?sslmode=allow
 
   portal_grafana:
-    image: "grafana/grafana:9.1.2"
+    image: "grafana/grafana:9.2.0"
     container_name: portal_grafana
     depends_on:
       - portal_prometheus

diff --git a/docker-compose.site.yml b/docker-compose.site.yml
@@ -35,7 +35,7 @@ services:
       - "${EXPORTER_PORT}:8080"
   # prometheus instance responsible for monitoring
   site_prometheus:
-    image: "prom/prometheus:v2.38.0"
+    image: "prom/prometheus:v2.39.0"
     # use self build Dockerfile as alternative
     # build: prod/site_prometheus
     container_name: project_usage_prometheus
@@ -71,7 +71,7 @@ services:
     environment:
       - PORTAL_AUTH_TOKEN
   site_grafana:
-    image: "grafana/grafana:9.1.2"
+    image: "grafana/grafana:9.2.0"
     # use self build Dockerfile as alternative
     # build: prod/grafana
     container_name: project_usage_grafana

diff --git a/prod/portal_prometheus/Dockerfile b/prod/portal_prometheus/Dockerfile
@@ -1,2 +1,2 @@
-FROM prom/prometheus:v2.38.0
+FROM prom/prometheus:v2.39.0
 ADD prometheus.yml /etc/prometheus
diff --git a/prod/site_prometheus/Dockerfile b/prod/site_prometheus/Dockerfile
@@ -1,4 +1,4 @@
-FROM prom/prometheus:v2.38.0
+FROM prom/prometheus:v2.39.0
 # relative to compose file
 ADD prometheus.yml /etc/prometheus/prometheus.yml
 

diff --git a/shared/grafana/Dockerfile b/shared/grafana/Dockerfile
@@ -1,4 +1,4 @@
-FROM grafana/grafana:9.1.2
+FROM grafana/grafana:9.2.0
 COPY provisioning/* /etc/grafana/provisioning/
 
 EXPOSE 3000