Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Revert "Revert "icinga: Kill hostextinfo""
......................................................................
Revert "Revert "icinga: Kill hostextinfo""
Remove the spurious image argument that was added by mistake
This reverts commit 7c4a2de322f33870f3dbd74b250973c21802cb1f.
Change-Id: I8d1290bcfda3ee388c704690bf7d3397e23f3216
---
M modules/monitoring/manifests/host.pp
1 file changed, 17 insertions(+), 19 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/monitoring/manifests/host.pp
b/modules/monitoring/manifests/host.pp
index fc7e06d..0ae3a35 100644
--- a/modules/monitoring/manifests/host.pp
+++ b/modules/monitoring/manifests/host.pp
@@ -33,6 +33,20 @@
}
# 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 {
+ $icon_image = undef
+ $vrml_image = undef
+ $statusmap_image = undef
+ }
@@nagios_host { $title:
ensure => $ensure,
target => '/etc/nagios/puppet_hosts.cfg',
@@ -46,24 +60,8 @@
notification_interval => 0,
notification_period => '24x7',
notification_options => 'd,u,r,f',
- }
-
- 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",
- }
+ icon_image => $icon_image,
+ vrml_image => $vrml_image,
+ statusmap_image => $statusmap_image,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/315217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d1290bcfda3ee388c704690bf7d3397e23f3216
Gerrit-PatchSet: 3
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
