Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/221634
Change subject: Explicitly use eventlogging role so that hieradata for
admin::groups is applied
......................................................................
Explicitly use eventlogging role so that hieradata for admin::groups is applied
I renamed many of the eventlogging role classes, and the useful ones now inherit
from role::eventlogging. Since eventlogging-admins and eventlogging-roots admin
groups are applied by role class name, these users were removed from
eventlogging
hosts. Explicitly including the parent eventlogging role should keep these
admin
users where they should be. I also removed the eventlogging/graphite.yaml
hieradata, as now role::eventlogging can be included anywhere.
Change-Id: I569744ea7b8de11db0225e29e173e112d80ef67b
---
D hieradata/role/common/eventlogging/graphite.yaml
M manifests/site.pp
2 files changed, 4 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/34/221634/1
diff --git a/hieradata/role/common/eventlogging/graphite.yaml
b/hieradata/role/common/eventlogging/graphite.yaml
deleted file mode 100644
index 86f9540..0000000
--- a/hieradata/role/common/eventlogging/graphite.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-admin::groups:
- - eventlogging-admins
- - eventlogging-roots
diff --git a/manifests/site.pp b/manifests/site.pp
index 06d2536..2194d37 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -948,7 +948,8 @@
# Receives log data from varnishes (udp 8422) and Apaches (udp 8421),
# processes it, and broadcasts to internal subscribers.
node 'eventlog1001.eqiad.wmnet' {
- role eventlogging::forwarder,
+ role eventlogging
+ eventlogging::forwarder,
eventlogging::processor,
eventlogging::multiplexer,
eventlogging::consumer::mysql,
@@ -1035,7 +1036,8 @@
# Hosts visualization / monitoring of EventLogging event streams
# and MediaWiki errors.
node 'hafnium.wikimedia.org' {
- role eventlogging::consumer::graphite
+ role eventlogging
+ eventlogging::consumer::graphite
include standard
include base::firewall
--
To view, visit https://gerrit.wikimedia.org/r/221634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I569744ea7b8de11db0225e29e173e112d80ef67b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
