commit aa28ce22b5e364da6f0d457fc3b6156cb014e12e
author Ales Komarek <akomarek@mirantis.com> Tue Jun 27 13:34:14 2017 +0000
committer Gerrit Code Review <gerrit2@32a4cf582fa9> Tue Jun 27 13:34:14 2017 +0000
tree b2b258764a8247a438b6461284d31a7632d9cae4
parent 5bfb0e11ed7c63448490b01d04b32acd198018dd
parent b07671184c158f27fd9820af8861ac49bb9bb1e4

Merge "Add option to disable alarms"

heka/_service.sls

diff --git a/heka/_service.sls b/heka/_service.sls
index dd6c8c1..7af3101 100644
--- a/heka/_service.sls
+++ b/heka/_service.sls
@@ -263,6 +263,7 @@
 
 {%- endfor %}
 
+{%- if server.alarms_enabled %}
 {%- for alarm_name, alarm in service_metadata.get('alarm', {}).iteritems() %}
 
 {%- if alarm.get('enabled', True) %}
@@ -299,6 +300,7 @@
 {%- endif %}
 
 {%- endfor %}
+{%- endif %}
 
 {%- set policy = service_metadata.get('policy') %}
 {%- if policy %}

heka/map.jinja

diff --git a/heka/map.jinja b/heka/map.jinja
index be11040..827f184 100644
--- a/heka/map.jinja
+++ b/heka/map.jinja
@@ -50,6 +50,7 @@
 {% set log_collector = salt['grains.filter_by']({
   'default': {
     'container_mode': False,
+    'alarms_enabled': True,
     'prefix_dir': default_prefix_dir,
     'elasticsearch_port': default_elasticsearch_port,
     'poolsize': 100,
@@ -66,6 +67,7 @@
 {% set metric_collector = salt['grains.filter_by']({
   'default': {
     'container_mode': False,
+    'alarms_enabled': True,
     'prefix_dir': default_prefix_dir,
     'influxdb_port': default_influxdb_port,
     'influxdb_time_precision': default_influxdb_time_precision,
@@ -85,6 +87,7 @@
 {% set remote_collector = salt['grains.filter_by']({
   'default': {
     'container_mode': False,
+    'alarms_enabled': True,
     'prefix_dir': default_prefix_dir,
     'amqp_port': default_amqp_port,
     'amqp_vhost': '',
@@ -106,6 +109,7 @@
 {% set aggregator = salt['grains.filter_by']({
   'default': {
     'container_mode': False,
+    'alarms_enabled': True,
     'prefix_dir': default_prefix_dir,
     'influxdb_port': default_influxdb_port,
     'influxdb_time_precision': default_influxdb_time_precision,
@@ -125,6 +129,7 @@
 {% set ceilometer_collector = salt['grains.filter_by']({
   'default': {
     'container_mode': False,
+    'alarms_enabled': True,
     'prefix_dir': default_prefix_dir,
     'influxdb_port': default_influxdb_port,
     'influxdb_timeout': default_influxdb_timeout,