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>

diff --cc ceph.spec.in
Simple merge

diff --cc src/cephadm/cephadm.py
Simple merge

diff --cc src/cephadm/cephadmlib/constants.py
index 119f43b459b6baca36579db4abf5607a9ad7fdfa,e53de90d0858f369812411519e676534a7ccaea5..6ca5d39ed9de8a76c7feec320cb1d44509836f95
--- 1/src/cephadm/cephadmlib/constants.py
--- 2/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'

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge

diff --cc src/pybind/mgr/cephadm/services/monitoring.py
Simple merge

diff --cc src/pybind/mgr/cephadm/tests/test_services.py
Simple merge