mirror of
https://github.com/krislamo/puppet-fluentd
synced 2024-12-16 05:10:36 +00:00
Merge pull request #1 from pilchkinstein-gtv/source_parse_storage
Implemented <parse>, <storage> etc sections within fluentd::source template
This commit is contained in:
commit
59fb7919a2
16
README.md
16
README.md
@ -131,6 +131,14 @@ include '::fluentd'
|
||||
'type' => 'tail',
|
||||
'format' => 'json',
|
||||
'path' => '/var/log/test-application/*.json',
|
||||
'parse' => {
|
||||
'type' => 'regexp',
|
||||
'expression' => '^(?<name>[^ ]*) (?<user>[^ ]*) (?<age>\d*)$'
|
||||
},
|
||||
'storage'=> {
|
||||
'type' => 'local',
|
||||
'path' => 'test.pos'
|
||||
},
|
||||
'tag' => 'application.test'
|
||||
}
|
||||
}
|
||||
@ -142,6 +150,14 @@ include '::fluentd'
|
||||
type tail
|
||||
format json
|
||||
path /var/log/test-application/*.json
|
||||
<parse>
|
||||
type regexp
|
||||
expression ^(?<name>[^ ]*) (?<user>[^ ]*) (?<age>\d*)$
|
||||
</parse>
|
||||
<storage>
|
||||
type local
|
||||
path test.pos
|
||||
</storage>
|
||||
tag application.test
|
||||
</source>
|
||||
```
|
||||
|
@ -5,6 +5,14 @@
|
||||
'type' => 'tail',
|
||||
'format' => 'json',
|
||||
'path' => '/var/log/test-application/*.json',
|
||||
'parse' => {
|
||||
'type' => 'regexp',
|
||||
'expression' => '^(?<name>[^ ]*) (?<user>[^ ]*) (?<age>\d*)$'
|
||||
},
|
||||
'storage' => {
|
||||
'type' => 'local',
|
||||
'path' => 'test.pos'
|
||||
},
|
||||
'tag' => 'application.test'
|
||||
}
|
||||
}
|
||||
|
@ -18,6 +18,14 @@ describe 'fluentd::source' do
|
||||
'type' => 'tail',
|
||||
'format' => 'json',
|
||||
'path' => '/var/log/test-application/*.json',
|
||||
'parse' => {
|
||||
'type' => 'regexp',
|
||||
'expression' => '^(?<name>[^ ]*) (?<user>[^ ]*) (?<age>\d*)$'
|
||||
},
|
||||
'storage'=> {
|
||||
'type' => 'local',
|
||||
'path' => 'test.pos'
|
||||
},
|
||||
'tag' => 'application.test'
|
||||
}
|
||||
}
|
||||
|
8
spec/fixtures/files/source_tail.conf
vendored
8
spec/fixtures/files/source_tail.conf
vendored
@ -2,5 +2,13 @@
|
||||
type tail
|
||||
format json
|
||||
path /var/log/test-application/*.json
|
||||
<parse>
|
||||
type regexp
|
||||
expression ^(?<name>[^ ]*) (?<user>[^ ]*) (?<age>\d*)$
|
||||
</parse>
|
||||
<storage>
|
||||
type local
|
||||
path test.pos
|
||||
</storage>
|
||||
tag application.test
|
||||
</source>
|
||||
|
@ -1,5 +1,13 @@
|
||||
<source>
|
||||
<% @config.each do |key, val| -%>
|
||||
<%- if val.is_a?( Hash ) -%>
|
||||
<<%= key -%>>
|
||||
<%- val.each do |key2, val2| -%>
|
||||
<%= key2 -%> <%= val2 %>
|
||||
<%- end -%>
|
||||
</<%= key %>>
|
||||
<%- else -%>
|
||||
<%= key -%> <%= val %>
|
||||
<%- end -%>
|
||||
<% end -%>
|
||||
</source>
|
||||
|
Loading…
Reference in New Issue
Block a user