Andrew Bogott has submitted this change and it was merged.
Change subject: shinken: Experimental monitoring for betacluster
......................................................................
shinken: Experimental monitoring for betacluster
Change-Id: I6f9b91d3a90cdf49350dd58bef2a2c7f668ecc47
---
M manifests/role/labsshinken.pp
A modules/beta/files/shinken/hosts.cfg
M modules/beta/manifests/monitoring.pp
M modules/shinken/manifests/server.pp
4 files changed, 29 insertions(+), 8 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/labsshinken.pp b/manifests/role/labsshinken.pp
index 250d41a..7f437a7 100644
--- a/manifests/role/labsshinken.pp
+++ b/manifests/role/labsshinken.pp
@@ -5,4 +5,6 @@
class { 'shinken::server':
auth_secret => 'This is insecure, should switch to using private repo',
}
+
+ include beta::monitoring::shinken
}
diff --git a/modules/beta/files/shinken/hosts.cfg
b/modules/beta/files/shinken/hosts.cfg
new file mode 100644
index 0000000..34d60f5
--- /dev/null
+++ b/modules/beta/files/shinken/hosts.cfg
@@ -0,0 +1,15 @@
+# Virtual 'host' that refers to the entire beta cluster being up or down
+# UP/DOWN status defined as http availability of english betawiki main page
+define host{
+ host_name beta-cluster
+ alias Generic Beta Cluster
+ address en.wikipedia.beta.wmflabs.org
+ check_command check_http!-h
en.wikipedia.beta.wmflabs.org -u / -t 10 -s 'Wikipedia'
+ max_check_attempts 3
+ check_period 24x7
+ notification_interval 0
+ notification_period 24x7
+ retry_interval 1
+ check_interval 5
+ contact_groups betacluster
+}
diff --git a/modules/beta/manifests/monitoring.pp
b/modules/beta/manifests/monitoring.pp
index 54005ef..734f40e 100644
--- a/modules/beta/manifests/monitoring.pp
+++ b/modules/beta/manifests/monitoring.pp
@@ -45,3 +45,10 @@
}
}
+# = Class: beta::monitoring::shinken
+# Sets up shinken monitoring for betacluster
+class beta::monitoring::shinken {
+ shinken::hosts { 'betacluster-hosts':
+ source => 'puppet:///modules/beta/shinken/hosts.cfg',
+ }
+}
diff --git a/modules/shinken/manifests/server.pp
b/modules/shinken/manifests/server.pp
index 39d25df..1695743 100644
--- a/modules/shinken/manifests/server.pp
+++ b/modules/shinken/manifests/server.pp
@@ -63,19 +63,16 @@
}
}
-# = Class: shinken::hosts
+# = Define: shinken::hosts
# Setup a shinken hosts definition file
# FIXME: Autogenerate hosts definitions later on
-class shinken::hosts(
- $name,
+define shinken::hosts(
$ensure = present,
$source = undef,
- $content = undef
) {
- file { "/etc/shinken/hosts/$name.cfg":
- ensure => ensure,
- source => source,
- content => content,
+ file { "/etc/shinken/hosts/$title.cfg":
+ ensure => $ensure,
+ source => $source,
owner => 'shinken',
group => 'shinken',
notify => Service['shinken'],
--
To view, visit https://gerrit.wikimedia.org/r/161289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f9b91d3a90cdf49350dd58bef2a2c7f668ecc47
Gerrit-PatchSet: 10
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
