Fix neutron/meta/prometheus.yml for the CI
Change-Id: Ie688ff5deecf2fe3c6d206d13a9ba97f756db571
diff --git a/neutron/map.jinja b/neutron/map.jinja
index f670fb0..1dd5f2a 100644
--- a/neutron/map.jinja
+++ b/neutron/map.jinja
@@ -65,6 +65,12 @@
},
}, merge=pillar.neutron.get('client', {})) %}
+{% set monitoring = salt['grains.filter_by']({
+ 'default': {
+ 'error_log_rate': 0.2,
+ },
+}, grain='os_family', merge=salt['pillar.get']('neutron:monitoring')) %}
+
{%- if pillar.neutron.server is defined %}
{%- set tmp_server = pillar.neutron.server %}
diff --git a/neutron/meta/prometheus.yml b/neutron/meta/prometheus.yml
index 2f0b198..9f747cb 100644
--- a/neutron/meta/prometheus.yml
+++ b/neutron/meta/prometheus.yml
@@ -1,4 +1,4 @@
-{%- from "neutron/map.jinja" import server with context %}
+{%- from "neutron/map.jinja" import server, monitoring with context %}
{%- if server.get('enabled', False) %}
{%- raw %}
@@ -53,7 +53,7 @@
All '{{ $labels.service}}' agents are down for 2 minutes
NeutronErrorLogsTooHigh:
{%- endraw %}
- {%- set log_threshold = prometheus_server.get('alert', {}).get('NeutronErrorLogsTooHigh', {}).get('var', {}).get('threshold', 0.2 ) %}
+ {%- set log_threshold = monitoring.error_log_rate|float %}
if: >-
sum(rate(log_messages{service="neutron",level=~"error|emergency|fatal"}[5m])) without (level) > {{ log_threshold }}
{%- raw %}