Update metadata.json

Implemented <parse>, <storage> etc sections within fluentd::source template

README.md

@@ -1,6 +1,6 @@
-# wywy/fluentd Puppet Module
+# pilchkinstein-gtv/fluentd Puppet Module
 
-[![GitHub version](https://badge.fury.io/gh/wywy%2Fpuppet-fluentd.svg)](https://github.com/wywy/puppet-fluentd)
+[![GitHub version](https://badge.fury.io/gh/wywy%2Fpuppet-fluentd.svg)](https://github.com/pilchkinstein-gtv/puppet-fluentd)
 [![Build Status](https://travis-ci.org/wywy/puppet-fluentd.svg?branch=master)](https://travis-ci.org/wywy/puppet-fluentd)
 
 
@@ -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>
 ```

examples/source.pp

@@ -2,9 +2,17 @@
 ::fluentd::source { 'test':
   priority => 10,
   config   => {
-    'type'   => 'tail',
+    'type'    => 'tail',
-    'format' => 'json',
+    'format'  => 'json',
-    'path'   => '/var/log/test-application/*.json',
+    'path'    => '/var/log/test-application/*.json',
-    'tag'    => 'application.test'
+    'parse'   => {
+        'type'       => 'regexp',
+        'expression' => '^(?<name>[^ ]*) (?<user>[^ ]*) (?<age>\d*)$'
+    },
+    'storage' => {
+      'type' => 'local',
+      'path' => 'test.pos'
+    },
+    'tag'     => 'application.test'
   }
 }

metadata.json

@@ -1,12 +1,12 @@
 {
-  "name": "wycore-fluentd",
+  "name": "pilchkinstein-fluentd",
   "version": "1.0.0",
-  "author": "wywy",
+  "author": "pilchkinstein-gtv",
   "summary": "Generic module for fluentd (td-agent).",
   "license": "Apache-2.0",
-  "source": "https://github.com/wycore/puppet-fluentd",
+  "source": "https://github.com/pilchkinstein-gtv/puppet-fluentd",
-  "project_page": "https://github.com/wycore/puppet-fluentd",
+  "project_page": "https://github.com/pilchkinstein-gtv/puppet-fluentd",
-  "issues_url": "https://github.com/wycore/puppet-fluentd/issues",
+  "issues_url": "https://github.com/pilchkinstein-gtv/puppet-fluentd/issues",
   "tags": ["fluentd", "td-agent"],
   "operatingsystem_support": [
     {

spec/defines/source_spec.rb

@@ -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'
               }
           }

spec/fixtures/files/source_tail.conf

@@ -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>

templates/source.erb

@@ -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>