commit deb0445962154a0539bbb6267a28cbff289b697f
author Olivier Bourdon <obourdon@mirantis.com> Tue Jul 18 15:53:31 2017 +0200
committer Olivier Bourdon <obourdon@mirantis.com> Wed Jul 19 13:42:07 2017 +0200
tree 0526c70a32b95b9e5f559231fd0e1a1e7cb6dbb2
parent 940e025c93c396c0ab0ad48895fe5075e87505af

Fix keystone/meta/prometheus.yml for the CI

Change-Id: Iaf6800e6d857a0f093c157119889037c6d397758

keystone/map.jinja

diff --git a/keystone/map.jinja b/keystone/map.jinja
index 361bba9..01613bf 100644
--- a/keystone/map.jinja
+++ b/keystone/map.jinja
@@ -50,3 +50,13 @@
         'pkgs': [],
     },
 }, merge=pillar.keystone.get('control', {})) %}
+
+{% set monitoring = salt['grains.filter_by']({
+    'default': {
+        'error_log_rate': 0.2,
+        'failed_auths': {
+            'percentage': 50,
+            'all_auths_rate': 0.1,
+        },
+    },
+}, grain='os_family', merge=salt['pillar.get']('keystone:monitoring')) %}

keystone/meta/prometheus.yml

diff --git a/keystone/meta/prometheus.yml b/keystone/meta/prometheus.yml
index 997c08e..572908f 100644
--- a/keystone/meta/prometheus.yml
+++ b/keystone/meta/prometheus.yml
@@ -1,4 +1,5 @@
 {%- if pillar.keystone.server is defined and pillar.keystone.server.get('enabled') %}
+{%- from "keystone/map.jinja" import monitoring with context %}
 {% raw %}
 server:
   alert:
@@ -15,7 +16,7 @@
             Endpoint check for '{{ $labels.service}}' is down for 2 minutes
     KeystoneErrorLogsTooHigh:
 {%- endraw %}
-      {%- set log_threshold = prometheus_server.get('alert', {}).get('KeystoneErrorLogsTooHigh', {}).get('var', {}).get('threshold', 0.2 ) %}
+      {%- set log_threshold = monitoring.error_log_rate|float %}
       if: >-
         sum(rate(log_messages{service="keystone",level=~"error|emergency|fatal"}[5m])) without (level) > {{ log_threshold }}
 {%- raw %}
@@ -26,8 +27,8 @@
         summary: 'Too many errors in {{ $labels.service }} logs'
         description: 'The rate of errors in {{ $labels.service }} logs over the last 5 minutes is too high on node {{ $labels.host }} (current value={{ $value }}, threshold={%- endraw %}{{ log_threshold }}).'
     KeystoneFailedAuthsTooHigh:
-      {%- set auth_threshold = prometheus_server.get('alert', {}).get('KeystoneFailedAuthsTooHigh', {}).get('var', {}).get('threshold', 50 ) %}
-      {%- set rate_threshold = prometheus_server.get('alert', {}).get('KeystoneFailedAuthsTooHigh', {}).get('var', {}).get('rate_threshold', 0.1 ) %}
+      {%- set auth_threshold = monitoring.failed_auths.percentage %}
+      {%- set rate_threshold = monitoring.failed_auths.all_auths_rate|float %}
       if: >-
         rate(authentications_total_failed[5m]) > rate(authentications_total_all[5m]) * {{ auth_threshold }} / 100 and rate(authentications_total_all[5m]) > {{ rate_threshold }}
 {%- raw %}