From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Tue, 19 Mar 2024 14:03:16 +0000 (-0400)
Subject: Merge pull request #55615 from rhcs-dashboard/grafana-mount-dashboards
X-Git-Tag: v20.0.0~2372
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=920886ac64286bdc4c9eec10bdb0deabdd89a9e2;p=ceph.git

Merge pull request #55615 from rhcs-dashboard/grafana-mount-dashboards

mgr/cephadm: mount grafana dashboards from the path

Reviewed-by: Adam King <adking@redhat.com>
Reviewed-by: Pedro Gonzalez Gomez <pegonzal@redhat.com>
---

920886ac64286bdc4c9eec10bdb0deabdd89a9e2
diff --cc src/cephadm/cephadmlib/constants.py
index 119f43b459b,e53de90d085..6ca5d39ed9d
--- a/src/cephadm/cephadmlib/constants.py
+++ b/src/cephadm/cephadmlib/constants.py
@@@ -9,10 -9,10 +9,10 @@@ DEFAULT_LOKI_IMAGE = 'docker.io/grafana
  DEFAULT_PROMTAIL_IMAGE = 'docker.io/grafana/promtail:2.4.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/ceph-grafana:9.4.12'
+ DEFAULT_GRAFANA_IMAGE = 'quay.io/ceph/grafana:9.4.12'
  DEFAULT_HAPROXY_IMAGE = 'quay.io/ceph/haproxy:2.3'
  DEFAULT_KEEPALIVED_IMAGE = 'quay.io/ceph/keepalived:2.2.4'
 -DEFAULT_NVMEOF_IMAGE = 'quay.io/ceph/nvmeof:latest'
 +DEFAULT_NVMEOF_IMAGE = 'quay.io/ceph/nvmeof:1.0.0'
  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'