Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Revert "icinga: Kill hostextinfo"
......................................................................
Revert "icinga: Kill hostextinfo"
This reverts commit 07c6048d02281ee363b133eb7f1708d6fdc15655.
Change-Id: I456fb3877e2bd075296e7474bb711c7b4e35d2c5
---
M modules/monitoring/manifests/host.pp
1 file changed, 19 insertions(+), 19 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/monitoring/manifests/host.pp
b/modules/monitoring/manifests/host.pp
index f83c58d..fc7e06d 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -33,21 +33,6 @@
}
# Export the nagios host instance
- if $title == $::hostname {
- $image = $::operatingsystem ? {
- 'Ubuntu' => 'ubuntu',
- 'Debian' => 'debian',
- default => 'linux40'
- }
- $icon_image = "base/${image}.png"
- $vrml_image = "base/${image}.png"
- $statusmap_image = "base/${image}.gd2"
- } else {
- $image = undef
- $icon_image = undef
- $vrml_image = undef
- $statusmap_image = undef
- }
@@nagios_host { $title:
ensure => $ensure,
target => '/etc/nagios/puppet_hosts.cfg',
@@ -61,9 +46,24 @@
notification_interval => 0,
notification_period => '24x7',
notification_options => 'd,u,r,f',
- image => $image,
- icon_image => $icon_image,
- vrml_image => $vrml_image,
- statusmap_image => $statusmap_image,
+ }
+
+ if $title == $::hostname {
+ $image = $::operatingsystem ? {
+ 'Ubuntu' => 'ubuntu',
+ 'Debian' => 'debian',
+ default => 'linux40'
+ }
+
+ # Couple it with some hostextinfo
+ @@nagios_hostextinfo { $title:
+ ensure => $ensure,
+ target => '/etc/nagios/puppet_hostextinfo.cfg',
+ host_name => $title,
+ notes => $title,
+ icon_image => "base/${image}.png",
+ vrml_image => "base/${image}.png",
+ statusmap_image => "base/${image}.gd2",
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/315216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I456fb3877e2bd075296e7474bb711c7b4e35d2c5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
