[MediaWiki-commits] [Gerrit] operations/puppet[production]: Some requests may have no client IP defined.

2017-08-09 Thread Gehel (Code Review) 
Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370511 )

Change subject: Some requests may have no client IP defined.
..


Some requests may have no client IP defined.

Bug: T172713
Change-Id: I7f5a95e2a59e08166b19c490c58f2fa284eb8f5f
---
M modules/role/files/logstash/filter-syslog.conf
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Gehel: Looks good to me, approved



diff --git a/modules/role/files/logstash/filter-syslog.conf 
b/modules/role/files/logstash/filter-syslog.conf
index 120fb5f..c4cae09 100644
--- a/modules/role/files/logstash/filter-syslog.conf
+++ b/modules/role/files/logstash/filter-syslog.conf
@@ -146,7 +146,7 @@
 grok {
   match => [
 "message",
-"^\[%{HTTPDATE:http_date}\] .%{WORD:http_method} 
%{NOTSPACE:message} HTTP/%{NUMBER:httpversion}. %{NUMBER:status} 
(?:%{NUMBER:response_size}|-) %{QS:referrer} %{QS:user_agent} 
%{NUMBER:request_time} %{NUMBER:upstream_time} %{IP:clientip} 
%{IP:remote_addr}$"
+"^\[%{HTTPDATE:http_date}\] .%{WORD:http_method} 
%{NOTSPACE:message} HTTP/%{NUMBER:httpversion}. %{NUMBER:status} 
(?:%{NUMBER:response_size}|-) %{QS:referrer} %{QS:user_agent} 
%{NUMBER:request_time} %{NUMBER:upstream_time} (?:%{IP:clientip}|-) 
%{IP:remote_addr}$"
   ]
   overwrite => [ "message" ]
   named_captures_only => true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f5a95e2a59e08166b19c490c58f2fa284eb8f5f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Smalyshev 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Some requests may have no client IP defined.

2017-08-07 Thread Smalyshev (Code Review) 
Smalyshev has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370511 )

Change subject: Some requests may have no client IP defined.
..

Some requests may have no client IP defined.

Bug: T172713
Change-Id: I7f5a95e2a59e08166b19c490c58f2fa284eb8f5f
---
M modules/role/files/logstash/filter-syslog.conf
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/370511/1

diff --git a/modules/role/files/logstash/filter-syslog.conf 
b/modules/role/files/logstash/filter-syslog.conf
index 120fb5f..c4cae09 100644
--- a/modules/role/files/logstash/filter-syslog.conf
+++ b/modules/role/files/logstash/filter-syslog.conf
@@ -146,7 +146,7 @@
 grok {
   match => [
 "message",
-"^\[%{HTTPDATE:http_date}\] .%{WORD:http_method} 
%{NOTSPACE:message} HTTP/%{NUMBER:httpversion}. %{NUMBER:status} 
(?:%{NUMBER:response_size}|-) %{QS:referrer} %{QS:user_agent} 
%{NUMBER:request_time} %{NUMBER:upstream_time} %{IP:clientip} 
%{IP:remote_addr}$"
+"^\[%{HTTPDATE:http_date}\] .%{WORD:http_method} 
%{NOTSPACE:message} HTTP/%{NUMBER:httpversion}. %{NUMBER:status} 
(?:%{NUMBER:response_size}|-) %{QS:referrer} %{QS:user_agent} 
%{NUMBER:request_time} %{NUMBER:upstream_time} (?:%{IP:clientip}|-) 
%{IP:remote_addr}$"
   ]
   overwrite => [ "message" ]
   named_captures_only => true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f5a95e2a59e08166b19c490c58f2fa284eb8f5f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Smalyshev 

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