fluent-plugin-google-cloud 0.1.1 → 0.1.2

data/fluent-plugin-google-cloud.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-google-cloud'
-  gem.description   = %q{Fluentd plugin to stream logs to the Google Cloud Platform's logs API, which will make them viewable in the Developer Console's log viewer and can optionally store them in Google Cloud Storage and/or BigQuery. This is an official Google Ruby gem.}
-  gem.summary       = %q{Fluentd plugin to stream logs to the Google Cloud Platform's logs API}
+  gem.description   = %q{Fluentd plugin to stream logs to the Google Cloud Platform's logging API, which will make them viewable in the Developer Console's log viewer and can optionally store them in Google Cloud Storage and/or BigQuery. This is an official Google Ruby gem.}
+  gem.summary       = %q{Fluentd plugin to stream logs to the Google Cloud Platform's logging API}
   gem.homepage      = 'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache 2.0'
-  gem.version       = '0.1.1'
+  gem.version       = '0.1.2'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
 

data/lib/fluent/plugin/out_google_cloud.rb

@@ -19,6 +19,7 @@ module Fluent
     # Constants for Google service names.
     APPENGINE_SERVICE = 'appengine.googleapis.com'
     COMPUTE_SERVICE = 'compute.googleapis.com'
+    DATAFLOW_SERVICE = 'dataflow.googleapis.com'
 
     # Legal values:
     # 'compute_engine_service_account' - Use the service account automatically
@@ -92,10 +93,6 @@ module Fluent
       @vm_id = fetch_metadata('instance/id')
       # TODO: Send instance tags and/or hostname with the logs as well?
       @common_labels = []
-      add_label(common_labels, "#{COMPUTE_SERVICE}/resource_type",
-                'strValue', 'instance')
-      add_label(common_labels, "#{COMPUTE_SERVICE}/resource_id",
-                'strValue', @vm_id)
 
       # If this is running on a Managed VM, grab the relevant App Engine
       # metadata as well.
@@ -114,10 +111,23 @@ module Fluent
                   'strValue', @gae_backend_name)
         add_label(common_labels, "#{APPENGINE_SERVICE}/version_id",
                   'strValue', @gae_backend_version)
+      elsif (attributes.include?('job_id'))
+        @running_on_managed_vm = false
+        @service_name = DATAFLOW_SERVICE
+        @dataflow_job_id = fetch_metadata('instance/attributes/job_id')
+        add_label(common_labels, "#{DATAFLOW_SERVICE}/job_id",
+                  'strValue', @dataflow_job_id)
       else
         @running_on_managed_vm = false
         @service_name = COMPUTE_SERVICE
       end
+
+      if (@service_name != DATAFLOW_SERVICE)
+        add_label(common_labels, "#{COMPUTE_SERVICE}/resource_type",
+                  'strValue', 'instance')
+        add_label(common_labels, "#{COMPUTE_SERVICE}/resource_id",
+                  'strValue', @vm_id)
+      end
     end
 
     def shutdown
@@ -217,7 +227,7 @@ module Fluent
     def init_api_client
       @client = Google::APIClient.new(
         :application_name => 'Fluentd Google Cloud Logging plugin',
-        :application_version => '0.1.1',
+        :application_version => '0.1.2',
         :retries => 1)
 
       if @auth_method == 'private_key'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -76,10 +76,10 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.17.0
-description: Fluentd plugin to stream logs to the Google Cloud Platform's logs API,
-  which will make them viewable in the Developer Console's log viewer and can optionally
-  store them in Google Cloud Storage and/or BigQuery. This is an official Google Ruby
-  gem.
+description: Fluentd plugin to stream logs to the Google Cloud Platform's logging
+  API, which will make them viewable in the Developer Console's log viewer and can
+  optionally store them in Google Cloud Storage and/or BigQuery. This is an official
+  Google Ruby gem.
 email:
 - salty@google.com
 executables: []
@@ -119,7 +119,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Fluentd plugin to stream logs to the Google Cloud Platform's logs API
+summary: Fluentd plugin to stream logs to the Google Cloud Platform's logging API
 test_files:
 - test/helper.rb
 - test/plugin/data/c31e573fd7f62ed495c9ca3821a5a85cb036dee1-privatekey.p12