Paladox has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/359795 )
Change subject: Only run apt once not run it twice
......................................................................
Only run apt once not run it twice
Change-Id: Ib87b5f38206e698642e7df1a4cb04977eb258529
---
M templates/services.conf.erb
1 file changed, 100 insertions(+), 111 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/templates/services.conf.erb b/templates/services.conf.erb
index c61cf86..35c54b0 100644
--- a/templates/services.conf.erb
+++ b/templates/services.conf.erb
@@ -24,19 +24,19 @@
* defined.
*/
apply Service "ping4" {
- import "generic-service"
+ import "generic-service"
- check_command = "ping4"
+ check_command = "ping4"
- assign where host.address
+ assign where host.address
}
apply Service "ping6" {
- import "generic-service"
+ import "generic-service"
- check_command = "ping6"
+ check_command = "ping6"
- assign where host.address6
+ assign where host.address6
}
/*
@@ -45,169 +45,158 @@
* the custom attribute `os` set to `Linux`.
*/
apply Service "ssh" {
- import "generic-service"
+ import "generic-service"
- check_command = "ssh"
+ check_command = "ssh"
- assign where (host.address || host.address6) && host.vars.os == "Linux"
+ assign where (host.address || host.address6) && host.vars.os == "Linux"
}
apply Service for (http_vhost => config in host.vars.http_vhosts) {
- import "generic-service"
+ import "generic-service"
- check_command = "http"
+ check_command = "http"
- command_endpoint = host.vars.remote_client
+ command_endpoint = host.vars.remote_client
- vars += config
+ vars += config
}
/*apply Service for (disk => config in host.vars.disks) {
- import "generic-service"
+ import "generic-service"
- check_command = "disk"
- command_endpoint = host.vars.remote_client
+ check_command = "disk"
+ command_endpoint = host.vars.remote_client
- vars += config
+ vars += config
}*/
apply Service "check disk" {
- import "generic-service"
- check_command = "nrpe-check-1arg"
- vars.host = host.address
- vars.check = "check_disk"
- vars.disk_check = "enabled"
- assign where host.address != "ores-redis-01.ores.eqiad.wmflabs" &&
host.address != "ores-web-05.ores.eqiad.wmflabs" && host.address !=
"ores-compute-01.ores.eqiad.wmflabs" && host.address !=
"ores-worker-05.ores.eqiad.wmflabs" && host.address !=
"ores-lb-02.ores.eqiad.wmflabs" && host.vars.disk_check != "disable"
+ import "generic-service"
+ check_command = "nrpe-check-1arg"
+ vars.host = host.address
+ vars.check = "check_disk"
+ vars.disk_check = "enabled"
+ assign where host.address != "ores-redis-01.ores.eqiad.wmflabs" &&
host.address != "ores-web-05.ores.eqiad.wmflabs" && host.address !=
"ores-compute-01.ores.eqiad.wmflabs" && host.address !=
"ores-worker-05.ores.eqiad.wmflabs" && host.address !=
"ores-lb-02.ores.eqiad.wmflabs" && host.vars.disk_check != "disable"
}
- apply Service "check disk_space" {
- import "generic-service"
- check_command = "nrpe-check-1arg"
- vars.host = host.address
- vars.check = "check_disk_space"
- vars.disk_check_ores = "enabled"
- assign where host.address == "ores-web-05.ores.eqiad.wmflabs" &&
host.vars.disk_check_ores != "disable"
- assign where host.address == "ores-compute-01.ores.eqiad.wmflabs" &&
host.vars.disk_check_ores != "disable"
- assign where host.address == "ores-worker-05.ores.eqiad.wmflabs" &&
host.vars.disk_check_ores != "disable"
- assign where host.address == "ores-lb-02.ores.eqiad.wmflabs" &&
host.vars.disk_check_ores != "disable"
- assign where host.address == "ores-redis-01.ores.eqiad.wmflabs" &&
host.vars.disk_check_ores != "disable"
- }
+apply Service "check disk_space" {
+ import "generic-service"
+ check_command = "nrpe-check-1arg"
+ vars.host = host.address
+ vars.check = "check_disk_space"
+ vars.disk_check_ores = "enabled"
+ assign where host.address == "ores-web-05.ores.eqiad.wmflabs" &&
host.vars.disk_check_ores != "disable"
+ assign where host.address == "ores-compute-01.ores.eqiad.wmflabs" &&
host.vars.disk_check_ores != "disable"
+ assign where host.address == "ores-worker-05.ores.eqiad.wmflabs" &&
host.vars.disk_check_ores != "disable"
+ assign where host.address == "ores-lb-02.ores.eqiad.wmflabs" &&
host.vars.disk_check_ores != "disable"
+ assign where host.address == "ores-redis-01.ores.eqiad.wmflabs" &&
host.vars.disk_check_ores != "disable"
+}
apply Service "check http" {
- import "generic-service"
- check_command = "check_http_2"
- vars.http_vhost = host.vars.website_name
- vars.http_ssl = true
- vars.http_certificate = 10
- vars.http_uri = host.vars.website_url
- // vars.check = "check_http"
- assign where host.vars.website_name
+ import "generic-service"
+ check_command = "check_http_2"
+ vars.http_vhost = host.vars.website_name
+ vars.http_ssl = true
+ vars.http_certificate = 10
+ vars.http_uri = host.vars.website_url
+ // vars.check = "check_http"
+ assign where host.vars.website_name
}
apply Service "icinga" {
- import "generic-service"
+ import "generic-service"
- check_command = "icinga"
+ check_command = "icinga"
- assign where host.name == NodeName
+ assign where host.name == NodeName
}
apply Service "check load" {
- import "generic-service"
+ import "generic-service"
- /* Used by the ScheduledDowntime apply rule in `downtimes.conf`. */
- /* vars.backup_downtime = "02:00-03:00" */
+ /* Used by the ScheduledDowntime apply rule in `downtimes.conf`. */
+ /* vars.backup_downtime = "02:00-03:00" */
- check_command = "nrpe-check-1arg"
- vars.host = host.address
- vars.check = "check_load"
- vars.load_check = "enabled"
- assign where host.vars.load_check != "disable"
+ check_command = "nrpe-check-1arg"
+ vars.host = host.address
+ vars.check = "check_load"
+ vars.load_check = "enabled"
+ assign where host.vars.load_check != "disable"
}
apply Service "procs" {
- import "generic-service"
+ import "generic-service"
- check_command = "nrpe-check-1arg"
- vars.host = host.address
- vars.check = "check_procs"
+ check_command = "nrpe-check-1arg"
+ vars.host = host.address
+ vars.check = "check_procs"
- //assign where host.name == NodeName
- assign where host.vars.remote_client
+ //assign where host.name == NodeName
+ assign where host.vars.remote_client
}
apply Service "swap" {
- import "generic-service"
+ import "generic-service"
- check_command = "nrpe-check-1arg"
- vars.host = host.address
- vars.check = "check_swap"
+ check_command = "nrpe-check-1arg"
+ vars.host = host.address
+ vars.check = "check_swap"
- //assign where host.name == NodeName
- assign where host.vars.swap
+ //assign where host.name == NodeName
+ assign where host.vars.swap
}
apply Service "check users" {
- import "generic-service"
+ import "generic-service"
check_command = "nrpe-check-1arg"
vars.host = host.address
vars.check = "check_users"
- assign where host.vars.check_user
+ assign where host.vars.check_user
}
- object Service "phabricator.phabricator.eqiad.wmflabs check dns" {
- import "generic-service"
- host_name = "phabricator.phabricator.eqiad.wmflabs"
- check_command = "check_dns"
- vars.host = "phab-01.wmflabs.org"
- vars.address = "labs-ns0.wikimedia.org"
- }
+object Service "phabricator.phabricator.eqiad.wmflabs check dns" {
+ import "generic-service"
+ host_name = "phabricator.phabricator.eqiad.wmflabs"
+ check_command = "check_dns"
+ vars.host = "phab-01.wmflabs.org"
+ vars.address = "labs-ns0.wikimedia.org"
+}
object Service "gerrit-test3 check gerrit" {
- import "generic-service"
- host_name = "gerrit-test3.git.eqiad.wmflabs"
- check_command = "nrpe-check-1arg"
- vars.check = "check_gerrit"
- vars.host = "gerrit-test3.git.eqiad.wmflabs"
+ import "generic-service"
+ host_name = "gerrit-test3.git.eqiad.wmflabs"
+ check_command = "nrpe-check-1arg"
+ vars.check = "check_gerrit"
+ vars.host = "gerrit-test3.git.eqiad.wmflabs"
}
- object Service "phabricator.phabricator.eqiad.wmflabs check phd" {
- import "generic-service"
- host_name = "phabricator.phabricator.eqiad.wmflabs"
- check_command = "nrpe-check-1arg"
- vars.check = "check_phd"
- vars.host = "phabricator.phabricator.eqiad.wmflabs"
- }
+object Service "phabricator.phabricator.eqiad.wmflabs check phd" {
+ import "generic-service"
+ host_name = "phabricator.phabricator.eqiad.wmflabs"
+ check_command = "nrpe-check-1arg"
+ vars.check = "check_phd"
+ vars.host = "phabricator.phabricator.eqiad.wmflabs"
+}
apply Service "apt_get" {
- import "generic-service"
- check_command = "nrpe-check-1arg"
- /* vars.nrpe_command = "nrpe-check-1arg"*/
- vars.host = host.address
- vars.check = "check_apt"
- check_interval = 7m
- retry_interval = 4m
- assign where host.vars.external_host
-}
-
-apply Service "apt_get_distupgrade" {
- import "generic-service"
- check_command = "nrpe-check-1arg"
- /*vars.nrpe_command = "nrpe-check-1arg"*/
- vars.check = "check_apt_distupgrade"
- vars.host = host.address
- check_interval = 7m
- retry_interval = 4m
- assign where host.vars.external_host
+ import "generic-service"
+ check_command = "nrpe-check-1arg"
+ /* vars.nrpe_command = "nrpe-check-1arg"*/
+ vars.host = host.address
+ vars.check = "check_apt"
+ check_interval = 7m
+ retry_interval = 4m
+ assign where host.vars.external_host
}
object Service "gerrit-test.git.eqiad.wmflabs check jenkins" {
- import "generic-service"
- host_name = "gerrit-test.git.eqiad.wmflabs"
- check_command = "nrpe-check-1arg"
- vars.check = "check_jenkins"
- vars.host = "gerrit-test.git.eqiad.wmflabs"
+ import "generic-service"
+ host_name = "gerrit-test.git.eqiad.wmflabs"
+ check_command = "nrpe-check-1arg"
+ vars.check = "check_jenkins"
+ vars.host = "gerrit-test.git.eqiad.wmflabs"
}
--
To view, visit https://gerrit.wikimedia.org/r/359795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib87b5f38206e698642e7df1a4cb04977eb258529
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
