diff --git a/etcd/map.jinja b/etcd/map.jinja
index 70e91cf..e1f3296 100644
--- a/etcd/map.jinja
+++ b/etcd/map.jinja
@@ -17,4 +17,10 @@
         'pkgs': ['etcd', 'python-etcd'],
         'services': ['etcd']
     },
-}, grain='oscodename', merge=salt['pillar.get']('etcd:server'))) %}
\ No newline at end of file
+}, grain='oscodename', merge=salt['pillar.get']('etcd:server'))) %}
+
+{%- set monitoring = salt['grains.filter_by']({
+  'default': {
+    'failed_http_requests_percentage': 1,
+  },
+}, grain='os_family', merge=salt['pillar.get']('etcd:monitoring')) %}
diff --git a/etcd/meta/grafana.yml b/etcd/meta/grafana.yml
index 9007964..fecdf6d 100644
--- a/etcd/meta/grafana.yml
+++ b/etcd/meta/grafana.yml
@@ -10,6 +10,7 @@
     format: json
     template: etcd/files/grafana_dashboards/etcd_influxdb.json
   main:
+    datasource: influxdb
     row:
       etcd-control-plane:
         title: Etcd Cluster
diff --git a/etcd/meta/prometheus.yml b/etcd/meta/prometheus.yml
index 22b7c97..cdc8de5 100644
--- a/etcd/meta/prometheus.yml
+++ b/etcd/meta/prometheus.yml
@@ -1,4 +1,4 @@
-{%- from "etcd/map.jinja" import server with context %}
+{%- from "etcd/map.jinja" import server, monitoring with context %}
 server:
   target:
     static:
@@ -13,9 +13,10 @@
           {%- endfor %}
   alert:
     EtcdFailedTotalIn5m:
+      {%- set threshold = monitoring.failed_http_requests_percentage / 100.0 %}
       if: >-
         sum by(method) (rate(etcd_http_failed_total{code!~"4[0-9]{2}"}[5m]))
-        / sum by(method) (rate(etcd_http_received_total[5m])) > {{ prometheus_server.get('alert', {}).get('EtcdFailedTotalin5m', {}).get('var', {}).get('threshold', 0.01) }}
+        / sum by(method) (rate(etcd_http_received_total[5m])) > {{ threshold }}
       {% raw %}
       labels:
         severity: warning