Add dimension to GSEs
This is based on service_name as defined in the haproxy:proxy:listen's,
defaulting to the listen_name if service_name is not defined.
diff --git a/haproxy/meta/heka.yml b/haproxy/meta/heka.yml
index 03b0964..1f8f8d9 100644
--- a/haproxy/meta/heka.yml
+++ b/haproxy/meta/heka.yml
@@ -82,13 +82,13 @@
- {{ listen_name }}_backends_majority_down
- {{ listen_name }}_backends_one_down
dimension:
- service: {{ listen_name }}
+ backend: {{ listen_name }}
{%- if listen.get('type', None) == 'openstack-service' %}
{{ listen_name }}_http_errors:
triggers:
- {{ listen_name }}_http_errors
dimension:
- service: {{ listen_name }}
+ backend: {{ listen_name }}
{%- endif %}
{%- endfor %}
aggregator:
@@ -106,12 +106,14 @@
{{ listen_name }}:
policy: highest_severity
match:
- service: {{ listen_name }}
+ backend: {{ listen_name }}
members:
- {{ listen_name }}_backends
{%- if listen.get('type', None) == 'openstack-service' %}
- {{ listen_name }}_http_errors
{%- endif %}
+ dimension:
+ service: {{ listen.service_name|default(listen_name) }}
{%- endfor %}
{%- endif %}