Filippo Giunchedi has submitted this change and it was merged.
Change subject: syslog-ng: update to trusty
......................................................................
syslog-ng: update to trusty
change syslog-ng config syntax to 3.5 (trusty's version) and install
syslog-ng-core too, otherwise syslog-ng installation fails
Change-Id: Ib140ef22413959afc3f0c926f840fbc84babac6e
---
M manifests/misc/logging.pp
M templates/syslog-ng/syslog-ng.conf.nfs.erb
2 files changed, 8 insertions(+), 7 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/misc/logging.pp b/manifests/misc/logging.pp
index 09f6502..aeb6fc7 100644
--- a/manifests/misc/logging.pp
+++ b/manifests/misc/logging.pp
@@ -17,7 +17,7 @@
$archivepath = "$basepath/archive"
- package { 'syslog-ng':
+ package { ['syslog-ng', 'syslog-ng-core']:
ensure => latest,
}
diff --git a/templates/syslog-ng/syslog-ng.conf.nfs.erb
b/templates/syslog-ng/syslog-ng.conf.nfs.erb
index 6ff736b..ea98fd9 100644
--- a/templates/syslog-ng/syslog-ng.conf.nfs.erb
+++ b/templates/syslog-ng/syslog-ng.conf.nfs.erb
@@ -14,6 +14,7 @@
# the "none" priority found in the original syslogd configuration is
# only used in internal messages created by syslogd
+@version: 3.5
######
# options
@@ -21,7 +22,7 @@
options {
# disable the chained hostname format in logs
# (default is enabled)
- chain_hostnames(0);
+ chain_hostnames(no);
# the time to wait before a died connection is re-established
# (default is 60)
@@ -39,7 +40,7 @@
#sync(0);
# the number of lines fitting in the output queue
- log_fifo_size(2048);
+ log_fifo_size(10000);
# enable or disable directory creation for destination files
create_dirs(no);
@@ -92,7 +93,7 @@
# function to send logs to)
unix-stream("/dev/log");
# messages from the kernel
- file("/proc/kmsg" log_prefix("kernel: "));
+ file("/proc/kmsg" program_override("kernel: "));
# use the following line if you want to receive remote UDP logging
messages
# (this is equivalent to the "-r" syslogd flag)
#udp();
@@ -376,9 +377,9 @@
filter f_nojunk {
not (
program("apache2") and
- match("File does not exist:") or
- match("File name too long:") or
- match("Directory index forbidden")
+ match("File does not exist:" value("MESSAGE")) or
+ match("File name too long:" value("MESSAGE")) or
+ match("Directory index forbidden" value("MESSAGE"))
);
};
--
To view, visit https://gerrit.wikimedia.org/r/164523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib140ef22413959afc3f0c926f840fbc84babac6e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
