Skip to content
This repository has been archived by the owner on Apr 4, 2018. It is now read-only.

Commit

Permalink
Add uchiwa puppet module and config
Browse files Browse the repository at this point in the history
Uchiwa replaces the sensu dashboard

Uchiwa defaults to using port 3000, so set the nginx alerts upstream to use that
  • Loading branch information
timmow committed Dec 2, 2014
1 parent 3676220 commit 6e16b96
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 1 deletion.
1 change: 1 addition & 0 deletions Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ mod 'saz/dnsmasq', '1.0.1'
mod 'saz/rsyslog', '2.0.0'
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',
Expand Down
6 changes: 6 additions & 0 deletions Puppetfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +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 (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
Expand Down Expand Up @@ -242,4 +247,5 @@ DEPENDENCIES
saz-rsyslog (= 2.0.0)
sensu-sensu (= 1.3.0)
stankevich-python (>= 0)
yelp-uchiwa (= 0.2.7)

5 changes: 4 additions & 1 deletion hieradata/role-monitoring.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -119,7 +120,7 @@ vhost_proxies:
servername: "%{::alerts_vhost}"
ssl: false
upstream_server: 'localhost'
upstream_port: 8090
upstream_port: 3000
sensu_check: false

lumberjack_instances:
Expand All @@ -129,3 +130,5 @@ lumberjack_instances:
ruby_packages:
- redphone
- redis

uchiwa::install_repo: false
3 changes: 3 additions & 0 deletions modules/performanceplatform/manifests/monitoring/sensu.pp
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,7 @@
},
require => File[$handler_file]
}
uchiwa::api { 'sensu':
host => 'localhost',
}
}

0 comments on commit 6e16b96

Please sign in to comment.