Ema has submitted this change and it was merged.

Change subject: Add icinga monitoring for varnish statistics daemons
......................................................................


Add icinga monitoring for varnish statistics daemons

This patch doesn't register a check for the "varnish" process
itself as it there are already HTTP probes defined.

Bug: T131760
Change-Id: I3e97dee81ef304578e1abfec5180bfa1f64a70fd
---
M modules/varnish/manifests/logging/media.pp
M modules/varnish/manifests/logging/reqstats.pp
M modules/varnish/manifests/logging/rls.pp
M modules/varnish/manifests/logging/statsd.pp
M modules/varnish/manifests/logging/xcps.pp
5 files changed, 30 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/modules/varnish/manifests/logging/media.pp 
b/modules/varnish/manifests/logging/media.pp
index d6c8f33..6f3376e 100644
--- a/modules/varnish/manifests/logging/media.pp
+++ b/modules/varnish/manifests/logging/media.pp
@@ -37,4 +37,10 @@
             enable => true,
         },
     }
+
+    nrpe::monitor_service { 'varnishmedia':
+        ensure       => present,
+        description  => 'Varnish traffic logger - varnishmedia',
+        nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:1 -a 
"/usr/local/bin/varnishmedia" -u root',
+    }
 }
diff --git a/modules/varnish/manifests/logging/reqstats.pp 
b/modules/varnish/manifests/logging/reqstats.pp
index 0f3a882..d22dc6a 100644
--- a/modules/varnish/manifests/logging/reqstats.pp
+++ b/modules/varnish/manifests/logging/reqstats.pp
@@ -63,4 +63,10 @@
             enable  => true,
         },
     }
+
+    nrpe::monitor_service { 'varnishreqstats':
+        ensure       => present,
+        description  => 'Varnish traffic logger - varnishreqstats',
+        nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:1 -a 
"/usr/local/bin/varnishreqstats" -u root',
+    }
 }
diff --git a/modules/varnish/manifests/logging/rls.pp 
b/modules/varnish/manifests/logging/rls.pp
index c416f9b..5c12286 100644
--- a/modules/varnish/manifests/logging/rls.pp
+++ b/modules/varnish/manifests/logging/rls.pp
@@ -37,4 +37,10 @@
             enable => true,
         },
     }
+
+    nrpe::monitor_service { 'varnishrls':
+        ensure       => present,
+        description  => 'Varnish traffic logger - varnishrls',
+        nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:1 -a 
"/usr/local/bin/varnishrls" -u root',
+    }
 }
diff --git a/modules/varnish/manifests/logging/statsd.pp 
b/modules/varnish/manifests/logging/statsd.pp
index 46d5ec9..982ea38 100644
--- a/modules/varnish/manifests/logging/statsd.pp
+++ b/modules/varnish/manifests/logging/statsd.pp
@@ -64,4 +64,10 @@
             enable => true,
         },
     }
+
+    nrpe::monitor_service { 'varnishstatsd':
+        ensure       => present,
+        description  => 'Varnish traffic logger - varnishstatsd',
+        nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:1 -a 
"/usr/local/bin/varnishstatsd" -u root',
+    }
 }
diff --git a/modules/varnish/manifests/logging/xcps.pp 
b/modules/varnish/manifests/logging/xcps.pp
index 92a9c6c..f77eeb1 100644
--- a/modules/varnish/manifests/logging/xcps.pp
+++ b/modules/varnish/manifests/logging/xcps.pp
@@ -37,4 +37,10 @@
             enable => true,
         },
     }
+
+    nrpe::monitor_service { 'varnishxcps':
+        ensure       => present,
+        description  => 'Varnish traffic logger - varnishxcps',
+        nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:1 -a 
"/usr/local/bin/varnishxcps" -u root',
+    }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/282488
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3e97dee81ef304578e1abfec5180bfa1f64a70fd
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Adedommelin <adedomme...@tuxz.net>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to