Do not create data cluster if cinder volume is disabled
Change-Id: I44bd7e1aeb98e4f9d0cc2c86a61c83eebab21c72
diff --git a/cinder/meta/heka.yml b/cinder/meta/heka.yml
index 66fb675..b9f51c8 100644
--- a/cinder/meta/heka.yml
+++ b/cinder/meta/heka.yml
@@ -202,6 +202,7 @@
{%- endif %}
aggregator:
alarm_cluster:
+ {%- if volume %}
cinder_logs_volume:
policy: highest_severity
alerting: enabled
@@ -213,6 +214,29 @@
dimension:
service: cinder-data
nagios_host: 01-service-clusters
+ cinder_volume:
+ policy: highest_severity
+ alerting: enabled
+ match:
+ service: cinder-volume
+ members:
+ - cinder_volume
+ dimension:
+ service: cinder-data
+ nagios_host: 01-service-clusters
+ cinder_data:
+ policy: highest_severity
+ alerting: enabled_with_notification
+ match:
+ service: cinder-data
+ members:
+ - cinder_logs_volume
+ - cinder_volume
+ dimension:
+ cluster_name: cinder-data
+ nagios_host: 00-top-clusters
+ {%- endif %}
+ {%- if controller %}
cinder_logs:
policy: highest_severity
alerting: enabled
@@ -245,16 +269,6 @@
dimension:
service: cinder-control
nagios_host: 01-service-clusters
- cinder_volume:
- policy: highest_severity
- alerting: enabled
- match:
- service: cinder-volume
- members:
- - cinder_volume
- dimension:
- service: cinder-data
- nagios_host: 01-service-clusters
cinder_scheduler:
policy: highest_severity
alerting: enabled
@@ -278,14 +292,4 @@
dimension:
cluster_name: cinder-control
nagios_host: 00-top-clusters
- cinder_data:
- policy: highest_severity
- alerting: enabled_with_notification
- match:
- service: cinder-data
- members:
- - cinder_logs_volume
- - cinder_volume
- dimension:
- cluster_name: cinder-data
- nagios_host: 00-top-clusters
+ {%- endif %}