Ori.livneh has submitted this change and it was merged.
Change subject: Migrate EventLogging to "%{..}x"-style format specifiers
......................................................................
Migrate EventLogging to "%{..}x"-style format specifiers
I introduced (and explained) "%{..}x"-style format specifiers in change
I07c6c7856 to mediawiki/extensions/EventLogging.git; see that change for my
rationale.
Change-Id: I2fbb5b74a1025598921c977ff9a221e1d4af251d
---
M manifests/role/eventlogging.pp
M modules/eventlogging/manifests/service/processor.pp
2 files changed, 11 insertions(+), 8 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/eventlogging.pp b/manifests/role/eventlogging.pp
index 7718475..e19719c 100644
--- a/manifests/role/eventlogging.pp
+++ b/manifests/role/eventlogging.pp
@@ -43,7 +43,7 @@
}
eventlogging::service::processor { 'server-side events':
- format => '%n EventLogging %j',
+ format => '%{seqId}d EventLogging %j',
input => "tcp://${processor}:8421",
output => 'tcp://*:8521',
}
@@ -59,7 +59,7 @@
}
eventlogging::service::processor { 'client-side events':
- format => '%q %l %n %t %h',
+ format => '%q %{recvFrom}s %{seqId}d %t %h %{userAgent}i',
input => "tcp://${processor}:8422",
output => 'tcp://*:8522',
}
diff --git a/modules/eventlogging/manifests/service/processor.pp
b/modules/eventlogging/manifests/service/processor.pp
index 98894ca..cb98388 100644
--- a/modules/eventlogging/manifests/service/processor.pp
+++ b/modules/eventlogging/manifests/service/processor.pp
@@ -10,12 +10,15 @@
# scanf-like format string, specifying the layout of EventLogging
# fields in raw log records. The available format specifiers are:
#
-# %h Client IP
-# %j JSON object
-# %l Hostname of origin
-# %n Sequence ID
-# %q Query-string-encoded JSON
-# %t Timestamp in NCSA format
+# %h Client IP
+# %j JSON object
+# %q Query-string-encoded JSON
+# %t Timestamp in NCSA format
+# %{..}i Tab-delimited string
+# %{..}s Space-delimited string
+# %{..}d Integer
+#
+# (Where '..' is the desired property name for the matching group.)
#
# All other parts of the format string are interpreted as Python
# regexp syntax. See <http://docs.python.org/2/library/re.html>
--
To view, visit https://gerrit.wikimedia.org/r/113470
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fbb5b74a1025598921c977ff9a221e1d4af251d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
