Dzahn has submitted this change and it was merged.
Change subject: remove old erzurumi ActiveMQ monitoring
......................................................................
remove old erzurumi ActiveMQ monitoring
check_stomp.pl etc, ancient monitoring for
ActiveMQ on erzurumi, back in RT #703 it
already got fixed, so existed before that
erzurumi is decom'ed, get rid of all the
remnants, remove the monitoring script
and the package for it as well as the check
command
completes "decom erzurumi" and removes
unneeded stuff from monitoring host
per JeffG. this is now monitored via NSCA
from inside frack..
Change-Id: Iecb0c6e3918b804d492813f3086d03194db79666
---
D files/icinga/check_stomp.pl
M manifests/misc/icinga.pp
M templates/icinga/checkcommands.cfg.erb
3 files changed, 0 insertions(+), 76 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/files/icinga/check_stomp.pl b/files/icinga/check_stomp.pl
deleted file mode 100755
index 4ad7158..0000000
--- a/files/icinga/check_stomp.pl
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/perl -w
-
-# Simple check to see if we can write and then read back from an ActiveMQ
server
-#
-# ex. check_stomp.pl erzurumi.pmtpa.wmnet 3 monitoring
-# FIXME - replace erzurumi reference with new server
-
-use strict;
-use Net::Stomp;
-
-my $host = $ARGV[0];
-my $nummsgs = $ARGV[1];
-my $queue = $ARGV[2];
-
-my $stomp = Net::Stomp->new( { hostname => $host, port => '61613' } );
-
-$stomp->connect();
-
-for ( my $i = 0 ; $i < $nummsgs ; $i++ ) {
- $stomp->send(
- {
- destination => "/queue/$queue",
- body => "$queue$i",
- persistent => 'true'
- }
- );
-}
-
-$stomp->subscribe(
- {
- destination => "/queue/$queue",
- 'ack' => 'client',
- 'activemq.prefetchSize' => 1
- }
-);
-
-my $count = 0;
-for ( my $i = 0 ; $i < $nummsgs ; $i++ ) {
- my $frame = $stomp->receive_frame;
- my $body = $frame->body;
- if ( $body eq "$queue$i" ) {
- $count++;
- }
- $stomp->ack( { frame => $frame } );
-}
-
-$stomp->disconnect();
-
-print "Produced: $nummsgs Consumed $count\n";
-
-if ( $count == $nummsgs ) {
- exit(0);
-}
-elsif ( ( $count != $nummsgs ) && ( $count != 0 ) ) {
- exit(1);
-}
-elsif ( $count == 0 ) {
- exit(2);
-}
-
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 3303855..e73b81b 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -577,11 +577,6 @@
owner => 'root',
group => 'root',
mode => '0755';
- '/usr/lib/nagios/plugins/check_stomp.pl':
- source => 'puppet:///files/icinga/check_stomp.pl',
- owner => 'root',
- group => 'root',
- mode => '0755';
'/usr/lib/nagios/plugins/check_nrpe':
source => 'puppet:///files/icinga/check_nrpe',
owner => 'root',
@@ -765,11 +760,6 @@
ensure => latest;
}
- # Stomp Perl module to monitor erzurumi (RT #703)
- # FIXME: remove erzurumi reference?
- package { 'libnet-stomp-perl':
- ensure => latest;
- }
}
class icinga::monitor::service {
diff --git a/templates/icinga/checkcommands.cfg.erb
b/templates/icinga/checkcommands.cfg.erb
index 5351a60..1f91f21 100644
--- a/templates/icinga/checkcommands.cfg.erb
+++ b/templates/icinga/checkcommands.cfg.erb
@@ -394,12 +394,6 @@
command_line $USER1$/check_nrpe -H $HOSTADDRESS$ -c $ARG1$ -t $ARG2$
}
-# FIXME: replace erzurumi reference with new server
-define command{
- command_name check_stomp
- command_line /usr/lib/nagios/plugins/check_stomp.pl
erzurumi.pmtpa.wmnet 3 monitoring
-}
-
define command{
command_name check_longqueries
command_line /usr/lib/nagios/plugins/check_longqueries -H
$HOSTADDRESS$ -u nagios -p <%= nagios_mysql_check_pass %> -w 30 -c 66
--
To view, visit https://gerrit.wikimedia.org/r/111677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iecb0c6e3918b804d492813f3086d03194db79666
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Cmjohnson <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Jgreen <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
