embulk-output-influxdb 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c10ec1959bc7881942ba8c3e6a931c2873b224ee
-  data.tar.gz: b50bbf47ebd9ebd3946337cab7153b219091ecb0
+  metadata.gz: 868eadfe20f61efd5c534fcfce549721e3aff05e
+  data.tar.gz: 1ea3c8e4828316f494fd727e6487e5e8927faecc
 SHA512:
-  metadata.gz: 68fa2e1e642566fae94df91fe29905b43af498894d7749dffff1afc147640f091283430b40eb9d4e0b415e4a952795a68f670e4430b7f01e924c028d266ba2d5
-  data.tar.gz: 07a4b354f8fecd27a62f2b5445a6f3a09b0f9e6f3f8d86336c62e50821e522b05b80916c01dd66802e00ac74b7fbab9081d1a9d25bf276e73bcf3d9fa7c56926
+  metadata.gz: db3d70c5f4f7c123ffcc1fd0c846cd412ea2a5fd04db06945b9ac035fa559afd6d115966eaab601f4bf64f282d966776661ceb5c6ba09a97d03151c13abb3e38
+  data.tar.gz: 70b7dc8d8a14558c573d7fda5f63ab5fde14914d119275bd758f97aa494c06674de02441874e9b78b87dfba4bd8049f82bb320d79f3a8116affcacb503ca74ca

data/README.md

@@ -19,8 +19,10 @@
 - **series**:    series name (string, required) (can use column value placeholder. see example)
 - **mode**:     "insert", or "replace". See bellow. (string, default: insert)
 - **timestamp_column**: timestamp column (string, default: nil)
-- **ignore_columns**: ignore column names (array[string], default: nil)
+- **ignore_columns**: ignore column names (array[string], default: [])
+- **tag_columns**: tag column names (array[string], default: [])
 - **default_timezone**: default timezone for column (string, default: 'UTC')
+- **time_precision**: time precision (string, default: 's')
 
 ### Modes
 
@@ -38,6 +40,7 @@ out:
   password: root
   database: dbname
   series: ${key_name}_series
+  tag_columns: [name]
   timestamp_column: day
   mode: replace
   ignore_columns:
@@ -45,7 +48,6 @@ out:
 ```
 
 ## ToDo
-- tags support
 - column_options support
 
 ## Build

data/embulk-output-influxdb.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "embulk-output-influxdb"
-  spec.version       = "0.1.1"
+  spec.version       = "0.2.0"
   spec.authors       = ["joker1007"]
   spec.summary       = "InfluxDB output plugin for Embulk"
   spec.description   = "Dumps records to InfluxDB."

data/example.csv

@@ -1,13 +1,13 @@
-key_name,day,value
-new_clients,2015-08-22,1
-new_clients,2015-08-25,2
-new_clients,2015-08-26,3
-new_clients,2015-08-27,4
-new_clients,2015-08-28,10
-new_clients,2015-08-29,11
-new_clients,2015-09-01,12
-new_clients,2015-09-03,13
-new_clients,2015-09-05,21
-new_clients,2015-09-07,22
-new_clients,2015-09-11,23
-new_clients,2015-09-12,24
+key_name,day,value,name
+new_clients,2015-08-22,1,a
+new_clients,2015-08-25,2,b
+new_clients,2015-08-26,3,c
+new_clients,2015-08-27,4,a
+new_clients,2015-08-28,10,b
+new_clients,2015-08-29,11,c
+new_clients,2015-09-01,12,a
+new_clients,2015-09-03,13,b
+new_clients,2015-09-05,21,c
+new_clients,2015-09-07,22,a
+new_clients,2015-09-11,23,b
+new_clients,2015-09-12,24,c

data/example.yml

@@ -8,14 +8,16 @@ in:
       - {name: key_name, type: string}
       - {name: day, type: timestamp, format: '%Y-%m-%d'}
       - {name: new_clients, type: long}
+      - {name: name, type: string}
 
 out:
   type: influxdb
   username: root
   password: root
   database: dbname
-  # series: ${key_name}_series
-  series_per_column: true
+  series: ${key_name}_series
+  # series_per_column: true
+  tag_columns: [name]
   timestamp_column: day
   mode: replace
   ignore_columns:

data/lib/embulk/output/influxdb.rb

@@ -20,6 +20,7 @@ module Embulk
           "series_per_column" => config.param("series_per_column", :bool, default: false),
           "timestamp_column" => config.param("timestamp_column", :string, default: nil),
           "ignore_columns" => config.param("ignore_columns", :array, default: []),
+          "tag_columns" => config.param("tag_columns", :array, default: []),
           "default_timezone" => config.param("default_timezone", :string, default: "UTC"),
           "mode" => config.param("mode", :string, default: "insert"),
           "use_ssl" => config.param("use_ssl", :bool, default: false),
@@ -62,8 +63,10 @@ module Embulk
         @database = task["database"]
         @series = task["series"]
         @series_per_column = task["series_per_column"]
-        unless @series || @series_per_column
-          raise "Need series or series_per_column parameter"
+        @tag_columns = task["tag_columns"]
+        unless @series
+          raise "Need series or series_per_column parameter" unless @series_per_column
+          raise "Need series parameter when you specify tag_columns" unless @tag_columns.empty?
         end
         if task["timestamp_column"]
           @timestamp_column = schema.find { |col| col.name == task["timestamp_column"] }
@@ -111,10 +114,13 @@ module Embulk
           payload = {
             series: series,
             values: Hash[
-              target_columns.map { |col| [col.name, convert_timezone(record[col.index])] }
+              target_value_columns.map { |col| [col.name, convert_timezone(record[col.index])] }
+            ],
+            tags: Hash[
+              target_tag_columns.map { |col| [col.name, convert_timezone(record[col.index])] }
             ],
           }
-          payload[:timestamp] = convert_timezone(record[@timestamp_column.index]).to_i if @timestamp_column
+          payload[:timestamp] = unixtime(convert_timezone(record[@timestamp_column.index])) if @timestamp_column
           payload
         end
       end
@@ -128,7 +134,7 @@ module Embulk
               series: series,
               values: {value: record[col.index]},
             }
-            payload[:timestamp] = convert_timezone(record[@timestamp_column.index]).to_i if @timestamp_column
+            payload[:timestamp] = unixtime(convert_timezone(record[@timestamp_column.index])) if @timestamp_column
             payload
           end
         end
@@ -168,12 +174,32 @@ module Embulk
         end
       end
 
+      def target_value_columns
+        target_columns.reject do |col|
+          @tag_columns.include?(col.name)
+        end
+      end
+
+      def target_tag_columns
+        target_columns.select do |col|
+          @tag_columns.include?(col.name)
+        end
+      end
+
       def convert_timezone(value)
         return value unless value.is_a?(Time)
 
         timezone = Timezone::Zone.new(zone: @default_timezone)
         timezone.time(value)
       end
+
+      def unixtime(time)
+        if @time_precision == 'u'
+          format("%d%06d", time.to_i, time.usec).to_i
+        else
+          time.to_i
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-influxdb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - joker1007
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: embulk
@@ -136,4 +136,3 @@ signing_key:
 specification_version: 4
 summary: InfluxDB output plugin for Embulk
 test_files: []
-has_rdoc: