From: Olivier Bourdon <obourdon@mirantis.com>
Date: Tue, 18 Jul 2017 07:15:23 +0000 (+0200)
Subject: Fix influxdb/meta/prometheus.yml for the CI
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=commitdiff_plain;h=b8eef06b1e09af3d545faa6a7ef171a93bb6ea6e

Fix influxdb/meta/prometheus.yml for the CI

Change-Id: I3f605396f90860ae9391c6d99900d854450c1f12
---

diff --git a/influxdb/map.jinja b/influxdb/map.jinja
index 913714d..974c839 100644
--- a/influxdb/map.jinja
+++ b/influxdb/map.jinja
@@ -33,3 +33,11 @@ default:
 {%- endload %}
 
 {%- set server = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('influxdb:server')) %}
+
+{%- set monitoring = salt['grains.filter_by']({
+  'default': {
+    'http_errors_percentage': 5,
+    'failed_points_percentage': 5,
+    'dropped_points_percentage': 5,
+  },
+}, grain='os_family', merge=salt['pillar.get']('influxdb:monitoring')) %}
diff --git a/influxdb/meta/prometheus.yml b/influxdb/meta/prometheus.yml
index 5404da6..995fde3 100644
--- a/influxdb/meta/prometheus.yml
+++ b/influxdb/meta/prometheus.yml
@@ -1,5 +1,5 @@
 {%- if pillar.influxdb.server is defined %}
-{%- from "influxdb/map.jinja" import server with context %}
+{%- from "influxdb/map.jinja" import server, monitoring with context %}
 
 {%- if server.get('enabled', False) %}
 server:
@@ -17,7 +17,7 @@ server:
       {% endraw %}
 {%- if server.get('http', {}).get('enabled', False) %}
     InfluxdbHTTPClientError:
-      {%- set influx_http_client_error_threshold = prometheus_server.get('alert', {}).get('InfluxdbHTTPClientError', {}).get('var', {}).get('threshold', 5) %}
+      {%- set influx_http_client_error_threshold = monitoring.http_errors_percentage %}
       if: >-
         rate(influxdb_httpd_clientError[2m]) / rate(influxdb_httpd_req[2m]) * 100 > {{ influx_http_client_error_threshold }}
       {% raw %}
@@ -28,7 +28,7 @@ server:
         summary: 'Influxdb number of client errors is high'
         description: '{{ printf `%.1f` $value }}% of client requests are in error on {{ $labels.host }} (threshold={%- endraw %}{{ influx_http_client_error_threshold }}).'
     InfluxdbHTTPPointsWrittenFail:
-      {%- set influx_http_points_written_fail_threshold = prometheus_server.get('alert', {}).get('InfluxdbHTTPPointsWrittenFail', {}).get('var', {}).get('threshold', 5) %}
+      {%- set influx_http_points_written_fail_threshold = monitoring.failed_points_percentage %}
       if: >-
         rate(influxdb_httpd_pointsWrittenFail[2m]) / rate(influxdb_httpd_pointsWrittenOK[2m]) * 100 > {{ influx_http_points_written_fail_threshold }}
       {% raw %}
@@ -39,7 +39,7 @@ server:
         summary: 'Influxdb too many failed writes'
         description: '{{ printf `%.1f` $value }}% of written points have failed on {{ $labels.host }} (threshold={%- endraw %}{{ influx_http_points_written_fail_threshold }}).'
     InfluxdbHTTPPointsWrittenDropped:
-      {%- set influx_http_points_written_dropped_threshold = prometheus_server.get('alert', {}).get('InfluxdbHTTPPointsWrittenDropped', {}).get('var', {}).get('threshold', 5) %}
+      {%- set influx_http_points_written_dropped_threshold = monitoring.dropped_points_percentage %}
       if: >-
         rate(influxdb_httpd_pointsWrittenDropped[2m]) / rate(influxdb_httpd_pointsWrittenOK[2m]) * 100 > {{ influx_http_points_written_dropped_threshold }}
       {% raw %}