Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185854
Change subject: monitoring::service: mimic monitoring::host group handling
......................................................................
monitoring::service: mimic monitoring::host group handling
We ended up having different ways of handling servicegroups and
hostgroups in icinga. Be consistent and handle the $group parameter the
same way
Change-Id: I9e8f354ec68339433ae1efd6f5f45dd05cfc67d9
---
M modules/monitoring/manifests/service.pp
1 file changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/185854/1
diff --git a/modules/monitoring/manifests/service.pp
b/modules/monitoring/manifests/service.pp
index 5bb6bcc..a7c64eb 100644
--- a/modules/monitoring/manifests/service.pp
+++ b/modules/monitoring/manifests/service.pp
@@ -3,7 +3,7 @@
$check_command,
$host = $::hostname,
$retries = 3,
- $group = hiera('nagios_group', "${cluster}_${::site}"),
+ $group = undef,
$ensure = present,
$critical = 'false',
$passive = 'false',
@@ -17,11 +17,10 @@
if ! $host {
fail("Parameter $host not defined!")
}
-
- if $group {
- $servicegroups = $group
- } else {
- $servicegroups = undef
+ $cluster_name = hiera('cluster', $cluster)
+ $servicegroup = $group ? {
+ /.+/ => $group,
+ default => hiera('nagios_group',"${cluster_name}_${::site}")
}
# Export the nagios service instance
--
To view, visit https://gerrit.wikimedia.org/r/185854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e8f354ec68339433ae1efd6f5f45dd05cfc67d9
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
