Dzahn has submitted this change and it was merged.
Change subject: ores: add monitoring for production workers
......................................................................
ores: add monitoring for production workers
Change-Id: Ia593c74304fb299e2d113cd9f358e2d0c9da9173
---
M modules/icinga/manifests/monitor/ores.pp
M modules/nagios_common/files/check_commands/check_ores_workers
2 files changed, 15 insertions(+), 4 deletions(-)
Approvals:
Ladsgroup: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/icinga/manifests/monitor/ores.pp
b/modules/icinga/manifests/monitor/ores.pp
index 1371319..4ff627d 100644
--- a/modules/icinga/manifests/monitor/ores.pp
+++ b/modules/icinga/manifests/monitor/ores.pp
@@ -5,6 +5,10 @@
host_fqdn => 'ores.wmflabs.org',
}
+ @monitoring::host { 'ores.wikimedia.org':
+ host_fqdn => 'ores.wikimedia.org',
+ }
+
monitoring::service { 'ores_main_page':
description => 'ORES home page',
check_command => 'check_http',
@@ -13,13 +17,20 @@
}
# T121656
- monitoring::service { 'ores_worker':
- description => 'ORES worker',
- check_command => 'check_ores_workers',
+ monitoring::service { 'ores_worker_labs':
+ description => 'ORES worker labs',
+ check_command => 'check_ores_workers!oresweb',
host => 'ores.wmflabs.org',
contact_group => 'team-ores',
}
+ monitoring::service { 'ores_worker_production':
+ description => 'ORES worker production',
+ check_command => 'check_ores_workers!ores.wikimedia.org',
+ host => 'ores.wikimedia.org',
+ contact_group => 'team-ores',
+ }
+
# T122830
file { '/usr/local/lib/nagios/plugins/check_ores_workers':
source =>
'puppet:///modules/nagios_common/check_commands/check_ores_workers',
diff --git a/modules/nagios_common/files/check_commands/check_ores_workers
b/modules/nagios_common/files/check_commands/check_ores_workers
index 32be9d5..6e75bc9 100755
--- a/modules/nagios_common/files/check_commands/check_ores_workers
+++ b/modules/nagios_common/files/check_commands/check_ores_workers
@@ -5,5 +5,5 @@
pluginpath="/usr/lib/nagios/plugins"
host=$1
-$pluginpath/check_http -f follow -H $host -I $host -u
"http://oresweb/scores/testwiki/reverted/${timestamp}/";
+$pluginpath/check_http -f follow -H $host -I $host -u
"http://${ARG1$}/scores/testwiki/reverted/${timestamp}/";
--
To view, visit https://gerrit.wikimedia.org/r/296054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia593c74304fb299e2d113cd9f358e2d0c9da9173
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
