Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
dweinholz committed Jul 3, 2023
2 parents 479d0bd + 3c1ff24 commit 4fc5650
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion dev/portal_prometheus/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM prom/prometheus:v2.40.1
FROM prom/prometheus:v2.44.0
ADD prometheus.yml /etc/prometheus
2 changes: 1 addition & 1 deletion dev/site_prometheus/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM prom/prometheus:v2.40.1
FROM prom/prometheus:v2.44.0
ADD prometheus.yml /etc/prometheus
6 changes: 3 additions & 3 deletions docker-compose.portal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ x-logging:
services:
# global prometheus instance scraping data from the local instances
portal_prometheus:
image: "prom/prometheus:v2.40.1"
image: "prom/prometheus:v2.44.0"
container_name: portal_prometheus
networks:
portal:
Expand All @@ -37,7 +37,7 @@ services:
- ${POSTGRES_DATA_FOLDER}:/home/postgres/pgdata
portal_promscale:
container_name: portal_promscale
image: "timescale/promscale:0.16.0"
image: "timescale/promscale:0.17.0"
ports:
- 9201:9201/tcp
restart: on-failure
Expand All @@ -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.2.3"
image: "grafana/grafana:9.5.2"
container_name: portal_grafana
depends_on:
- portal_prometheus
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
- "${EXPORTER_PORT}:8080"
# prometheus instance responsible for monitoring
site_prometheus:
image: "prom/prometheus:v2.40.1"
image: "prom/prometheus:v2.44.0"
# use self build Dockerfile as alternative
# build: prod/site_prometheus
container_name: project_usage_prometheus
Expand All @@ -51,7 +51,7 @@ services:
# use the one below to have haproxy debug log directly to stdout including
# every request with auth headers
# image: mminks/haproxy-docker-logging:latest
image: "haproxy:2.6.6-alpine"
image: "haproxy:2.8.0-alpine"
# use self build Dockerfile as alternative
# build: prod/haproxy
container_name: project_usage_proxy
Expand All @@ -71,7 +71,7 @@ services:
environment:
- PORTAL_AUTH_TOKEN
site_grafana:
image: "grafana/grafana:9.2.3"
image: "grafana/grafana:9.5.2"
# use self build Dockerfile as alternative
# build: prod/grafana
container_name: project_usage_grafana
Expand Down
2 changes: 1 addition & 1 deletion prod/haproxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM haproxy:2.6-alpine
FROM haproxy:2.8-alpine
ADD etc/haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg

EXPOSE 80
2 changes: 1 addition & 1 deletion prod/portal_prometheus/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM prom/prometheus:v2.40.1
FROM prom/prometheus:v2.44.0
ADD prometheus.yml /etc/prometheus
2 changes: 1 addition & 1 deletion prod/site_prometheus/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM prom/prometheus:v2.40.1
FROM prom/prometheus:v2.44.0
# relative to compose file
ADD prometheus.yml /etc/prometheus/prometheus.yml

Expand Down
2 changes: 1 addition & 1 deletion shared/grafana/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM grafana/grafana:9.2.3
FROM grafana/grafana:9.5.2
COPY provisioning/* /etc/grafana/provisioning/

EXPOSE 3000
Expand Down

0 comments on commit 4fc5650

Please sign in to comment.