From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Wed, 3 May 2023 21:27:26 +0000 (-0400)
Subject: Merge pull request #50868 from rhcs-dashboard/update-monitoring-stack
X-Git-Tag: v19.0.0~1290
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d2a8edfba88393c62cd7daa2df210307948ccc62;p=ceph.git

Merge pull request #50868 from rhcs-dashboard/update-monitoring-stack

mgr/cephadm: update monitoring stack versions

Reviewed-by: Aashish Sharma <aasharma@redhat.com>
Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
---

d2a8edfba88393c62cd7daa2df210307948ccc62
diff --cc src/cephadm/cephadm.py
index 722f769dfa5e,0004cb498df1..8fe5ff9e30e9
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@@ -47,14 -47,14 +47,14 @@@ FuncT = TypeVar('FuncT', bound=Callable
  DEFAULT_IMAGE = 'quay.ceph.io/ceph-ci/ceph:main'
  DEFAULT_IMAGE_IS_MAIN = True
  DEFAULT_IMAGE_RELEASE = 'reef'
- DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.33.4'
+ 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_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.3.1'
- DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.23.0'
- DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/ceph-grafana:8.3.5'
+ 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/ceph-grafana:9.4.7'
  DEFAULT_HAPROXY_IMAGE = 'quay.io/ceph/haproxy:2.3'
 -DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.1.5'
 +DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.2.4'
  DEFAULT_SNMP_GATEWAY_IMAGE = 'docker.io/maxwo/snmp-notifier:v1.2.1'
  DEFAULT_ELASTICSEARCH_IMAGE = 'quay.io/omrizeneva/elasticsearch:6.8.23'
  DEFAULT_JAEGER_COLLECTOR_IMAGE = 'quay.io/jaegertracing/jaeger-collector:1.29'
diff --cc src/pybind/mgr/cephadm/module.py
index 777e80acf1b1,0f2b0eb9c181..db271603fe65
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -104,14 -101,14 +104,14 @@@ os._exit = os_exit_noop   # type: ignor
  
  # Default container images -----------------------------------------------------
  DEFAULT_IMAGE = 'quay.io/ceph/ceph'
- DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.33.4'
- DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.3.1'
+ DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.43.0'
+ DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.5.0'
  DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:2.4.0'
  DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:2.4.0'
- DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.23.0'
- DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/ceph-grafana:8.3.5'
+ DEFAULT_ALERT_MANAGER_IMAGE = 'quay.io/prometheus/alertmanager:v0.25.0'
+ DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/ceph-grafana:9.4.7'
  DEFAULT_HAPROXY_IMAGE = 'quay.io/ceph/haproxy:2.3'
 -DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.1.5'
 +DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.2.4'
  DEFAULT_SNMP_GATEWAY_IMAGE = 'docker.io/maxwo/snmp-notifier:v1.2.1'
  DEFAULT_ELASTICSEARCH_IMAGE = 'quay.io/omrizeneva/elasticsearch:6.8.23'
  DEFAULT_JAEGER_COLLECTOR_IMAGE = 'quay.io/jaegertracing/jaeger-collector:1.29'