Paladox has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/359799 )
Change subject: Update some things
......................................................................
Update some things
Change-Id: Id2353fee178eb77f701dc4676932343ee7bd4599
---
M templates/hosts.conf.erb
M templates/notifications.conf.erb
M templates/services.conf.erb
3 files changed, 79 insertions(+), 26 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/templates/hosts.conf.erb b/templates/hosts.conf.erb
index 19665b3..18e720d 100644
--- a/templates/hosts.conf.erb
+++ b/templates/hosts.conf.erb
@@ -165,7 +165,7 @@
object Host "jenkins-slave-01.git.eqiad.wmflabs" {
import "generic-host"
address = "jenkins-slave-01.git.eqiad.wmflabs"
- vars.os = "Linux"
+ vars.os = "Linux OS"
vars.sla = "24x7"
vars.external_host = true
vars.puppet_check = "enabled"
@@ -197,29 +197,30 @@
}
object Host "puppet-paladox3.git.eqiad.wmflabs" {
- import "puppet-paladox3"
+ import "generic-host"
display_name = "Puppet-Paladox"
address = "puppet-paladox3.git.eqiad.wmflabs"
vars.address = "puppet-paladox3.git.eqiad.wmflabs"
vars.check_user = true
- vars.os = "Linux"
+ vars.os = "Linux OS"
vars.sla = "24x7"
vars.external_host = true
vars.puppet_check = "enabled"
}
-object Host "ores-05" {
- import "AI"
+object Host "ores-web-05" {
+ import "generic-host"
address = "ores-web-05.ores.eqiad.wmflabs"
- vars.os = "Linux"
+ vars.os = "Linux OS"
vars.sla = "24x7"
vars.check_user = true
vars.address = "ores-web-05.ores.eqiad.wmflabs"
vars.check_disk = "disable"
vars.check_disk_ores = true
vars.host = "ores-web-05.ores.eqiad.wmflabs"
+ vars.notification.ores = true
/* Define notification mail attributes for notification apply rules in
`notifications.conf`. */
vars.notification["mail"] = {
/* The UserGroup `icingaadmins` is defined in `users.conf`. */
@@ -228,16 +229,17 @@
}
object Host "Ores-Compute-01" {
- import "AI"
+ import "generic-host"
address = "ores-compute-01.ores.eqiad.wmflabs"
- vars.os = "Linux"
+ vars.os = "Linux OS"
vars.sla = "24x7"
vars.check_user = true
vars.address = "ores-compute-01.ores.eqiad.wmflabs"
vars.check_disk = "false"
vars.check_disk_ores = true
vars.host = "ores-compute-01.ores.eqiad.wmflabs"
+ vars.notification.ores = true
/* Define notification mail attributes for notification apply rules in
`notifications.conf`. */
vars.notification["mail"] = {
/* The UserGroup `icingaadmins` is defined in `users.conf`. */
@@ -246,11 +248,11 @@
}
object Host "puppet-phabricator.phabricator.eqiad.wmflabs" {
- import "puppet-paladox3"
+ import "generic-host"
display_name = "puppet-phabricator"
address = "puppet-phabricator.phabricator.eqiad.wmflabs"
- vars.os = "Linux"
+ vars.os = "Linux OS"
vars.sla = "24x7"
vars.address = "puppet-phabricator.phabricator.eqiad.wmflabs"
vars.check_user = true
@@ -262,20 +264,79 @@
}
}
-object Host "Ores-worker-05" {
- import "AI"
+object Host "ores-worker-05" {
+ import "generic-host"
address = "ores-worker-05.ores.eqiad.wmflabs"
- vars.os = "Linux"
+ vars.os = "Linux OS"
vars.sla = "24x7"
vars.address = "ores-worker-05.ores.eqiad.wmflabs"
vars.check_user = true
vars.check_disk = "disable"
vars.check_disk_ores = true
vars.host = "ores-worker-05.ores.eqiad.wmflabs"
+ vars.notification.ores = true
/* Define notification mail attributes for notification apply rules in
`notifications.conf`. */
vars.notification["mail"] = {
/* The UserGroup `icingaadmins` is defined in `users.conf`. */
groups = [ "icingaadmins" ]
}
}
+
+object Host "ores.wmflabs.org" {
+ import "generic-host"
+
+ address = "ores.wmflabs.org"
+ vars.os = "Linux OS"
+ vars.sla = "24x7"
+ vars.puppet_check = "disable"
+ vars.disk_check = "disable"
+ vars.load_check = "disable"
+ vars.website_name = "ores.wmflabs.org"
+ vars.website_url = "/"
+ vars.notification.ores = true
+
+ vars.notification["mail"] = {
+ /* The UserGroup `icingaadmins` is defined in `users.conf`. */
+ groups = [ "icingaadmins" ]
+ }
+}
+
+object Host "ores-lb-02" {
+ import "generic-host"
+
+ address = "ores-lb-02.ores.eqiad.wmflabs"
+ vars.os = "Linux OS"
+ vars.sla = "24x7"
+ vars.address = "ores-lb-02.ores.eqiad.wmflabs"
+ vars.check_user = true
+ vars.check_disk = "disable"
+ vars.check_disk_ores = true
+ vars.host = "ores-lb-02.ores.eqiad.wmflabs"
+ vars.puppet_check = "true"
+ vars.notification.ores = true
+ vars.notification["mail"] = {
+ /* The UserGroup `icingaadmins` is defined in `users.conf`. */
+ groups = [ "icingaadmins" ]
+ }
+}
+
+object Host "ores-redis-01" {
+ import "generic-host"
+
+ display_name = "ores-redis.01"
+ address = "ores-redis-01.ores.eqiad.wmflabs"
+ vars.address = "ores-redis-01.ores.eqiad.wmflabs"
+ vars.os = "Linux OS"
+ vars.sla = "24x7"
+ vars.check_user = true
+ vars.check_disk = "disable"
+ vars.check_disk_ores = true
+ vars.host = "ores-redis-01.ores.eqiad.wmflabs"
+ vars.puppet_check = "true"
+ vars.notification.ores = true
+ vars.notification["mail"] = {
+ /* The UserGroup `icingaadmins` is defined in `users.conf`. */
+ groups = [ "icingaadmins" ]
+ }
+}
diff --git a/templates/notifications.conf.erb b/templates/notifications.conf.erb
index ab8d2dc..76f35fe 100644
--- a/templates/notifications.conf.erb
+++ b/templates/notifications.conf.erb
@@ -64,11 +64,7 @@
Recovery
]*/
- assign where host.vars.host == "ores-web-05.ores.eqiad.wmflabs"
- assign where host.vars.host == "ores-compute-01.ores.eqiad.wmflabs"
- assign where host.vars.host == "ores-worker-05.ores.eqiad.wmflabs"
- assign where host.vars.host == "ores-lb-02.ores.eqiad.wmflabs"
- assign where host.vars.host == "ores-redis-01.ores.eqiad.wmflabs"
+ assign where host.vars.notification.ores
}
apply Notification "ores-mail-icingaadmin" to Service {
@@ -86,11 +82,7 @@
Recovery
]*/
- assign where host.vars.host == "ores-web-05.ores.eqiad.wmflabs"
- assign where host.vars.host == "ores-compute-01.ores.eqiad.wmflabs"
- assign where host.vars.host == "ores-worker-05.ores.eqiad.wmflabs"
- assign where host.vars.host == "ores-lb-02.ores.eqiad.wmflabs"
- assign where host.vars.host == "ores-redis-01.ores.eqiad.wmflabs"
+ assign where host.vars.notification.ores
}
/** end **/
diff --git a/templates/services.conf.erb b/templates/services.conf.erb
index 35c54b0..5152bbf 100644
--- a/templates/services.conf.erb
+++ b/templates/services.conf.erb
@@ -158,7 +158,7 @@
assign where host.vars.check_user
}
-object Service "phabricator.phabricator.eqiad.wmflabs check dns" {
+object Service "phabricator check dns" {
import "generic-service"
host_name = "phabricator.phabricator.eqiad.wmflabs"
check_command = "check_dns"
@@ -174,7 +174,7 @@
vars.host = "gerrit-test3.git.eqiad.wmflabs"
}
-object Service "phabricator.phabricator.eqiad.wmflabs check phd" {
+object Service "phabricator check phd" {
import "generic-service"
host_name = "phabricator.phabricator.eqiad.wmflabs"
check_command = "nrpe-check-1arg"
@@ -193,7 +193,7 @@
assign where host.vars.external_host
}
-object Service "gerrit-test.git.eqiad.wmflabs check jenkins" {
+object Service "gerrit-test check jenkins" {
import "generic-service"
host_name = "gerrit-test.git.eqiad.wmflabs"
check_command = "nrpe-check-1arg"
--
To view, visit https://gerrit.wikimedia.org/r/359799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id2353fee178eb77f701dc4676932343ee7bd4599
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
