Tim Landscheidt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/267039
Change subject: shinken: Add role::labs::instance as hostgroup to all instances
......................................................................
shinken: Add role::labs::instance as hostgroup to all instances
Previously, the Puppet class role::labs::instance was applied to all
instances by being set in the LDAP records for all instances. This
has since been moved to manifests/site.pp, and the Puppet class has
been removed from LDAP.
shinkengen translates the Puppet classes in the LDAP records to
hostgroups in Shinken, and the standard instance checks in
basic-instance-checks.cfg rely on all hosts being in the hostgroup
role::labs::instance, so this change adds this hostgroup to all
instances and thus restores the previous behaviour.
Bug: T123271
Change-Id: I7f4108a77f040d7820782995ae8448a8315ee34a
---
M modules/shinken/files/shinkengen
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/267039/1
diff --git a/modules/shinken/files/shinkengen b/modules/shinken/files/shinkengen
index a981ccc..413bf48 100755
--- a/modules/shinken/files/shinkengen
+++ b/modules/shinken/files/shinkengen
@@ -131,9 +131,12 @@
co.properties['use'] = 'generic-host'
co.properties['host_name'] = instance['name']
co.properties['address'] = instance['ip']
- # Each role applied to this instance explicitly, via wikitech,
- # is added as a hostgroup, so we can target particular roles wich
checks.
- co.properties['hostgroups'] = ','.join([project] +
instance['puppetClasses'])
+ # Each role applied to this instance explicitly, via
+ # wikitech, is added as a hostgroup, so we can target
+ # particular roles with checks. role::labs::instance is
+ # implicitly applied to all instances via
+ # manifests/site.pp, so we need to add it here explicitly.
+ co.properties['hostgroups'] = ','.join([project,
'role::labs::instance'] + instance['puppetClasses'])
# For each project added to monitoring we expect a contactgroup
with the same
# name added.
# FIXME: Implement access mechanism more fine grained than
per-project
--
To view, visit https://gerrit.wikimedia.org/r/267039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f4108a77f040d7820782995ae8448a8315ee34a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
