diff --git a/haproxy/meta/heka.yml b/haproxy/meta/heka.yml
index 7128769..03b0964 100644
--- a/haproxy/meta/heka.yml
+++ b/haproxy/meta/heka.yml
@@ -69,6 +69,12 @@
 {%- endif %}
 {%- endfor %}
   alarm:
+    haproxy_check:
+      alerting: enabled
+      triggers:
+      - haproxy_check
+      dimension:
+        service: haproxy
 {%- for listen_name, listen in proxy.listen.iteritems() if listen.get('check', True) %}
     {{ listen_name }}_backends:
       triggers:
@@ -84,11 +90,18 @@
       dimension:
         service: {{ listen_name }}
 {%- endif %}
-{%- else %}
-    {}
 {%- endfor %}
 aggregator:
   alarm_cluster:
+    haproxy_check:
+      policy: majority_of_members
+      match:
+        service: haproxy
+      group_by: hostname
+      members:
+      - haproxy_check
+      dimension:
+        cluster_name: haproxy-openstack
 {%- for listen_name, listen in proxy.listen.iteritems() if listen.get('check', True) %}
     {{ listen_name }}:
       policy: highest_severity
@@ -99,8 +112,6 @@
 {%- if listen.get('type', None) == 'openstack-service' %}
       - {{ listen_name }}_http_errors
 {%- endif %}
-{%- else %}
-    {}
 {%- endfor %}
 
 {%- endif %}