set pool ops alerts optional and disable as default
Change-Id: Ib9ba4b2142bd6cba278e3674619cd5c2ac4b6121
Related-PROD: PROD-23935
diff --git a/ceph/common.sls b/ceph/common.sls
index c6067b0..b445355 100644
--- a/ceph/common.sls
+++ b/ceph/common.sls
@@ -25,8 +25,8 @@
common_config:
file.managed:
- name: {{ common.prefix_dir }}/etc/ceph/{{ common.get('cluster_name', 'ceph') }}.conf
- - user: ceph
- - group: ceph
+ - user: root
+ - group: root
- source: salt://ceph/files/{{ common.version }}/ceph.conf.{{ grains.os_family }}
- template: jinja
{% if not common.get('container_mode', False) %}
diff --git a/ceph/meta/prometheus.yml b/ceph/meta/prometheus.yml
index ec0200b..62f1b9d 100644
--- a/ceph/meta/prometheus.yml
+++ b/ceph/meta/prometheus.yml
@@ -100,6 +100,7 @@
annotations:
summary: "{{100*threshold}}% of Ceph pool space is used"
description: "The Ceph {{pool_name}} pool uses {{100*threshold}}% of available space for 3 minutes. For details, run 'ceph df'."
+ {%- if monitoring.cluster_stats.extra_alerts.get("enabled", False) %}
CephPool{{pool_name|replace(".", "")|replace("-", "")}}WriteOpsTooHigh:
{%- set threshold = monitoring_pool.pool_write_ops_threshold|default('200')|float %}
if: >-
@@ -144,6 +145,7 @@
annotations:
summary: "{{threshold}} Ceph pool read bytes per second"
description: "The number of Ceph {{pool_name}} pool read bytes per second is {{threshold}} for 3 minutes."
+ {%- endif %}
{%- endfor %}
{%- endif %}
{%- endif %}
diff --git a/metadata/service/monitoring/cluster_stats.yml b/metadata/service/monitoring/cluster_stats.yml
index 85ae108..fdca597 100644
--- a/metadata/service/monitoring/cluster_stats.yml
+++ b/metadata/service/monitoring/cluster_stats.yml
@@ -8,5 +8,7 @@
ceph:
monitoring:
cluster_stats:
+ extra_alerts:
+ enabled: false
enabled: true
ceph_user: ${_param:ceph_monitoring_user}