Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318442
Change subject: icinga: remove pre-jessie conditional from monitoring::group
......................................................................
icinga: remove pre-jessie conditional from monitoring::group
As the comment says, this was supposed to be temporary until
neon has been decom'ed and we only have jessie icinga hosts,
which are now einsteinium and tegmen.
Bug: T125023
Change-Id: I869a88412362aa4411f4e30ba4e3af53ade67f59
---
M modules/monitoring/manifests/group.pp
1 file changed, 17 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/318442/1
diff --git a/modules/monitoring/manifests/group.pp
b/modules/monitoring/manifests/group.pp
index fb5e7ea..f7659ff 100644
--- a/modules/monitoring/manifests/group.pp
+++ b/modules/monitoring/manifests/group.pp
@@ -15,39 +15,23 @@
$ensure=present,
$config_dir = '/etc/nagios'
) {
+
# Nagios hostgroup instance
- # TODO: Temporary, undo when neon is finally decomissioned
- if os_version('Debian >= jessie') {
- nagios_hostgroup { $title:
- ensure => $ensure,
- target => "${config_dir}/puppet_hostgroups.cfg",
- hostgroup_name => $title,
- mode => '0444',
- alias => $description,
- }
-
- # Nagios servicegroup instance
- nagios_servicegroup { $title:
- ensure => $ensure,
- target => "${config_dir}/puppet_servicegroups.cfg",
- servicegroup_name => $title,
- mode => '0444',
- alias => $description,
- }
- } else {
- nagios_hostgroup { $title:
- ensure => $ensure,
- target => "${config_dir}/puppet_hostgroups.cfg",
- hostgroup_name => $title,
- alias => $description,
- }
-
- # Nagios servicegroup instance
- nagios_servicegroup { $title:
- ensure => $ensure,
- target => "${config_dir}/puppet_servicegroups.cfg",
- servicegroup_name => $title,
- alias => $description,
- }
+ nagios_hostgroup { $title:
+ ensure => $ensure,
+ target => "${config_dir}/puppet_hostgroups.cfg",
+ hostgroup_name => $title,
+ mode => '0444',
+ alias => $description,
}
+
+ # Nagios servicegroup instance
+ nagios_servicegroup { $title:
+ ensure => $ensure,
+ target => "${config_dir}/puppet_servicegroups.cfg",
+ servicegroup_name => $title,
+ mode => '0444',
+ alias => $description,
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/318442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I869a88412362aa4411f4e30ba4e3af53ade67f59
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
