[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Migrate host ores-worker-05.ores.eqiad.wmflabs from director...

[Paladox (Code Review)]

Paladox has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/359662 )

Change subject: Migrate host ores-worker-05.ores.eqiad.wmflabs from director to 
public view in repo
..


Migrate host ores-worker-05.ores.eqiad.wmflabs from director to public view in 
repo

Change-Id: Ie43c4435ade1fc54fba04f44ec386e56af954519
---
M templates/hosts.conf.erb
M templates/services.conf.erb
2 files changed, 29 insertions(+), 5 deletions(-)

Approvals:
  Paladox: Verified; Looks good to me, approved



diff --git a/templates/hosts.conf.erb b/templates/hosts.conf.erb
index 885f58a..cc0e359 100644
--- a/templates/hosts.conf.erb
+++ b/templates/hosts.conf.erb
@@ -201,7 +201,7 @@
 address = "puppet-paladox3.git.eqiad.wmflabs"
 vars.address = "puppet-paladox3.git.eqiad.wmflabs"
 vars.check_user = true
-vars.os = "Linux OS"
+vars.os = "Linux"
 vars.sla = "24x7"
 vars.external_host = true
 vars.puppet_check = "enabled"
@@ -211,10 +211,12 @@
 import "AI"
 
 address = "ores-web-05.ores.eqiad.wmflabs"
+vars.os = "Linux"
+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.check_dist_ores = true
 vars.host = "ores-web-05.ores.eqiad.wmflabs"
 /* Define notification mail attributes for notification apply rules in 
`notifications.conf`. */
 vars.notification["mail"] = {
@@ -227,6 +229,9 @@
 import "AI"
 
 address = "ores-compute-01.ores.eqiad.wmflabs"
+vars.os = "Linux"
+vars.sla = "24x7"
+vars.check_user = true
 vars.address = "ores-compute-01.ores.eqiad.wmflabs"
 vars.check_disk = "false"
 vars.check_disk_ores = true
@@ -243,6 +248,8 @@
 
 display_name = "puppet-phabricator"
 address = "puppet-phabricator.phabricator.eqiad.wmflabs"
+vars.os = "Linux"
+vars.sla = "24x7"
 vars.address = "puppet-phabricator.phabricator.eqiad.wmflabs"
 vars.check_user = true
 vars.host = "puppet-phabricator.phabricator.eqiad.wmflabs"
@@ -252,3 +259,21 @@
   groups = [ "icingaadmins" ]
 }
 }
+
+object Host "Ores-worker-05" {
+import "AI"
+
+address = "ores-worker-05.ores.eqiad.wmflabs"
+vars.os = "Linux"
+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"
+/* Define notification mail attributes for notification apply rules in 
`notifications.conf`. */
+vars.notification["mail"] = {
+  /* The UserGroup `icingaadmins` is defined in `users.conf`. */
+  groups = [ "icingaadmins" ]
+}
+}
diff --git a/templates/services.conf.erb b/templates/services.conf.erb
index 065512c..d65d6bc 100644
--- a/templates/services.conf.erb
+++ b/templates/services.conf.erb
@@ -80,7 +80,7 @@
  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"
@@ -179,8 +179,7 @@
  vars.check = "check_phd"
  vars.host = "phabricator.phabricator.eqiad.wmflabs"
  }
- 
- 
+
 apply Service "apt_get" {
   import "generic-service"
   check_command = "nrpe-check-1arg"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie43c4435ade1fc54fba04f44ec386e56af954519
Gerrit-PatchSet: 2
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] labs/icinga2[master]: Migrate host ores-worker-05.ores.eqiad.wmflabs from director...

[Paladox (Code Review)]

Paladox has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/359662 )

Change subject: Migrate host ores-worker-05.ores.eqiad.wmflabs from director to 
public view in repo
..

Migrate host ores-worker-05.ores.eqiad.wmflabs from director to public view in 
repo

Change-Id: Ie43c4435ade1fc54fba04f44ec386e56af954519
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/icinga2 
refs/changes/62/359662/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie43c4435ade1fc54fba04f44ec386e56af954519
Gerrit-PatchSet: 1
Gerrit-Project: labs/icinga2
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits