Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/161480
Change subject: mediawiki::syslog: add docs ...................................................................... mediawiki::syslog: add docs And touch-up the docs for mediawiki::cgroup Change-Id: I0510d38714e43c32e7ccbfbd4e637d14d655c562 --- M modules/mediawiki/manifests/cgroup.pp M modules/mediawiki/manifests/syslog.pp 2 files changed, 21 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/80/161480/1 diff --git a/modules/mediawiki/manifests/cgroup.pp b/modules/mediawiki/manifests/cgroup.pp index 50efdf5..25a03b3 100644 --- a/modules/mediawiki/manifests/cgroup.pp +++ b/modules/mediawiki/manifests/cgroup.pp @@ -4,10 +4,7 @@ # resource usage of commands invoked in a subprocess via wfShellExec(), # like texvc and lilypond. The cgroup is specified by via $wgShellCgroup. # -# See also: -# * <https://www.mediawiki.org/wiki/Manual:$wgShellCgroup> -# * <https://github.com/wikimedia/mediawiki-core/blob/master/includes/limit.sh> -# * <https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt> +# See also: <https://www.mediawiki.org/wiki/Manual:$wgShellCgroup> # class mediawiki::cgroup { package { 'cgroup-bin': @@ -29,6 +26,7 @@ require => File['/etc/init/mw-cgroup.conf'], } + # The cgroup-mediawiki-clean script is used as the release_agent # script for the cgroup. When the last task in the cgroup exits, # the kernel will run the script. diff --git a/modules/mediawiki/manifests/syslog.pp b/modules/mediawiki/manifests/syslog.pp index 6e7e922..0c825d5 100644 --- a/modules/mediawiki/manifests/syslog.pp +++ b/modules/mediawiki/manifests/syslog.pp @@ -1,9 +1,27 @@ +# == Class: mediawiki::syslog +# +# Hosts running MediaWiki configure Apache and HHVM to log to syslog. +# This Puppet class configures rsyslog to handle log messages from +# Apache and HHVM by writing them to disk and forwarding them to the +# MediaWiki log aggregator via UDP. It also sets up log rotation for the +# local log files. +# class mediawiki::syslog { + + # We assign a priority of 40 to MediaWiki's rsyslog config file + # so we can intercept log messages before they fall through to + # the firehose in 50-default.conf. + rsyslog::conf { 'mediawiki': source => 'puppet:///modules/mediawiki/rsyslog.conf', - priority => 40, # before 50-default.conf + priority => 40, } + + # Set up log rotation for /var/log/apache2.log. In addition to + # cron-triggered rotation, rsyslog will invoke logrotate whenever + # apache2.log exceeds 100MB. + file { '/etc/logrotate.d/mediawiki_apache': source => 'puppet:///modules/mediawiki/logrotate.d_mediawiki_apache', owner => 'root', -- To view, visit https://gerrit.wikimedia.org/r/161480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0510d38714e43c32e7ccbfbd4e637d14d655c562 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ori.livneh <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
