Updated Branches: refs/heads/flume-1.5 7fc23d7d4 -> b7ef76b16
FLUME-2065. Regex Extractor Interceptor config agent name inconsistent with rest of docs (Ashish Paliwal via Roshan Naik) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/b7ef76b1 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/b7ef76b1 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/b7ef76b1 Branch: refs/heads/flume-1.5 Commit: b7ef76b16bc4b585341a54876a9272dc5c6e758c Parents: 7fc23d7 Author: Roshan Naik <[email protected]> Authored: Wed Nov 6 19:30:42 2013 -0800 Committer: Roshan Naik <[email protected]> Committed: Wed Nov 6 19:32:07 2013 -0800 ---------------------------------------------------------------------- flume-ng-doc/sphinx/FlumeUserGuide.rst | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/b7ef76b1/flume-ng-doc/sphinx/FlumeUserGuide.rst ---------------------------------------------------------------------- diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst index 3a3038c..aae63b7 100644 --- a/flume-ng-doc/sphinx/FlumeUserGuide.rst +++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst @@ -2744,11 +2744,11 @@ If the Flume event body contained ``1:2:3.4foobar5`` and the following configura .. code-block:: properties - agent.sources.r1.interceptors.i1.regex = (\\d):(\\d):(\\d) - agent.sources.r1.interceptors.i1.serializers = s1 s2 s3 - agent.sources.r1.interceptors.i1.serializers.s1.name = one - agent.sources.r1.interceptors.i1.serializers.s2.name = two - agent.sources.r1.interceptors.i1.serializers.s3.name = three + a1.sources.r1.interceptors.i1.regex = (\\d):(\\d):(\\d) + a1.sources.r1.interceptors.i1.serializers = s1 s2 s3 + a1.sources.r1.interceptors.i1.serializers.s1.name = one + a1.sources.r1.interceptors.i1.serializers.s2.name = two + a1.sources.r1.interceptors.i1.serializers.s3.name = three The extracted event will contain the same body but the following headers will have been added ``one=>1, two=>2, three=>3`` @@ -2759,11 +2759,11 @@ If the Flume event body contained ``2012-10-18 18:47:57,614 some log line`` and .. code-block:: properties - agent.sources.r1.interceptors.i1.regex = ^(?:\\n)?(\\d\\d\\d\\d-\\d\\d-\\d\\d\\s\\d\\d:\\d\\d) - agent.sources.r1.interceptors.i1.serializers = s1 - agent.sources.r1.interceptors.i1.serializers.s1.type = org.apache.flume.interceptor.RegexExtractorInterceptorMillisSerializer - agent.sources.r1.interceptors.i1.serializers.s1.name = timestamp - agent.sources.r1.interceptors.i1.serializers.s1.pattern = yyyy-MM-dd HH:mm + a1.sources.r1.interceptors.i1.regex = ^(?:\\n)?(\\d\\d\\d\\d-\\d\\d-\\d\\d\\s\\d\\d:\\d\\d) + a1.sources.r1.interceptors.i1.serializers = s1 + a1.sources.r1.interceptors.i1.serializers.s1.type = org.apache.flume.interceptor.RegexExtractorInterceptorMillisSerializer + a1.sources.r1.interceptors.i1.serializers.s1.name = timestamp + a1.sources.r1.interceptors.i1.serializers.s1.pattern = yyyy-MM-dd HH:mm the extracted event will contain the same body but the following headers will have been added ``timestamp=>1350611220000``
