Alexandros Kosiaris has submitted this change and it was merged.
Change subject: gsb: Amend check command
......................................................................
gsb: Amend check command
Seems like safe browsing's "API" now uses JSONP, otherwise it redirects to
the actual site. pass output=jsonp and and look for "type": 4 which
seems to be the "Not dangerous" designation.
Change-Id: I143129804192bfbe706940fe2696861673b5ff81
---
M modules/icinga/manifests/gsbmonitoring.pp
1 file changed, 9 insertions(+), 9 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/icinga/manifests/gsbmonitoring.pp
b/modules/icinga/manifests/gsbmonitoring.pp
index 510d42f..5ee0897 100644
--- a/modules/icinga/manifests/gsbmonitoring.pp
+++ b/modules/icinga/manifests/gsbmonitoring.pp
@@ -5,47 +5,47 @@
@monitoring::service { 'GSB_mediawiki':
description => 'check google safe browsing for mediawiki.org',
- check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?site=mediawiki.org/!\'Safe
Browsing has not recently seen malicious content\'',
+ check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?output=jsonp&site=mediawiki.org/!\'"type":
4\'',
host => 'google',
}
@monitoring::service { 'GSB_wikibooks':
description => 'check google safe browsing for wikibooks.org',
- check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?site=wikibooks.org/!\'Safe
Browsing has not recently seen malicious content\'',
+ check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?output=jsonp&site=wikibooks.org/!\'"type":
4\'',
host => 'google',
}
@monitoring::service { 'GSB_wikimedia':
description => 'check google safe browsing for wikimedia.org',
- check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?site=wikimedia.org/!\'Safe
Browsing has not recently seen malicious content\'',
+ check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?output=jsonp&site=wikimedia.org/!\'"type":
4\'',
host => 'google',
}
@monitoring::service { 'GSB_wikinews':
description => 'check google safe browsing for wikinews.org',
- check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?site=wikinews.org/!\'Safe
Browsing has not recently seen malicious content\'',
+ check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?output=jsonp&site=wikinews.org/!\'"type":
4\'',
host => 'google',
}
@monitoring::service { 'GSB_wikipedia':
description => 'check google safe browsing for wikipedia.org',
- check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?site=wikipedia.org/!\'Safe
Browsing has not recently seen malicious content\'',
+ check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?output=jsonp&site=wikipedia.org/!\'"type":
4\'',
host => 'google',
}
@monitoring::service { 'GSB_wikiquote':
description => 'check google safe browsing for wikiquote.org',
- check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?site=wikiquote.org/!\'Safe
Browsing has not recently seen malicious content\'',
+ check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?output=jsonp&site=wikiquote.org/!\'"type":
4\'',
host => 'google',
}
@monitoring::service { 'GSB_wikisource':
description => 'check google safe browsing for wikisource.org',
- check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?site=wikisource.org/!\'Safe
Browsing has not recently seen malicious content\'',
+ check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?output=jsonp&site=wikisource.org/!\'"type":
4\'',
host => 'google',
}
@monitoring::service { 'GSB_wikiversity':
description => 'check google safe browsing for wikiversity.org',
- check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?site=wikiversity.org/!\'Safe
Browsing has not recently seen malicious content\'',
+ check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?output=jsonp&site=wikiversity.org/!\'"type":
4\'',
host => 'google',
}
@monitoring::service { 'GSB_wiktionary':
description => 'check google safe browsing for wiktionary.org',
- check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?site=wiktionary.org/!\'Safe
Browsing has not recently seen malicious content\'',
+ check_command =>
'check_https_url_for_string!www.google.com!/safebrowsing/diagnostic?output=jsonp&site=wiktionary.org/!\'"type":
4\'',
host => 'google',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/247856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I143129804192bfbe706940fe2696861673b5ff81
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
