[MediaWiki-commits] [Gerrit] Saving nginx logs in separate directory to avoid udp2log::in... - change (operations/puppet)

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/55593


Change subject: Saving nginx logs in separate directory to avoid 
udp2log::instance conflicts
......................................................................

Saving nginx logs in separate directory to avoid udp2log::instance conflicts

Change-Id: I15009179225a650f38f16a57db0e570e9323ac20
---
M manifests/role/logging.pp
1 file changed, 23 insertions(+), 30 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/55593/1

diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 4892561..8e9fa92 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -74,25 +74,9 @@
                misc::udp2log::utilities
 
        $log_directory               = '/a/log'
-       $webrequest_log_directory    = "$log_directory/webrequest"
-       $webrequest_filter_directory = "$webrequest_log_directory/bin"
 
        file { $log_directory:
                ensure => 'directory',
-       }
-       file { $webrequest_log_directory:
-               ensure => directory,
-               mode   => 0755,
-               owner  => 'udp2log',
-               group  => 'udp2log',
-       }
-
-       # install custom filters here
-       file { $webrequest_filter_directory:
-               ensure => directory,
-               mode   => 0755,
-               owner  => 'udp2log',
-               group  => 'udp2log',
        }
 
        # Set up an rsync daemon module for udp2log logrotated
@@ -104,6 +88,16 @@
        }
 }
 
+# nginx machines are configured to log to port 8421.
+class role::logging::udp2log::nginx inherits role::logging::udp2log {
+       $nginx_log_directory = "$log_directory/nginx"
+
+       misc::udp2log::instance { 'nginx':
+               port          => '8421',
+               log_directory => $nginx_log_directory,
+       }
+}
+
 
 # gadolinium udp2log instance(s).
 # gadolinium hosts the 'gadolinium' udp2log instance,
@@ -111,6 +105,19 @@
 class role::logging::udp2log::gadolinium inherits role::logging::udp2log {
        # need file_mover account for fundraising logs
        include accounts::file_mover
+
+       # udp2log::instance will ensure this is created
+       $webrequest_log_directory    = "$log_directory/webrequest"
+
+       # install custom filters here
+       $webrequest_filter_directory = "$webrequest_log_directory/bin"
+       file { $webrequest_filter_directory:
+               ensure => directory,
+               mode   => 0755,
+               owner  => 'udp2log',
+               group  => 'udp2log',
+       }
+
        # gadolinium keeps fundraising logs in a subdir
        $fundraising_log_directory = "$log_directory/fundraising"
 
@@ -152,19 +159,5 @@
                # gadolinium consumes from the multicast stream relay (from 
oxygen)
                multicast     => true,
                log_directory => $webrequest_log_directory,
-               require       => File[$webrequest_log_directory],
-       }
-
-       # nginx machines are configured to log to
-       # gadolinium on port 8421.
-       # Since nginx logs are webrequest logs, save
-       # them in the same directory.
-       misc::udp2log::instance { 'nginx':
-               port          => '8421',
-               log_directory => $webrequest_log_directory,
-               require       => File[$webrequest_log_directory],
-               # the gadolinium udp2log instance already
-               # log rotates for $webrequest_log_directory
-               log_rotate    => false,
        }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15009179225a650f38f16a57db0e570e9323ac20
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>

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