fluent-plugin-td 0.10.12 → 0.10.13

data/ChangeLog

@@ -1,4 +1,9 @@
 
+Release 0.10.13 - 2012/12/02
+
+  * Normalize invalid database/table names instead of raising errors
+
+
 Release 0.10.12 - 2012/10/15
 
   * Overwrite buffer_chunk_limit to 32MB

data/VERSION

@@ -1 +1 @@
-0.10.12
+0.10.13

data/example.conf

@@ -1,14 +1,30 @@
+####
+## Output descriptions:
+##
 
-## match tag=apache.access and upload to Treasure Data
-#<match apache.access>
-#  type tdlog
-#  apikey APIKEY
-#</match>
+# Treasure Data output
+# match events whose tag is td.DATABASE.TABLE
+<match td.*.*>
+  type tdlog
+  apikey YOUR_API_KEY
 
+  auto_create_table
+  buffer_type file
+  buffer_path /var/log/td-agent/buffer/td
+</match>
+
+## match tag=debug.** and dump to console
+<match debug.**>
+  type stdout
+</match>
+
+####
+## Source descriptions:
+##
 
 ## built-in TCP input
 <source>
-  type tcp
+  type forward
 </source>
 
 ## built-in UNIX socket input
@@ -17,62 +33,64 @@
 #</source>
 
 # HTTP input
-# http://localhost:8888/<tag>?json=<json>
+# POST http://localhost:8888/<tag>?json=<json>
+# POST http://localhost:8888/td.myapp.login?json={"user"%3A"me"}
 <source>
   type http
   port 8888
 </source>
 
+## live debugging agent
+<source>
+  type debug_agent
+  bind 127.0.0.1
+  port 24230
+</source>
+
+####
+## Examples:
+##
+
 ## File input
-## read apache logs with tag=apache.access
+## read apache logs continuously and tags td.apache.access
 #<source>
 #  type tail
 #  format apache
 #  path /var/log/httpd-access.log
-#  tag apache.access
+#  tag td.apache.access
 #</source>
 
-
-## match tag=apache.access and write to file
-#<match apache.access>
+## File output
+## match tag=local.** and write to file
+#<match local.**>
 #  type file
 #  path /var/log/td-agent/access
 #</match>
 
-## match tag=debug.** and dump to console
-<match debug.**>
-  type stdout
-</match>
-
+## Forwarding
 ## match tag=system.** and forward to another td-agent server
 #<match system.**>
-#  type tcp
+#  type forward
 #  host 192.168.0.11
+#  # secondary host is optional
 #  <secondary>
 #    host 192.168.0.12
 #  </secondary>
 #</match>
 
-## match tag=myapp.** and forward and write to file
-#<match myapp.**>
+## Multiple output
+## match tag=td.*.* and output to Treasure Data AND file
+#<match td.*.*>
 #  type copy
 #  <store>
-#    type tcp
-#    host 192.168.0.13
+#    type tdlog
+#    apikey API_KEY
+#    auto_create_table
 #    buffer_type file
-#    buffer_path /var/log/td-agent/myapp-forward
-#    retry_limit 50
-#    flush_interval 10s
+#    buffer_path /var/log/td-agent/buffer/td
 #  </store>
 #  <store>
 #    type file
-#    path /var/log/td-agent/myapp
+#    path /var/log/td-agent/td-%Y-%m-%d/%H.log
 #  </store>
 #</match>
-
-## match not matched logs and write to file
-#<match **>
-#  type file
-#  path /var/log/td-agent/else/%Y-%m-%d/%H.log
-#</match>
-

data/lib/fluent/plugin/out_tdlog.rb

@@ -129,12 +129,12 @@ class TreasureDataLogOutput < BufferedOutput
         raise ConfigError, "'database' and 'table' parameter are required on tdlog output"
       end
       begin
-        TreasureData::API.normalize_database_name(database)
+        TreasureData::API.validate_database_name(database)
       rescue
         raise ConfigError, "Invalid database name #{database.inspect}: #{$!}: #{conf}"
       end
       begin
-        TreasureData::API.normalize_table_name(table)
+        TreasureData::API.validate_table_name(table)
       rescue
         raise ConfigError, "Invalid table name #{table.inspect}: #{$!}: #{conf}"
       end
@@ -179,8 +179,8 @@ class TreasureDataLogOutput < BufferedOutput
       key = @key
     else
       database, table = tag.split('.')[-2,2]
-      TreasureData::API.normalize_database_name(database)
-      TreasureData::API.normalize_table_name(table)
+      database = TreasureData::API.normalize_database_name(database)
+      table = TreasureData::API.normalize_table_name(table)
       key = "#{database}.#{table}"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-td
 version: !ruby/object:Gem::Version
-  version: 0.10.12
+  version: 0.10.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-15 00:00:00.000000000 Z
+date: 2012-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd