Fix nova/meta/prometheus.yml for the CI
Change-Id: I658fe283c85a7a64323b15764a8442a6ca9baf5e
diff --git a/nova/map.jinja b/nova/map.jinja
index 3b66daf..d99b5a4 100644
--- a/nova/map.jinja
+++ b/nova/map.jinja
@@ -89,5 +89,8 @@
'warn': '15%',
'crit': '5%',
},
+ 'error_log_rate': {
+ 'warn': 0.2,
+ },
},
}, grain='os_family', merge=salt['pillar.get']('nova:monitoring')) %}
diff --git a/nova/meta/prometheus.yml b/nova/meta/prometheus.yml
index 9d9bfae..723cb30 100644
--- a/nova/meta/prometheus.yml
+++ b/nova/meta/prometheus.yml
@@ -1,5 +1,4 @@
-{% from "nova/map.jinja" import controller with context %}
-{% from "nova/map.jinja" import compute with context %}
+{% from "nova/map.jinja" import controller, compute, monitoring with context %}
{%- set is_controller = controller.get('enabled', False) %}
{%- set is_compute = compute.get('enabled', False) %}
@@ -196,7 +195,7 @@
{%- endraw %}
{%- endif %}
NovaErrorLogsTooHigh:
- {%- set log_threshold = prometheus_server.get('alert', {}).get('NovaErrorLogsTooHigh', {}).get('var', {}).get('threshold', 0.2 ) %}
+ {%- set log_threshold = monitoring.error_log_rate.warn|float %}
if: >-
sum(rate(log_messages{service="nova",level=~"error|emergency|fatal"}[5m])) without (level) > {{ log_threshold }}
{%- raw %}