Merge pull request ceph#57164 from guits/bump-promtail

cephadm: change loki/promtail default image tags

Author: guits

src/cephadm/cephadmlib/constants.py

@@ -5,8 +5,8 @@
 DEFAULT_IMAGE_IS_MAIN = True
 DEFAULT_IMAGE_RELEASE = 'squid'
 DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.43.0'
-DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:2.4.0'
-DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:2.4.0'
+DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:3.0.0'
+DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:3.0.0'
 DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.5.0'
 DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.25.0'
 DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:9.4.12'

src/pybind/mgr/cephadm/module.py

@@ -121,8 +121,8 @@ def os_exit_noop(status: int) -> None:
 DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.43.0'
 DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.5.0'
 DEFAULT_NVMEOF_IMAGE = 'quay.io/ceph/nvmeof:1.2.5'
-DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:2.4.0'
-DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:2.4.0'
+DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:3.0.0'
+DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:3.0.0'
 DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.25.0'
 DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:9.4.12'
 DEFAULT_HAPROXY_IMAGE = 'quay.io/ceph/haproxy:2.3'

src/pybind/mgr/cephadm/templates/services/loki.yml.j2

@@ -26,3 +26,10 @@ schema_config:
       index:
         prefix: index_
         period: 24h
+    - from: 2024-05-03
+      store: tsdb
+      object_store: filesystem
+      schema: v13
+      index:
+        prefix: index_
+        period: 24h

src/pybind/mgr/cephadm/tests/test_services.py

@@ -1046,6 +1046,13 @@ def test_loki_config(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
                       store: boltdb-shipper
                       object_store: filesystem
                       schema: v11
+                      index:
+                        prefix: index_
+                        period: 24h
+                    - from: 2024-05-03
+                      store: tsdb
+                      object_store: filesystem
+                      schema: v13
                       index:
                         prefix: index_
                         period: 24h""").lstrip()