Upgrade sensu and module

Successfully provisioned a monitoring-1 and backup-box-1 with this,
after provisioning with master

Settings required for latest puppet module

 - Be explicit about the api
 - Need to specify a version of the sensu plugin gem
 - The puppet module changed the default vhost to not include a slash -
   sensu/sensu-puppet#184

This unfortunately broke our setup, which expected a slash in the vhost.

Puppetfile

@@ -17,7 +17,7 @@ mod 'puppetlabs/vcsrepo',         '0.1.2'
 mod 'rodjek/logrotate',           '1.1.1'
 mod 'saz/dnsmasq',                '1.0.1'
 mod 'saz/rsyslog',                '2.0.0'
-mod 'sensu/sensu',                '0.7.7'
+mod 'sensu/sensu',                '1.3.0'
 mod 'netmanagers/fail2ban',       '1.4.0'
 mod 'alphagov/account',             :git => 'https://github.com/alphagov/puppet-account.git',
                                     :ref => 'feature/multiple-ssh-keys'

Puppetfile.lock

@@ -50,7 +50,8 @@ FORGE
     rodjek-logrotate (1.1.1)
     saz-dnsmasq (1.0.1)
     saz-rsyslog (2.0.0)
-    sensu-sensu (0.7.7)
+    sensu-sensu (1.3.0)
+      maestrodev-wget (>= 1.4.5)
       puppetlabs-apt (>= 0.0.1)
       puppetlabs-stdlib (>= 0.0.1)
 
@@ -239,6 +240,6 @@ DEPENDENCIES
   rodjek-logrotate (= 1.1.1)
   saz-dnsmasq (= 1.0.1)
   saz-rsyslog (= 2.0.0)
-  sensu-sensu (= 0.7.7)
+  sensu-sensu (= 1.3.0)
   stankevich-python (>= 0)
 

hieradata/common.yaml

@@ -147,8 +147,10 @@ rsyslog::client::server: "logging"
 sensu::rabbitmq_host: 'rabbitmq'
 sensu::rabbitmq_password: "%{::rabbitmq_sensu_password}"
 sensu::rabbitmq_port: 5672
+sensu::rabbitmq_vhost: '/sensu'
 sensu::safe_mode: true
-sensu::version: '0.12.1-1'
+sensu::version: '0.16.0-1'
+sensu::sensu_plugin_version: 'installed'
 
 ssh::server::banner: false
 ssh::server::ciphers:
@@ -268,9 +270,6 @@ system_packages:
   - update-notifier
   - vim
 
-ruby_packages:
-  - sensu-plugin
-
 python_packages:
   - gds-nagios-plugins
 

hieradata/role-monitoring.yaml

@@ -72,6 +72,8 @@ sensu::dashboard_user:     "%{::basic_auth_username}"
 sensu::dashboard_password: "%{::basic_auth_password}"
 sensu::dashboard_port: 8090
 sensu::server: true
+sensu::api: true
+sensu::sensu_plugin_version: 'installed'
 
 ufw_rules:
   allowcarbonfromanywhere:

modules/performanceplatform/manifests/base.pp

@@ -68,8 +68,6 @@
         group  => 'gds',
     }
 
-    Package['sensu-plugin'] -> Class['sensu']
-
     vcsrepo { '/etc/sensu/community-plugins':
         ensure   => present,
         provider => git,