Add option to parametrize warn/crit for /var/lib/nova/instances for sensu
diff --git a/nova/map.jinja b/nova/map.jinja
index 4d56253..8e19b15 100644
--- a/nova/map.jinja
+++ b/nova/map.jinja
@@ -79,3 +79,14 @@
'heal_instance_info_cache_interval': '60',
},
}, merge=pillar.nova.get('compute', {})) %}
+
+
+
+{% set monitoring = salt['grains.filter_by']({
+ 'default': {
+ 'disk': {
+ 'warn': '15%',
+ 'crit': '5%',
+ },
+ },
+}, grain='os_family', merge=salt['pillar.get']('nova:monitoring')) %}
diff --git a/nova/meta/sensu.yml b/nova/meta/sensu.yml
index a92865e..5497b20 100644
--- a/nova/meta/sensu.yml
+++ b/nova/meta/sensu.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 %}
{%- if pillar.nova.controller is defined %}
{%- set region = controller.identity.region %}
{%- endif %}
@@ -51,7 +50,7 @@
subscribers:
- local-nova-compute
local_linux_storage_nova_instances_usage:
- command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_disk -w 15% -c 5% -p /var/lib/nova/instances"
+ command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_disk -w {{ monitoring.disk.warn }} -c {{ monitoring.disk.crit }} -p /var/lib/nova/instances"
interval: 60
occurrences: 1
subscribers: