update agent version and config in development (#6545)

grafana · Nov 2, 2023 · dc6ff68 · dc6ff68
1 parent 6208aab
commit dc6ff68
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 17 deletions.
diff --git a/development/mimir-microservices-mode/config/grafana-agent.yaml b/development/mimir-microservices-mode/config/grafana-agent.yaml
@@ -1,6 +1,5 @@
 server:
   log_level: debug
-  http_listen_port: 9091
 
 prometheus:
   global:

diff --git a/development/mimir-microservices-mode/docker-compose.jsonnet b/development/mimir-microservices-mode/docker-compose.jsonnet
@@ -305,7 +305,7 @@ std.manifestYamlDoc({
 
   prometheus:: {
     prometheus: {
-      image: 'prom/prometheus:v2.45.0',
+      image: 'prom/prometheus:v2.47.2',
       command: [
         '--config.file=/etc/prometheus/prometheus.yaml',
         '--enable-feature=exemplar-storage',
@@ -322,7 +322,7 @@ std.manifestYamlDoc({
 
   grafana:: {
     grafana: {
-      image: 'grafana/grafana:9.4.3',
+      image: 'grafana/grafana:10.1.5',
       environment: [
         'GF_AUTH_ANONYMOUS_ENABLED=true',
         'GF_AUTH_ANONYMOUS_ORG_ROLE=Admin',
@@ -340,8 +340,8 @@ std.manifestYamlDoc({
     // Scrape the metrics also with the Grafana agent (useful to test metadata ingestion
     // until metadata remote write is not supported by Prometheus).
     'grafana-agent': {
-      image: 'grafana/agent:v0.21.2',
-      command: ['-config.file=/etc/agent-config/grafana-agent.yaml', '-prometheus.wal-directory=/tmp'],
+      image: 'grafana/agent:v0.37.3',
+      command: ['-config.file=/etc/agent-config/grafana-agent.yaml', '-metrics.wal-directory=/tmp', '-server.http.address=127.0.0.1:9091'],
       volumes: ['./config:/etc/agent-config'],
       ports: ['9091:9091'],
     },

diff --git a/development/mimir-microservices-mode/docker-compose.yml b/development/mimir-microservices-mode/docker-compose.yml
@@ -157,7 +157,7 @@
     "environment":
       - "GF_AUTH_ANONYMOUS_ENABLED=true"
       - "GF_AUTH_ANONYMOUS_ORG_ROLE=Admin"
-    "image": "grafana/grafana:9.4.3"
+    "image": "grafana/grafana:10.1.5"
     "ports":
       - "3000:3000"
     "volumes":
@@ -307,7 +307,7 @@
       - "--config.file=/etc/prometheus/prometheus.yaml"
       - "--enable-feature=exemplar-storage"
       - "--enable-feature=native-histograms"
-    "image": "prom/prometheus:v2.45.0"
+    "image": "prom/prometheus:v2.47.2"
     "ports":
       - "9090:9090"
     "volumes":

diff --git a/development/mimir-monolithic-mode-with-swift-storage/config/grafana-agent.yaml b/development/mimir-monolithic-mode-with-swift-storage/config/grafana-agent.yaml
@@ -1,6 +1,5 @@
 server:
   log_level: debug
-  http_listen_port: 9091
 
 prometheus:
   global:

diff --git a/development/mimir-monolithic-mode-with-swift-storage/docker-compose.yml b/development/mimir-monolithic-mode-with-swift-storage/docker-compose.yml
@@ -44,7 +44,7 @@ services:
   # until metadata remote write is not supported by Prometheus).
   grafana-agent:
     image: grafana/agent:v0.37.3
-    command: ["-config.file=/etc/agent-config/grafana-agent.yaml", "-prometheus.wal-directory=/tmp"]
+    command: ["-config.file=/etc/agent-config/grafana-agent.yaml", "-metrics.wal-directory=/tmp", "-server.http.address=127.0.0.1:9091"]
     volumes:
       - ./config:/etc/agent-config
     ports:

diff --git a/development/mimir-monolithic-mode/config/grafana-agent.yaml b/development/mimir-monolithic-mode/config/grafana-agent.yaml
@@ -1,6 +1,5 @@
 server:
   log_level: debug
-  http_listen_port: 9091
 
 prometheus:
   global:

diff --git a/development/mimir-monolithic-mode/docker-compose.yml b/development/mimir-monolithic-mode/docker-compose.yml
@@ -45,7 +45,7 @@ services:
     profiles:
       - grafana-agent-static
     image: grafana/agent:v0.37.3
-    command: ["-config.file=/etc/agent-config/grafana-agent.yaml", "-prometheus.wal-directory=/tmp"]
+    command: ["-config.file=/etc/agent-config/grafana-agent.yaml", "-metrics.wal-directory=/tmp", "-server.http.address=127.0.0.1:9091"]
     volumes:
       - ./config:/etc/agent-config
     ports:
@@ -57,7 +57,7 @@ services:
     image: grafana/agent:v0.37.3
     environment:
       - AGENT_MODE=flow
-    command: ["run", "--server.http.listen-addr=0.0.0.0:9092", "/etc/agent/config.river"]
+    command: ["run", "--server.http.address=0.0.0.0:9092", "/etc/agent/config.river"]
     volumes:
       - ./config/grafana-agent.river:/etc/agent/config.river
     ports:

diff --git a/development/mimir-read-write-mode/config/grafana-agent.yaml b/development/mimir-read-write-mode/config/grafana-agent.yaml
@@ -1,6 +1,5 @@
 server:
   log_level: info
-  http_listen_port: 9091
 
 prometheus:
   global:

diff --git a/development/mimir-read-write-mode/docker-compose.jsonnet b/development/mimir-read-write-mode/docker-compose.jsonnet
@@ -112,8 +112,8 @@ std.manifestYamlDoc({
     // Scrape the metrics also with the Grafana agent (useful to test metadata ingestion
     // until metadata remote write is not supported by Prometheus).
     'grafana-agent': {
-      image: 'grafana/agent:v0.21.2',
-      command: ['-config.file=/etc/agent-config/grafana-agent.yaml', '-prometheus.wal-directory=/tmp'],
+      image: 'grafana/agent:v0.37.3',
+      command: ['-config.file=/etc/agent-config/grafana-agent.yaml', '-metrics.wal-directory=/tmp', '-server.http.address=127.0.0.1:9091'],
       volumes: ['./config:/etc/agent-config'],
       ports: ['9091:9091'],
     },

diff --git a/development/mimir-read-write-mode/docker-compose.yml b/development/mimir-read-write-mode/docker-compose.yml
@@ -11,8 +11,9 @@
   "grafana-agent":
     "command":
       - "-config.file=/etc/agent-config/grafana-agent.yaml"
-      - "-prometheus.wal-directory=/tmp"
-    "image": "grafana/agent:v0.21.2"
+      - "-metrics.wal-directory=/tmp"
+      - "-server.http.address=127.0.0.1:9091"
+    "image": "grafana/agent:v0.37.3"
     "ports":
       - "9091:9091"
     "volumes":