[MediaWiki-commits] [Gerrit] Create role::logging::eventlogging - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Create role::logging::eventlogging
......................................................................


Create role::logging::eventlogging

Need to make the eventlogging module abstract for labs

Change-Id: Ic762640780dac349a144420fa066d91210314d4c
---
M manifests/role/logging.pp
M manifests/site.pp
M modules/eventlogging/manifests/init.pp
3 files changed, 15 insertions(+), 8 deletions(-)

Approvals:
  Mark Bergsma: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 00a745c..9922dfd 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -230,4 +230,15 @@
        misc::udp2log::instance { 'emery': 
                log_directory => $webrequest_log_directory,
        }
-}
\ No newline at end of file
+}
+
+# EventLogging collector
+class role::logging::eventlogging {
+       system_role { "misc::log-collector":
+               description => 'EventLogging log collector',
+       }
+
+       class{ "eventlogging":
+               archive_destinations => [ "stat1.wikimedia.org" ],
+       }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index e5d6cc2..d03bd84 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2750,12 +2750,8 @@
 node "vanadium.eqiad.wmnet" {
        $gid=500
 
-       system_role { "misc::log-collector":
-               description => 'EventLogging log collector',
-       }
-
        include standard,
-               eventlogging,
+               role::logging::eventlogging,
                nrpe,
                role::solr::ttm
 
diff --git a/modules/eventlogging/manifests/init.pp 
b/modules/eventlogging/manifests/init.pp
index b3f3482..533fc0c 100644
--- a/modules/eventlogging/manifests/init.pp
+++ b/modules/eventlogging/manifests/init.pp
@@ -1,6 +1,6 @@
 # Collector of analytic events
 # See <https://wikitech.wikimedia.org/wiki/EventLogging>
-class eventlogging {
+class eventlogging( $backup_destinations = [] ) {
 
        class { 'eventlogging::supervisor': }
        class { 'eventlogging::notebook':
@@ -8,7 +8,7 @@
        }
        class { 'eventlogging::ganglia': }
        class { 'eventlogging::archive':
-               destinations => [ 'stat1.wikimedia.org' ],
+               destinations => $archive_destinations,
        }
 
        class { 'mongodb':

-- 
To view, visit https://gerrit.wikimedia.org/r/60680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic762640780dac349a144420fa066d91210314d4c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits