From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:25:09 +0000 (-0400)
Subject: Merge pull request #56320 from adk3798/wip-64636-squid
X-Git-Tag: testing/wip-root-testing-20240411.174241~33
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7ab361e6ad4d5848f867f60127b4b67cb06a6155;p=ceph-ci.git

Merge pull request #56320 from adk3798/wip-64636-squid

squid: cephadm/nvmeof: scrape nvmeof prometheus endpoint

Reviewed-by: John Mulligan <jmulligan@redhat.com>
---

7ab361e6ad4d5848f867f60127b4b67cb06a6155
diff --cc src/cephadm/cephadmlib/constants.py
index e53de90d085,119f43b459b..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'