Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315245
Change subject: icinga: Remove the last vestiges of hostextinfo
......................................................................
icinga: Remove the last vestiges of hostextinfo
No longer used by anything, remove them
Change-Id: I91548b0ffeadcc8dc6601d8bf91c499e8d48f92b
---
M modules/icinga/files/icinga-init
M modules/icinga/templates/icinga.cfg.erb
M modules/monitoring/manifests/decommission_monitor_host.pp
3 files changed, 1 insertion(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/315245/1
diff --git a/modules/icinga/files/icinga-init b/modules/icinga/files/icinga-init
index 2834acc..cdb7062 100755
--- a/modules/icinga/files/icinga-init
+++ b/modules/icinga/files/icinga-init
@@ -32,7 +32,7 @@
CGICFG="/etc/icinga/cgi.cfg"
NICENESS=0
#Purge old resources before start
-ICINGAPUPPETFILES="/etc/icinga/puppet_hosts.cfg
/etc/icinga/puppet_hostgroups.cfg /etc/icinga/puppet_hostextinfo.cfg
/etc/icinga/puppet_servicegroups.cfg /etc/icinga/puppet_services.cfg"
+ICINGAPUPPETFILES="/etc/icinga/puppet_hosts.cfg
/etc/icinga/puppet_hostgroups.cfg /etc/icinga/puppet_servicegroups.cfg
/etc/icinga/puppet_services.cfg"
#NAGIOSPUPPETFILES="/etc/nagios/puppet_hosts.cfg
/etc/nagios/puppet_hostgroups.cfg /etc/nagios/puppet_servicegroups.cfg
/etc/nagios/puppet_checks.d/*"
PURGESCRIPT="/usr/local/sbin/purge-nagios-resources.py"
[ -x "$DAEMON" ] || exit 0
diff --git a/modules/icinga/templates/icinga.cfg.erb
b/modules/icinga/templates/icinga.cfg.erb
index a3d4678..fa1e072 100644
--- a/modules/icinga/templates/icinga.cfg.erb
+++ b/modules/icinga/templates/icinga.cfg.erb
@@ -37,7 +37,6 @@
cfg_file=/etc/icinga/timeperiods.cfg
cfg_file=/etc/icinga/notification_commands.cfg
cfg_file=/etc/icinga/puppet_hosts.cfg
-cfg_file=/etc/icinga/puppet_hostextinfo.cfg
cfg_file=/etc/icinga/puppet_services.cfg
diff --git a/modules/monitoring/manifests/decommission_monitor_host.pp
b/modules/monitoring/manifests/decommission_monitor_host.pp
index a316974..adeb61d 100644
--- a/modules/monitoring/manifests/decommission_monitor_host.pp
+++ b/modules/monitoring/manifests/decommission_monitor_host.pp
@@ -6,18 +6,10 @@
Nagios_host <| title == $title |> {
ensure => absent
}
- Nagios_hostextinfo <| title == $title |> {
- ensure => absent
- }
}
else {
# Resources don't exist in Puppet. Remove from Nagios config as well.
nagios_host { $title:
- ensure => absent,
- host_name => $title,
-
- }
- nagios_hostextinfo { $title:
ensure => absent,
host_name => $title,
--
To view, visit https://gerrit.wikimedia.org/r/315245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91548b0ffeadcc8dc6601d8bf91c499e8d48f92b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
