Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172420
Change subject: [WIP] shinken: Add basic service checks for all of labs
......................................................................
[WIP] shinken: Add basic service checks for all of labs
Change-Id: I61197ddc264eb4920ef71f41bf2013b9810e77b7
---
M manifests/role/labsshinken.pp
A modules/shinken/files/basic-checks.cfg
M modules/shinken/files/shinken.cfg
M modules/shinken/manifests/server.pp
A modules/shinken/manifests/services.pp
5 files changed, 42 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/172420/1
diff --git a/manifests/role/labsshinken.pp b/manifests/role/labsshinken.pp
index 7f437a7..346e831 100644
--- a/manifests/role/labsshinken.pp
+++ b/manifests/role/labsshinken.pp
@@ -6,5 +6,10 @@
auth_secret => 'This is insecure, should switch to using private repo',
}
+ # Basic labs monitoring
+ shinken::services { 'basic-checks':
+ source => 'file:///modules/shinken/basic-checks.cfg':
+ }
+
include beta::monitoring::shinken
}
diff --git a/modules/shinken/files/basic-checks.cfg
b/modules/shinken/files/basic-checks.cfg
new file mode 100644
index 0000000..ece8e07
--- /dev/null
+++ b/modules/shinken/files/basic-checks.cfg
@@ -0,0 +1,12 @@
+# This file is managed by puppet
+#
+# Basic checks for all labs hosts
+
+# Check that all mounts have at least 10% free space (for warn), 5% (for crit)
+define service {
+ check_command
check_graphite_series_threshold!http://labmon1001.eqiad.wmnet!10!$HOSTNOTES$.$HOSTNAME$.diskspace.*.bytes_percentfree.value!10!5!10min!1!--under
+ contact_groups deployment-prep
+ hostgroup_name labshost
+ service_description Low space - all mounts
+ use generic-service
+}
diff --git a/modules/shinken/files/shinken.cfg
b/modules/shinken/files/shinken.cfg
index 2de1d7e..475e320 100644
--- a/modules/shinken/files/shinken.cfg
+++ b/modules/shinken/files/shinken.cfg
@@ -52,6 +52,7 @@
# Generated config files
cfg_dir=generated/
+cfg_dir=services/
# Now groups
#cfg_file=servicegroups.cfg
diff --git a/modules/shinken/manifests/server.pp
b/modules/shinken/manifests/server.pp
index f45350b..bd466a9 100644
--- a/modules/shinken/manifests/server.pp
+++ b/modules/shinken/manifests/server.pp
@@ -55,6 +55,13 @@
require => Package['shinken'],
}
+ file { '/etc/shinken/services':
+ ensure => directory,
+ owner => 'shinken',
+ group => 'shinken',
+ require => Package['shinken'],
+ }
+
file { '/etc/shinken/contactgroups.cfg':
ensure => present,
source => 'puppet:///modules/shinken/contactgroups.cfg',
diff --git a/modules/shinken/manifests/services.pp
b/modules/shinken/manifests/services.pp
new file mode 100644
index 0000000..1d93907
--- /dev/null
+++ b/modules/shinken/manifests/services.pp
@@ -0,0 +1,17 @@
+# = Define: shinken::services
+# Setup a shinken services definition file
+define shinken::hosts(
+ $ensure = present,
+ $source = undef,
+) {
+ include shinken::server
+
+ file { "/etc/shinken/services/$title.cfg":
+ ensure => $ensure,
+ source => $source,
+ owner => 'shinken',
+ group => 'shinken',
+ notify => Service['shinken'],
+ require => Package['shinken']
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/172420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61197ddc264eb4920ef71f41bf2013b9810e77b7
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
