Merge branch 'feature/monitoring' into 'master'
replace gems to pkgs
See merge request !6
diff --git a/sensu/client.sls b/sensu/client.sls
index 8c48480..47cecfe 100644
--- a/sensu/client.sls
+++ b/sensu/client.sls
@@ -27,34 +27,17 @@
{%- if plugin_name == 'sensu_community_plugins' %}
-sensu_client_community_plugins
- gem.installed:
- - names:
- - sensu-plugin
+sensu_client_community_plugins:
+ pkg.installed:
+ - names: ruby-sensu-plugin
{%- endif %}
{%- if plugin_name == 'monitoring_for_openstack' %}
-sensu_monitor_openstack_six:
- pip.installed:
- - name: six>=1.9.0
-
-sensu_monitor_openstack_source:
- git.latest:
- - name: https://github.com/stackforge/monitoring-for-openstack.git
- - target: /root/monitoring-for-openstack
- - rev: master
- - require:
- - pip: sensu_monitor_openstack_six
-
-sensu_monitor_openstack_install:
- cmd.run:
- - name: python setup.py install
- - cwd: /root/monitoring-for-openstack
- - unless: pip freeze | grep monitoring-for-openstack
- - require:
- - git: sensu_monitor_openstack_source
+sensu_monitoring_os_packages:
+ pkg.installed:
+ - names: monitoring-for-openstack
{%- endif %}
diff --git a/sensu/server.sls b/sensu/server.sls
index e2e3f19..9721d21 100644
--- a/sensu/server.sls
+++ b/sensu/server.sls
@@ -12,13 +12,13 @@
sensu_server_pip:
pip.installed:
- - name: sensu
+ - names: sensu
- require:
- pkg: sensu_server_packages
purge_sensu_conf_dir:
file.directory:
- - name: /etc/sensu/conf.d/
+ - names: /etc/sensu/conf.d/
- clean: True
{%- if server.mine_checks %}