docker-compose: update grafana to 2.39

Signed-off-by: Victor Login <batazor111@gmail.com>
shortlink-org · Oct 29, 2022 · d7e26c6 · d7e26c6
1 parent 3459365
commit d7e26c6
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 16 deletions.
diff --git a/go.sum b/go.sum
@@ -568,7 +568,6 @@ github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vz
 github.com/go-chi/render v1.0.2 h1:4ER/udB0+fMWB2Jlf15RV3F4A2FDuYi/9f+lFttR/Lg=
 github.com/go-chi/render v1.0.2/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
-github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
 github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
 github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
 github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=

diff --git a/ops/Makefile/common.mk b/ops/Makefile/common.mk
@@ -30,6 +30,10 @@ up: ## Run for specific job
 		-f docker-compose.yaml \
 		-f ops/docker-compose/tooling/services/coredns.yaml \
 		-f ops/docker-compose/mq/rabbitmq.yaml \
+		-f ops/docker-compose/tooling/observability/prometheus.yaml \
+		-f ops/docker-compose/tooling/observability/grafana.yaml \
+		-f ops/docker-compose/tooling/observability/grafana-loki.yaml \
+		-f ops/docker-compose/tooling/observability/grafana-tempo.yaml \
 		up -d --remove-orphans
 
 run: ## Run this project in docker compose

diff --git a/ops/docker-compose/application/api.yaml b/ops/docker-compose/application/api.yaml
@@ -58,7 +58,7 @@ services:
     <<: *network
     depends_on:
       - coredns
-    image: prom/prometheus:v2.38.0
+    image: prom/prometheus:v2.39.1
     profiles:
       - prometheus
     volumes:

diff --git a/ops/docker-compose/application/link.yaml b/ops/docker-compose/application/link.yaml
@@ -43,7 +43,7 @@ services:
     <<: *network
     depends_on:
       - coredns
-    image: prom/prometheus:v2.38.0
+    image: prom/prometheus:v2.39.1
     profiles:
       - prometheus
     volumes:

diff --git a/ops/docker-compose/application/metadata.yaml b/ops/docker-compose/application/metadata.yaml
@@ -43,7 +43,7 @@ services:
     <<: *network
     depends_on:
       - coredns
-    image: prom/prometheus:v2.38.0
+    image: prom/prometheus:v2.39.1
     profiles:
       - prometheus
     volumes:

diff --git a/ops/docker-compose/database/elasticsearch.yaml b/ops/docker-compose/database/elasticsearch.yaml
@@ -45,10 +45,3 @@ services:
 #      options:
 #        tag: cassandra
 
-   dejavu:
-    image: appbaseio/dejavu:3.6.0
-    container_name: dejavu
-    ports:
-      - '1358:1358'
-    links:
-      - elasticsearch
diff --git a/ops/docker-compose/database/postgres-prometheus.yaml b/ops/docker-compose/database/postgres-prometheus.yaml
@@ -29,7 +29,7 @@ services:
     <<: *network
     depends_on:
       - coredns
-    image: prom/prometheus:v2.38.0
+    image: prom/prometheus:v2.39.1
     profiles:
       - prometheus
     volumes:

diff --git a/ops/docker-compose/gateway/traefik.yaml b/ops/docker-compose/gateway/traefik.yaml
@@ -43,7 +43,7 @@ services:
     <<: *network
     depends_on:
       - coredns
-    image: prom/prometheus:v2.38.0
+    image: prom/prometheus:v2.39.1
     profiles:
       - prometheus
     volumes:

diff --git a/ops/docker-compose/tooling/observability/grafana-tempo.yaml b/ops/docker-compose/tooling/observability/grafana-tempo.yaml
@@ -28,7 +28,7 @@ services:
       - "3100"          # tempo
     volumes:
       - ./ops/docker-compose/tooling/observability/tempo/tempo-local.yaml:/etc/tempo.yaml
-      - /data/tempo:/tmp/tempo
+      - $HOME/data/tempo:/tmp/tempo
 
   jaeger-query:
     <<: *network

diff --git a/ops/docker-compose/tooling/observability/grafana.yaml b/ops/docker-compose/tooling/observability/grafana.yaml
@@ -13,7 +13,7 @@ services:
     <<: *network
     depends_on:
       - coredns
-    image: grafana/grafana:9.1.1
+    image: grafana/grafana:9.2.2
     container_name: grafana
     restart: on-failure
     environment:

diff --git a/ops/docker-compose/tooling/observability/prometheus.yaml b/ops/docker-compose/tooling/observability/prometheus.yaml
@@ -13,7 +13,7 @@ services:
     <<: *network
     depends_on:
       - coredns
-    image: prom/prometheus:v2.38.0
+    image: prom/prometheus:v2.39.1
     profiles:
       - observability
     container_name: prometheus