Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/107885
Change subject: Adding class icinga::ganglia::check to install check_ganglia
......................................................................
Adding class icinga::ganglia::check to install check_ganglia
Also including neon in the list of hosts allowed to query gmetad
Change-Id: I61faa3d51708a742a78f0018fb7196306b0803c0
---
M manifests/misc/icinga.pp
M templates/ganglia/gmetad.conf.erb
2 files changed, 26 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/107885/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index e9a5989..93ad0e3 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -40,6 +40,7 @@
icinga::monitor::files::misc,
icinga::monitor::logrotate,
icinga::ganglia::ganglios,
+ icinga::ganglia::check,
facilities::pdu_monitoring,
lvs::monitor,
nagios::gsbmonitoring,
@@ -882,6 +883,30 @@
}
}
+# == Class icinga::ganglia::check
+# Installs check_ganglia package and sets up
+# symlink into /usr/lib/nagios/plugins.
+# check_ganglia allows arbitrary values
+# to be queried from ganglia and checked for
+# nagios/icinga. This is better than ganglios,
+# as it queries gmetad's xml query interfaces
+# directly, rather than downloading and mangling
+# xmlfiles from each aggregator.
+#
+# TODO: will deprectate and remove ganglios soon.
+#
+class icinga::ganglia::check {
+ package { 'check-ganglia':
+ ensure => 'installed',
+ }
+
+ file { '/usr/lib/nagios/plugins/check_ganglia':
+ ensure => 'link',
+ target => '/usr/bin/check_ganglia',
+ require => Package['check-ganglia'],
+ }
+}
+
class icinga::monitor::logrotate {
file { "/etc/logrotate.d/icinga":
source => "puppet:///files/logrotate/icinga",
diff --git a/templates/ganglia/gmetad.conf.erb
b/templates/ganglia/gmetad.conf.erb
index 4e5a13d..142105e 100644
--- a/templates/ganglia/gmetad.conf.erb
+++ b/templates/ganglia/gmetad.conf.erb
@@ -97,7 +97,7 @@
# is always trusted.
# default: There is no default value
# trusted_hosts 127.0.0.1 169.229.50.165 my.gmetad.org
-trusted_hosts 208.80.152.165 208.80.154.149 #bastions
+trusted_hosts 208.80.152.165 208.80.154.149 208.80.154.14 #bastions, neon
#-------------------------------------------------------------------------------
# If you want any host which connects to the gmetad XML to receive
# data, then set this value to "on"
--
To view, visit https://gerrit.wikimedia.org/r/107885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61faa3d51708a742a78f0018fb7196306b0803c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
