Skip to content

Commit ad4f7a2

Browse files
committed
Merge fluent#51 into kustomize-base
2 parents 4252f35 + f711675 commit ad4f7a2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

fluent-bit-config-kafka-rest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ data:
6161
[PARSER]
6262
Name nginx
6363
Format regex
64-
Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
64+
Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")
6565
Time_Key time
6666
Time_Format %d/%b/%Y:%H:%M:%S %z
6767

output/elasticsearch/fluent-bit-configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ data:
7979
[PARSER]
8080
Name nginx
8181
Format regex
82-
Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
82+
Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")
8383
Time_Key time
8484
Time_Format %d/%b/%Y:%H:%M:%S %z
8585

output/kafka/fluent-bit-configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ data:
8484
[PARSER]
8585
Name nginx
8686
Format regex
87-
Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")?$
87+
Regex ^(?<remote>[^ ]*) (?<host>[^ ]*) (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^\"]*?)(?: +\S*)?)?" (?<code>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)")
8888
Time_Key time
8989
Time_Format %d/%b/%Y:%H:%M:%S %z
9090

0 commit comments

Comments
 (0)