[MediaWiki-commits] [Gerrit] ores: fix-up monitoring of workers in prod - change (operations/puppet)

2016-06-25 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: ores: fix-up monitoring of workers in prod
..


ores: fix-up monitoring of workers in prod

Change-Id: Iedf3213a93ec59faffb2b040766ba7d9a3173dff
---
M modules/nagios_common/files/check_commands/check_ores_workers
M modules/nagios_common/files/check_commands/check_ores_workers.cfg
2 files changed, 3 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/nagios_common/files/check_commands/check_ores_workers 
b/modules/nagios_common/files/check_commands/check_ores_workers
index 6e75bc9..dcb40a6 100755
--- a/modules/nagios_common/files/check_commands/check_ores_workers
+++ b/modules/nagios_common/files/check_commands/check_ores_workers
@@ -4,6 +4,7 @@
 timestamp=$(/bin/date +%s)
 pluginpath="/usr/lib/nagios/plugins"
 host=$1
+urlhost=$2
 
-$pluginpath/check_http -f follow -H $host -I $host -u 
"http://${ARG1$}/scores/testwiki/reverted/${timestamp}/;
+$pluginpath/check_http -f follow -H $host -I $host -u 
"http://${urlhost}/scores/testwiki/reverted/${timestamp}/;
 
diff --git a/modules/nagios_common/files/check_commands/check_ores_workers.cfg 
b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
index 48b6bef..b7f85cc 100644
--- a/modules/nagios_common/files/check_commands/check_ores_workers.cfg
+++ b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
@@ -1,4 +1,4 @@
 define command {
 command_namecheck_ores_workers
-command_line$USER4$/check_ores_workers $HOSTADDRESS$
+command_line$USER4$/check_ores_workers $HOSTADDRESS$ $ARG1$
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iedf3213a93ec59faffb2b040766ba7d9a3173dff
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ores: fix-up monitoring of workers in prod - change (operations/puppet)

2016-06-25 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/296055

Change subject: ores: fix-up monitoring of workers in prod
..

ores: fix-up monitoring of workers in prod

Change-Id: Iedf3213a93ec59faffb2b040766ba7d9a3173dff
---
M modules/nagios_common/files/check_commands/check_ores_workers
M modules/nagios_common/files/check_commands/check_ores_workers.cfg
2 files changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/55/296055/1

diff --git a/modules/nagios_common/files/check_commands/check_ores_workers 
b/modules/nagios_common/files/check_commands/check_ores_workers
index 6e75bc9..dcb40a6 100755
--- a/modules/nagios_common/files/check_commands/check_ores_workers
+++ b/modules/nagios_common/files/check_commands/check_ores_workers
@@ -4,6 +4,7 @@
 timestamp=$(/bin/date +%s)
 pluginpath="/usr/lib/nagios/plugins"
 host=$1
+urlhost=$2
 
-$pluginpath/check_http -f follow -H $host -I $host -u 
"http://${ARG1$}/scores/testwiki/reverted/${timestamp}/;
+$pluginpath/check_http -f follow -H $host -I $host -u 
"http://${urlhost}/scores/testwiki/reverted/${timestamp}/;
 
diff --git a/modules/nagios_common/files/check_commands/check_ores_workers.cfg 
b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
index 48b6bef..b7f85cc 100644
--- a/modules/nagios_common/files/check_commands/check_ores_workers.cfg
+++ b/modules/nagios_common/files/check_commands/check_ores_workers.cfg
@@ -1,4 +1,4 @@
 define command {
 command_namecheck_ores_workers
-command_line$USER4$/check_ores_workers $HOSTADDRESS$
+command_line$USER4$/check_ores_workers $HOSTADDRESS$ $ARG1$
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedf3213a93ec59faffb2b040766ba7d9a3173dff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

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