Merge pull request #671 from alphagov/sensu-upgrade

Upgrade sensu

Puppetfile

@@ -17,8 +17,9 @@ 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 'yelp/uchiwa',                '0.2.7'
 mod 'alphagov/account',             :git => 'https://github.com/alphagov/puppet-account.git',
                                     :ref => 'feature/multiple-ssh-keys'
 mod 'gini/archive',                 :git => 'https://github.com/gini/puppet-archive.git',

Puppetfile.lock

@@ -47,12 +47,18 @@ FORGE
       puppetlabs-stdlib (< 5.0.0, >= 3.2.0)
     puppetlabs-stdlib (4.1.0)
     puppetlabs-vcsrepo (0.1.2)
+    richardc-datacat (0.6.1)
     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)
+    yelp-uchiwa (0.2.7)
+      puppetlabs-apt (>= 0)
+      puppetlabs-stdlib (>= 0)
+      richardc-datacat (>= 0)
 
 GIT
   remote: https://github.com/alphagov/puppet-account.git
@@ -239,6 +245,7 @@ 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)
+  yelp-uchiwa (= 0.2.7)
 

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

@@ -14,6 +14,7 @@ classes:
   - 'performanceplatform::checks::smokey_tests'
   - 'performanceplatform::checks::ssl'
   - 'performanceplatform::checks::elasticsearch_log_errors'
+  - 'uchiwa'
 
 nginx::confd_purge: true
 nginx::vhost_purge: true
@@ -72,6 +73,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:
@@ -117,7 +120,7 @@ vhost_proxies:
     servername:      "%{::alerts_vhost}"
     ssl:             false
     upstream_server: 'localhost'
-    upstream_port:   8090
+    upstream_port:   3000
     sensu_check:     false
 
 lumberjack_instances:
@@ -127,3 +130,5 @@ lumberjack_instances:
 ruby_packages:
   - redphone
   - redis
+
+uchiwa::install_repo: false

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,

modules/performanceplatform/manifests/monitoring/sensu.pp

@@ -74,4 +74,7 @@
     },
     require => File[$handler_file]
   }
+  uchiwa::api { 'sensu':
+    host    => 'localhost',
+  }
 }