Dzahn has uploaded a new change for review.

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

Change subject: ores: enhance ORES monitoring pt.2
......................................................................

ores: enhance ORES monitoring pt.2

After I8e3509d78ea0bd follow-up by adding trailing slash,
so we get a 200 and not a 301 (even though that is also
accepted as OK by default).

Also improve the monitoring of the home page by actually
checking for parts of the "Hi! I'm ORES. :D" string on
http://ores.wmflabs.org/ and not just any 200.

Bug:T121656
Change-Id: If437800800c824724609fde06f1ccce702d61382
---
M modules/icinga/manifests/monitor/ores.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/95/260695/1

diff --git a/modules/icinga/manifests/monitor/ores.pp 
b/modules/icinga/manifests/monitor/ores.pp
index 605a1e6..0fae817 100644
--- a/modules/icinga/manifests/monitor/ores.pp
+++ b/modules/icinga/manifests/monitor/ores.pp
@@ -7,7 +7,7 @@
 
     monitoring::service { 'ores_main_page':
         description    => 'ORES home page',
-        check_command  => 'check_http',
+        check_command  => 
'check_http_url_for_string!ores.wmflabs.org!/!/!\'ORES. :D\'',
         host           => 'ores.wmflabs.org',
         contact_group  => 'team-ores',
     }
@@ -16,7 +16,7 @@
     $timestamp = generate('/bin/date', '+%s')
     monitoring::service { 'ores_worker':
         description    => 'ORES worker',
-        check_command  => 
"check_http_url!ores.wmflabs.org!/scores/testwiki/reverted/${timestamp}",
+        check_command  => 
"check_http_url!ores.wmflabs.org!/scores/testwiki/reverted/${timestamp}/",
         host           => 'ores.wmflabs.org',
         contact_group  => 'team-ores',
     }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If437800800c824724609fde06f1ccce702d61382
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to