Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161289
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
3 files changed, 24 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/161289/1
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..1128177 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::host { 'betacluster-hosts':
+ source => 'puppet:///modules/beta/shinken/hosts.cfg',
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/161289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f9b91d3a90cdf49350dd58bef2a2c7f668ecc47
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits