update to G12 (+other components), add --pattern-ingester.enabled=true to Loki

Signed-off-by: JuanJo Ciarlante <[email protected]>

Author: jjo

2024/2024-10-23--Grafana_n_Friends-Jugando_con_eBPF_en_Linux-Oct2024/40-beyla/docker-compose.yml

@@ -40,7 +40,7 @@ services:
       - GF_USERS_DEFAULT_THEME=light
       - GF_INSTALL_PLUGINS=grafana-lokiexplore-app,grafana-exploretraces-app,grafana-pyroscope-app
       - GF_FEATURE_TOGGLES_ENABLE=flameGraph traceqlSearch traceQLStreaming correlations metricsSummary traceqlEditor traceToMetrics traceToProfiles datatrails
-    image: grafana/grafana:11.5.1-ubuntu
+    image: grafana/grafana:12.0.1-ubuntu
     ports:
       - 3000:3000
     volumes:
@@ -55,7 +55,9 @@ services:
     volumes:
       - ./k6/load_test.js:/k6/load_test.js
   loki:
-    command: -config.file=/etc/loki/loki.yaml
+    command:
+      - -config.file=/etc/loki/loki.yaml
+      - --pattern-ingester.enabled=true
     configs:
       - source: loki_config
         target: /etc/loki/loki.yaml
@@ -68,7 +70,7 @@ services:
         - CMD-SHELL
         - wget -q --tries=1 -O- http://localhost:3100/ready || exit 1
       timeout: 3s
-    image: grafana/loki:3.3.2
+    image: grafana/loki:3.5.1
     ports:
       - 3100:3100
       - 9096:9096
@@ -83,7 +85,7 @@ services:
       - source: prometheus_config
         target: /etc/prometheus/prometheus.yml
     container_name: prometheus
-    image: prom/prometheus:v3.1.0
+    image: prom/prometheus:v3.4.0
     ports:
       - 9090:9090
     volumes:

2024/2024-10-25--Promtail_syslog-Loki-Grafana/docker-compose.yml

@@ -17,13 +17,15 @@ services:
       - GF_USERS_DEFAULT_THEME=light
       - GF_INSTALL_PLUGINS=grafana-lokiexplore-app,grafana-exploretraces-app,grafana-pyroscope-app
       - GF_FEATURE_TOGGLES_ENABLE=flameGraph traceqlSearch traceQLStreaming correlations metricsSummary traceqlEditor traceToMetrics traceToProfiles datatrails
-    image: grafana/grafana:11.5.1-ubuntu
+    image: grafana/grafana:12.0.1-ubuntu
     ports:
       - 3000:3000
     volumes:
       - grafana-storage:/var/lib/grafana
   loki:
-    command: -config.file=/etc/loki/loki.yaml
+    command:
+      - -config.file=/etc/loki/loki.yaml
+      - --pattern-ingester.enabled=true
     configs:
       - source: loki_config
         target: /etc/loki/loki.yaml
@@ -36,7 +38,7 @@ services:
         - CMD-SHELL
         - wget -q --tries=1 -O- http://localhost:3100/ready || exit 1
       timeout: 3s
-    image: grafana/loki:3.3.2
+    image: grafana/loki:3.5.1
     ports:
       - 3100:3100
       - 9096:9096
@@ -51,7 +53,7 @@ services:
       - source: prometheus_config
         target: /etc/prometheus/prometheus.yml
     container_name: prometheus
-    image: prom/prometheus:v3.1.0
+    image: prom/prometheus:v3.4.0
     ports:
       - 9090:9090
     volumes:

2024/2024-10-28--LGTM_stack/docker-compose.yml

@@ -17,13 +17,15 @@ services:
       - GF_USERS_DEFAULT_THEME=light
       - GF_INSTALL_PLUGINS=grafana-lokiexplore-app,grafana-exploretraces-app,grafana-pyroscope-app
       - GF_FEATURE_TOGGLES_ENABLE=flameGraph traceqlSearch traceQLStreaming correlations metricsSummary traceqlEditor traceToMetrics traceToProfiles datatrails
-    image: grafana/grafana:11.5.1-ubuntu
+    image: grafana/grafana:12.0.1-ubuntu
     ports:
       - 3000:3000
     volumes:
       - grafana-storage:/var/lib/grafana
   loki:
-    command: -config.file=/etc/loki/loki.yaml
+    command:
+      - -config.file=/etc/loki/loki.yaml
+      - --pattern-ingester.enabled=true
     configs:
       - source: loki_config
         target: /etc/loki/loki.yaml
@@ -36,7 +38,7 @@ services:
         - CMD-SHELL
         - wget -q --tries=1 -O- http://localhost:3100/ready || exit 1
       timeout: 3s
-    image: grafana/loki:3.3.2
+    image: grafana/loki:3.5.1
     ports:
       - 3100:3100
       - 9096:9096
@@ -82,7 +84,7 @@ services:
       - source: prometheus_config
         target: /etc/prometheus/prometheus.yml
     container_name: prometheus
-    image: prom/prometheus:v3.1.0
+    image: prom/prometheus:v3.4.0
     ports:
       - 9090:9090
     volumes:

compose/jsonnet/lib/containers/images.libsonnet

@@ -1,7 +1,7 @@
 {
-  prometheus: 'prom/prometheus:v3.1.0',
-  grafana: 'grafana/grafana:11.5.1-ubuntu',
-  loki: 'grafana/loki:3.3.2',
+  prometheus: 'prom/prometheus:v3.4.0',
+  grafana: 'grafana/grafana:12.0.1-ubuntu',
+  loki: 'grafana/loki:3.5.1',
   tempo: 'grafana/tempo:2.7.0',
   beyla: 'grafana/beyla:latest',
   promtail: 'grafana/promtail:latest',

compose/jsonnet/lib/containers/loki/main.libsonnet

@@ -15,7 +15,10 @@ local images = import '../images.libsonnet';
         '%d:%d' % [root.port, root.port],
         '%d:%d' % [grpc_port, grpc_port],
       ],
-      command: '-config.file=/etc/loki/loki.yaml',
+      command: [
+        '-config.file=/etc/loki/loki.yaml',
+        '--pattern-ingester.enabled=true',
+      ],
       healthcheck: {
         test: ['CMD-SHELL', 'wget -q --tries=1 -O- http://localhost:%d/ready || exit 1' % root.port],
         interval: '30s',