Fix new model mine generation of checks
diff --git a/sensu/map.jinja b/sensu/map.jinja
index 4f3a550..e678f81 100644
--- a/sensu/map.jinja
+++ b/sensu/map.jinja
@@ -1,38 +1,10 @@
-{% set services = [
- 'billometer',
- 'cinder',
- 'ceilometer',
- 'gitlab',
- 'glance',
- 'haproxy',
- 'heat',
- 'horizon',
- 'kedb',
- 'keystone',
- 'linux',
- 'memcached',
- 'mysql',
- 'nginx',
- 'nova',
- 'ntp',
- 'opencontrail',
- 'openssh',
- 'postgresql',
- 'rabbitmq',
- 'salt',
- 'sensu',
- 'supervisor',
-] %}
-
{% set server = salt['grains.filter_by']({
'Debian': {
'pkgs': ['sensu', 'python-pip'],
- 'supported_services': services,
'mine_checks': True,
},
'RedHat': {
'pkgs': ['sensu'],
- 'supported_services': services,
'mine_checks': True,
},
}, merge=salt['pillar.get']('sensu:server')) %}
@@ -40,12 +12,10 @@
{% set client = salt['grains.filter_by']({
'Debian': {
'pkgs': ['sensu', 'nagios-plugins-basic', 'curl'],
- 'supported_services': services,
'plugin': {}
},
'RedHat': {
'pkgs': ['sensu', 'nagios-plugins-ping', 'nagios-plugins-procs', 'nagios-plugins-load', 'nagios-plugins-swap', 'nagios-plugins-ntp', 'nagios-plugins-http', 'nagios-plugins-disk', 'net-snmp-utils', 'pynag'],
- 'supported_services': services,
'plugin': {}
},
}, merge=salt['pillar.get']('sensu:client')) %}
diff --git a/sensu/server.sls b/sensu/server.sls
index 764e76a..1dc8d19 100644
--- a/sensu/server.sls
+++ b/sensu/server.sls
@@ -23,15 +23,11 @@
{%- if server.mine_checks %}
-{%- set client_checks = {} %}
-
{%- for node_name, node_grains in salt['mine.get']('*', 'grains.items').iteritems() %}
{%- set rowloop = loop %}
-{%- if node_grains.get('sensu', {}) is not none %}
-
-{%- for check_name, check in node_grains.get('sensu', {}).get('checks', {}).iteritems() %}
+{%- for check_name, check in node_grains.get('sensu', {}).get('check', {}).iteritems() %}
/etc/sensu/conf.d/check_{{ check_name }}.json_{{ rowloop.index }}-{{ loop.index }}:
file.managed:
@@ -49,8 +45,6 @@
{%- endfor %}
-{%- endif %}
-
{%- endfor %}
{%- endif %}