Added parameter for enabling legacy monitoring in newer ceph versions.
Related-Prod: PROD-35190
Change-Id: Ic40b0faa64aea1846bf9194f655f6ab6319db375
diff --git a/ceph/meta/grafana.yml b/ceph/meta/grafana.yml
index f43431b..a475784 100644
--- a/ceph/meta/grafana.yml
+++ b/ceph/meta/grafana.yml
@@ -2,7 +2,7 @@
{%- if common.version is defined %}
dashboard:
- {%- if common.version in ['kraken', 'jewel'] %}
+ {%- if common.version in ['kraken', 'jewel'] or common.get('legacy_monitoring',False) %}
ceph_cluster_prometheus:
datasource: prometheus
format: json
diff --git a/ceph/meta/prometheus.yml b/ceph/meta/prometheus.yml
index 86c1aff..77558b2 100644
--- a/ceph/meta/prometheus.yml
+++ b/ceph/meta/prometheus.yml
@@ -1,7 +1,7 @@
{%- from "ceph/map.jinja" import common, mon, monitoring, setup with context -%}
{%- if common.version is defined %}
- {%- if common.version in ['kraken', 'jewel'] -%}
+ {%- if common.version in ['kraken', 'jewel'] or common.get('legacy_monitoring', False) -%}
{%- if (mon is defined and mon.get('enabled')) or (monitoring.cluster_stats.get('enabled') and monitoring.cluster_stats.ceph_user is defined) %}
{%- raw %}
@@ -433,7 +433,7 @@
{%- endif %}
{%- endfor %}
{%- set address = fqdn_ip4_addresses[0] %}
- {%- if address is defined %}
+ {%- if address is defined and common.get('legacy_monitoring', False) %}
target:
static:
ceph:
diff --git a/ceph/meta/telegraf.yml b/ceph/meta/telegraf.yml
index 1c0a42e..e80c31d 100644
--- a/ceph/meta/telegraf.yml
+++ b/ceph/meta/telegraf.yml
@@ -1,7 +1,7 @@
{%- from "ceph/map.jinja" import common, mon, osd, monitoring with context -%}
{%- if common.version is defined %}
- {%- if common.version in ['kraken', 'jewel'] -%}
+ {%- if common.version in ['kraken', 'jewel'] or common.get('legacy_monitoring', False) -%}
{%- if mon is defined and mon.get('enabled') %}
remote_agent: