Paladox has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/359803 )
Change subject: Update ssh check to not be used when checking websites
......................................................................
Update ssh check to not be used when checking websites
Change-Id: I36acf125ca053d75dd5fa81efc146a14e4fc986a
---
M templates/hosts.conf.erb
M templates/services.conf.erb
2 files changed, 11 insertions(+), 6 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/templates/hosts.conf.erb b/templates/hosts.conf.erb
index 18e720d..dd3197c 100644
--- a/templates/hosts.conf.erb
+++ b/templates/hosts.conf.erb
@@ -26,7 +26,7 @@
vars.host_name = NodeName
/* Set custom attribute `os` for hostgroup assignment in `groups.conf`. */
- vars.os = "Linux"
+ vars.os = "Linux OS"
/* Define disks and attributes for service apply rules in `services.conf`.
*/
vars.disks["disk"] = {
@@ -53,7 +53,7 @@
import "generic-host"
address = "10.68.20.111"
vars.host_name = "phabricator.phabricator.eqiad.wmflabs"
- vars.os = "Linux"
+ vars.os = "Linux OS"
vars.sla = "24x7"
vars.external_host = true
vars.check_user = true
@@ -69,7 +69,7 @@
address = "10.68.18.56"
name = "phab-tin.phabricator.eqiad.wmflabs"
vars.host_name = "phab-tin.phabricator.eqiad.wmflabs"
- vars.os = "Linux"
+ vars.os = "Linux OS"
vars.sla = "24x7"
vars.external_host = true
vars.check_user = true
@@ -90,6 +90,7 @@
vars.load_check = "disable"
vars.website_name = "phab-01.wmflabs.org"
vars.website_url = "/"
+ vars.ssh_check = "disable"
vars.notification["mail"] = {
/* The UserGroup `icingaadmins` is defined in `users.conf`. */
@@ -100,7 +101,7 @@
object Host "gerrit-test.git.eqiad.wmflabs" {
import "generic-host"
address = "10.68.20.204"
- vars.os = "Linux"
+ vars.os = "Linux OS"
vars.sla = "24x7"
name = "gerrit-test.git.eqiad.wmflabs"
vars.host_name = "gerrit-test.git.eqiad.wmflabs"
@@ -116,7 +117,7 @@
object Host "gerrit-test3.git.eqiad.wmflabs" {
import "generic-host"
address = "10.68.18.23"
- vars.os = "Linux"
+ vars.os = "Linux OS"
vars.sla = "24x7"
vars.host_name = "gerrit-test3.git.eqiad.wmflabs"
vars.external_host = true
@@ -138,6 +139,7 @@
vars.load_check = "disable"
vars.website_name = "gerrit.git.wmflabs.org"
vars.website_url = "/r/"
+ vars.ssh_check = "disable"
vars.notification["mail"] = {
/* The UserGroup `icingaadmins` is defined in `users.conf`. */
@@ -155,6 +157,7 @@
vars.load_check = "disable"
vars.website_name = "gerrit-jenkins.wmflabs.org"
vars.website_url = "/"
+ vars.ssh_check = "disable"
vars.notification["mail"] = {
/* The UserGroup `icingaadmins` is defined in `users.conf`. */
@@ -189,6 +192,7 @@
vars.load_check = "disable"
vars.website_name = "wikistats.wmflabs.org"
vars.website_url = "/"
+ vars.ssh_check = "disable"
vars.notification["mail"] = {
/* The UserGroup `icingaadmins` is defined in `users.conf`. */
@@ -295,6 +299,7 @@
vars.website_name = "ores.wmflabs.org"
vars.website_url = "/"
vars.notification.ores = true
+ vars.ssh_check = "disable"
vars.notification["mail"] = {
/* The UserGroup `icingaadmins` is defined in `users.conf`. */
diff --git a/templates/services.conf.erb b/templates/services.conf.erb
index 6782025..b1ab6d4 100644
--- a/templates/services.conf.erb
+++ b/templates/services.conf.erb
@@ -49,7 +49,7 @@
check_command = "ssh"
- assign where (host.address || host.address6) && (host.vars.os == "Linux"
|| host.vars.os == "Linux OS")
+ assign where (host.address || host.address6) && (host.vars.os == "Linux"
|| host.vars.os == "Linux OS") && host.vars.ssh_check != "disable"
}
apply Service for (http_vhost => config in host.vars.http_vhosts) {
--
To view, visit https://gerrit.wikimedia.org/r/359803
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36acf125ca053d75dd5fa81efc146a14e4fc986a
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
