Fix publisher list rendering
Currently if there are more than 1 element in publisher list
it will be rendered incorrectly (wrong indentation),
this patch uses yaml filter to fix this.
Change-Id: I14170e546c0dbb34fef45ed8cac7ef8e95fe4579
Related-Prod: https://mirantis.jira.com/browse/PROD-20427
diff --git a/ceilometer/files/pike/event_pipeline.yaml b/ceilometer/files/pike/event_pipeline.yaml
index 936b52c..2979d85 100644
--- a/ceilometer/files/pike/event_pipeline.yaml
+++ b/ceilometer/files/pike/event_pipeline.yaml
@@ -9,9 +9,9 @@
{%- for k, v in publisher.items() %}
{%- if v.get('enabled', False) and v.get('publish_event', False) %}
{%- if k == 'default' %}
-{%- do publisher_lst.append( '- direct://' ) %}
+{%- do publisher_lst.append( 'direct://' ) %}
{%- else %}
-{%- do publisher_lst.append( '- ' + v.url ) %}
+{%- do publisher_lst.append( v.url ) %}
{%- endif %}
{%- endif %}
{%- endfor %}
@@ -26,4 +26,4 @@
- name: event_sink
transformers:
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}
diff --git a/ceilometer/files/pike/pipeline.yaml b/ceilometer/files/pike/pipeline.yaml
index 77512de..c2accf1 100644
--- a/ceilometer/files/pike/pipeline.yaml
+++ b/ceilometer/files/pike/pipeline.yaml
@@ -9,11 +9,11 @@
{%- for k, v in publisher.items() %}
{%- if v.get('enabled', False) and v.get('publish_metric', False) %}
{%- if k == 'default' %}
-{%- do publisher_lst.append( '- notifier://' ) %}
+{%- do publisher_lst.append( 'notifier://' ) %}
{%- elif k == 'graphite' %}
-{%- do publisher_lst.append( '- graphite://' + v.host + ':' + v.port ) %}
+{%- do publisher_lst.append( 'graphite://' + v.host + ':' + v.port ) %}
{%- else %}
-{%- do publisher_lst.append( '- ' + v.url ) %}
+{%- do publisher_lst.append( v.url ) %}
{%- endif %}
{%- endif %}
{%- endfor %}
@@ -54,7 +54,7 @@
- name: meter_sink
transformers:
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}
- name: cpu_sink
transformers:
- name: "rate_of_change"
@@ -66,7 +66,7 @@
max: 100
scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))"
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}
- name: cpu_delta_sink
transformers:
- name: "delta"
@@ -75,7 +75,7 @@
name: "cpu.delta"
growth_only: True
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}
- name: disk_sink
transformers:
- name: "rate_of_change"
@@ -90,7 +90,7 @@
unit: "\\1/s"
type: "gauge"
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}
- name: network_sink
transformers:
- name: "rate_of_change"
@@ -105,4 +105,4 @@
unit: "\\1/s"
type: "gauge"
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}
diff --git a/ceilometer/files/queens/event_pipeline.yaml b/ceilometer/files/queens/event_pipeline.yaml
index 936b52c..2979d85 100644
--- a/ceilometer/files/queens/event_pipeline.yaml
+++ b/ceilometer/files/queens/event_pipeline.yaml
@@ -9,9 +9,9 @@
{%- for k, v in publisher.items() %}
{%- if v.get('enabled', False) and v.get('publish_event', False) %}
{%- if k == 'default' %}
-{%- do publisher_lst.append( '- direct://' ) %}
+{%- do publisher_lst.append( 'direct://' ) %}
{%- else %}
-{%- do publisher_lst.append( '- ' + v.url ) %}
+{%- do publisher_lst.append( v.url ) %}
{%- endif %}
{%- endif %}
{%- endfor %}
@@ -26,4 +26,4 @@
- name: event_sink
transformers:
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}
diff --git a/ceilometer/files/queens/pipeline.yaml b/ceilometer/files/queens/pipeline.yaml
index 77512de..c2accf1 100644
--- a/ceilometer/files/queens/pipeline.yaml
+++ b/ceilometer/files/queens/pipeline.yaml
@@ -9,11 +9,11 @@
{%- for k, v in publisher.items() %}
{%- if v.get('enabled', False) and v.get('publish_metric', False) %}
{%- if k == 'default' %}
-{%- do publisher_lst.append( '- notifier://' ) %}
+{%- do publisher_lst.append( 'notifier://' ) %}
{%- elif k == 'graphite' %}
-{%- do publisher_lst.append( '- graphite://' + v.host + ':' + v.port ) %}
+{%- do publisher_lst.append( 'graphite://' + v.host + ':' + v.port ) %}
{%- else %}
-{%- do publisher_lst.append( '- ' + v.url ) %}
+{%- do publisher_lst.append( v.url ) %}
{%- endif %}
{%- endif %}
{%- endfor %}
@@ -54,7 +54,7 @@
- name: meter_sink
transformers:
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}
- name: cpu_sink
transformers:
- name: "rate_of_change"
@@ -66,7 +66,7 @@
max: 100
scale: "100.0 / (10**9 * (resource_metadata.cpu_number or 1))"
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}
- name: cpu_delta_sink
transformers:
- name: "delta"
@@ -75,7 +75,7 @@
name: "cpu.delta"
growth_only: True
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}
- name: disk_sink
transformers:
- name: "rate_of_change"
@@ -90,7 +90,7 @@
unit: "\\1/s"
type: "gauge"
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}
- name: network_sink
transformers:
- name: "rate_of_change"
@@ -105,4 +105,4 @@
unit: "\\1/s"
type: "gauge"
publishers:
- {{ '\n'.join(publisher_lst) }}
+ {{ publisher_lst|yaml(False)|indent(10) }}