Gilles has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404288 )
Change subject: Fix varnishslowlog logstash configuration
......................................................................
Fix varnishslowlog logstash configuration
Change-Id: Ie1cefcbe8f1e544702bb44fdd9bbe535ce39003d
---
M modules/role/files/logstash/filter-logback.conf
M modules/varnish/files/varnishslowlog.py
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/88/404288/1
diff --git a/modules/role/files/logstash/filter-logback.conf
b/modules/role/files/logstash/filter-logback.conf
index 2f38919..6821adc 100644
--- a/modules/role/files/logstash/filter-logback.conf
+++ b/modules/role/files/logstash/filter-logback.conf
@@ -3,7 +3,7 @@
filter {
if [type] == "logback" {
# General message cleanup
- if "thumbor" not in [tags] {
+ if "thumbor" not in [tags] and "varnishslowlog" not in [tags] {
mutate {
replace => [ "host", "%{HOSTNAME}" ]
}
diff --git a/modules/varnish/files/varnishslowlog.py
b/modules/varnish/files/varnishslowlog.py
index 0883267..242dbae 100644
--- a/modules/varnish/files/varnishslowlog.py
+++ b/modules/varnish/files/varnishslowlog.py
@@ -87,7 +87,8 @@
self.args.logstash_server[0],
port=self.args.logstash_server[1],
version=1,
- message_type='varnishslowlog'
+ message_type='logback',
+ tags=['varnishslowlog']
)
else:
handler = logging.StreamHandler(sys.stdout)
--
To view, visit https://gerrit.wikimedia.org/r/404288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1cefcbe8f1e544702bb44fdd9bbe535ce39003d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
