X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=elasticsearch%2Fmeta%2Fheka.yml;h=a4fae02975dd0faf8deb1e49ac0c8c701c49e9b7;hp=90b3ae7828f5691f4d39eaafb1708491dfa29cf2;hb=43e15c4bffdd3d69bba93e42fdee4f1fa1b85392;hpb=8ad5ad6436c6aa62f0d1854b38b0252cf62f4f39;ds=sidebyside

diff --git a/elasticsearch/meta/heka.yml b/elasticsearch/meta/heka.yml
index 90b3ae7..a4fae02 100644
--- a/elasticsearch/meta/heka.yml
+++ b/elasticsearch/meta/heka.yml
@@ -11,6 +11,25 @@ metric_collector:
         window: 60
         periods: 0
         function: last
+  alarm:
+    elasticsearch_check:
+      alerting: enabled
+      triggers:
+      - elasticsearch_check
+      dimension:
+        service: elasticsearch-node
+remote_collector:
+  trigger:
+    elasticsearch_cluster_check:
+      description: 'Elasticsearch cluster cannot be checked'
+      severity: down
+      rules:
+      - metric: elasticsearch_cluster_check
+        relational_operator: '=='
+        threshold: 0
+        window: 60
+        periods: 0
+        function: last
     elasticsearch_health_critical:
       description: 'Elasticsearch cluster health is critical'
       severity: critical
@@ -30,47 +49,42 @@ metric_collector:
         window: 60
         function: min
   alarm:
-    elasticsearch_check:
-      alerting: enabled
-      triggers:
-      - elasticsearch_check
-      dimension:
-        service: elasticsearch
-    elasticsearch_health:
+    elasticsearch_cluster_health:
       alerting: enabled
       triggers:
+      - elasticsearch_cluster_check
       - elasticsearch_health_critical
       - elasticsearch_health_warning
       dimension:
-        cluster: elasticsearch
+        service: elasticsearch-cluster
 aggregator:
   alarm_cluster:
     elasticsearch_service:
-      policy: majority_of_members
+      policy: availability_of_members
       alerting: enabled
       group_by: hostname
       match:
-        service: elasticsearch
+        service: elasticsearch-node
       members:
       - elasticsearch_check
       dimension:
-        service: elasticsearch-cluster
+        service: elasticsearch
         nagios_host: 01-service-clusters
     elasticsearch_cluster:
       policy: highest_severity
       alerting: enabled
       match:
-        cluster: elasticsearch
+        service: elasticsearch-cluster
       members:
-      - elasticsearch_health
+      - elasticsearch_cluster_health
       dimension:
-        service: elasticsearch-cluster
+        service: elasticsearch
         nagios_host: 01-service-clusters
     elasticsearch:
       policy: highest_severity
       alerting: enabled_with_notification
       match:
-        service: elasticsearch-cluster
+        service: elasticsearch
       members:
       - elasticsearch_service
       - elasticsearch_cluster