Gage has submitted this change and it was merged.
Change subject: logstash filter: gelf: hadoop: update for logstash 1.4.2
......................................................................
logstash filter: gelf: hadoop: update for logstash 1.4.2
Logstash package was recently upgraded from 1.2.2; 'strip_leading_underscore'
(default: true) has been introduced. Update Hadoop config section to match.
Change-Id: I13868d91ceb65d4655c83d6d181b824b5086cd48
---
M files/logstash/filter-gelf.conf
1 file changed, 7 insertions(+), 14 deletions(-)
Approvals:
Gage: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/logstash/filter-gelf.conf b/files/logstash/filter-gelf.conf
index a52cca5..40499eb 100644
--- a/files/logstash/filter-gelf.conf
+++ b/files/logstash/filter-gelf.conf
@@ -2,22 +2,15 @@
if [type] == "gelf" {
if [facility] == "Hadoop" {
mutate {
- replace => [ "channel", "%{_SourceSimpleClassName}" ]
- replace => [ "Severity", "%{_Severity}" ]
- replace => [ "ClassName", "%{_SourceClassName}" ]
- replace => [ "MethodName", "%{_SourceMethodName}" ]
- replace => [ "Thread", "%{_Thread}" ]
- replace => [ "LoggerName", "%{_LoggerName}" ]
- # doesn't work in 1.5.1:
- #replace => [ "Server", "%{_Server}" ]
+ replace => [ "channel", "%{SourceSimpleClassName}" ]
}
grok {
- match => [ "_Thread", "(?<Thread>IPC Server handler)
%{NUMBER:IPC_Server_handler_id} on %{NUMBER:IPC_Server_handler_port}" ]
- match => [ "_Thread", "(?<Thread>DeletionService)
#%{NUMBER:DeletionService_id}" ]
- match => [ "_Thread", "(?<Thread>LocalizerRunner) for
%{NOTSPACE:ContainerId}" ]
- match => [ "_Thread", "(?<Thread>ContainersLauncher)
#%{NUMBER:ContainersLauncher_id}" ]
- match => [ "_Thread", "(?<Thread>LogAggregationService)
#%{NUMBER:LogAggregationService_id}" ]
- match => [ "_Thread",
"(?<Thread>CacheReplicationMonitor)\(%{NUMBER:CacheReplicationMonitor_id}\)" ]
+ match => [ "Thread", "(?<Thread>IPC Server handler)
%{NUMBER:IPC_Server_handler_id} on %{NUMBER:IPC_Server_handler_port}" ]
+ match => [ "Thread", "(?<Thread>DeletionService)
#%{NUMBER:DeletionService_id}" ]
+ match => [ "Thread", "(?<Thread>LocalizerRunner) for
%{NOTSPACE:ContainerId}" ]
+ match => [ "Thread", "(?<Thread>ContainersLauncher)
#%{NUMBER:ContainersLauncher_id}" ]
+ match => [ "Thread", "(?<Thread>LogAggregationService)
#%{NUMBER:LogAggregationService_id}" ]
+ match => [ "Thread",
"(?<Thread>CacheReplicationMonitor)\(%{NUMBER:CacheReplicationMonitor_id}\)" ]
overwrite => [ "Thread" ]
}
dns {
--
To view, visit https://gerrit.wikimedia.org/r/168548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13868d91ceb65d4655c83d6d181b824b5086cd48
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gage <[email protected]>
Gerrit-Reviewer: Gage <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
