fluent-plugin-google-cloud 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef4989cf52201417aaa16cd77abc9680b55ddab7
-  data.tar.gz: 4c313c6fbe55b6c17c2eaec8b5c756c947135cab
+  metadata.gz: 494526c8a4880080e9176ccd912a4692d773fb67
+  data.tar.gz: 008470c8bc3aeab7f902bfd159e030b2dbfafee1
 SHA512:
-  metadata.gz: f50bd833b6b65548f439a5493f802fe99b266479d077a68abc4fec52e1f04b6223967344eabed170eb1a846525a5ab16e0dbc3b60df6638eaafa1f172c1c76e1
-  data.tar.gz: 4744b04e0a82268535afc934cf2c3a8af71b409fe9ca45f2b4f88f6777e1e80d72e65860ac7a48288c58809120dab1715cbd46287609a4832eea4f68d0287cd8
+  metadata.gz: aaabfa2e76c33959ab2d68c21380d73ce1e315bef2556fdd99b9772fc9cdb33c0d7ea8632a3742f17a9641e44c5e45914eab1ba49ebf035cd02f324ab0984a81
+  data.tar.gz: c86c292744824fd8163e08daaefbd034baaaf91ca1c422b68caed7ab3835578070a694c59dbc1cc5adb85c55cf87eadfefbca28cae1b801f8543bdf70426c70a

data/Gemfile.lock

@@ -10,7 +10,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.3)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -24,7 +24,7 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    cool.io (1.3.1)
+    cool.io (1.4.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     extlib (0.9.16)
@@ -64,7 +64,7 @@ GEM
     jwt (1.5.1)
     launchy (2.4.3)
       addressable (~> 2.3)
-    little-plugger (1.1.3)
+    little-plugger (1.1.4)
     logging (2.0.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)

data/fluent-plugin-google-cloud.gemspec

@@ -10,7 +10,7 @@ eos
   gem.homepage      = \
     'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache 2.0'
-  gem.version       = '0.4.6'
+  gem.version       = '0.4.7'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
 

data/lib/fluent/plugin/out_google_cloud.rb

@@ -62,6 +62,14 @@ module Fluent
     config_param :vm_id, :string, :default => nil
     config_param :vm_name, :string, :default => nil
 
+    # Whether to try to detect of the VM is owned by a "subservice" such as App
+    # Engine of Kubernetes, rather than just associating the logs with the
+    # compute service of the platform. This currently only has any effect when
+    # running on GCE.
+    # The initial motivation for this is to separate out Kubernetes node
+    # component (Docker, Kubelet, etc.) logs from container logs.
+    config_param :detect_subservice, :bool, :default => true
+
     # label_map (specified as a JSON object) is an unordered set of fluent
     # field names whose values are sent as labels rather than as part of the
     # struct payload.
@@ -186,34 +194,37 @@ module Fluent
       case @platform
       when Platform::GCE
         @service_name = COMPUTE_SERVICE
-        # Check for specialized GCE environments (Managed VM or Dataflow).
-        # TODO: Add config options for these to allow for running outside GCE?
-        attributes = fetch_gce_metadata('instance/attributes/').split
-        if attributes.include?('gae_backend_name') &&
-           attributes.include?('gae_backend_version')
-          # Managed VM
-          @running_on_managed_vm = true
-          @gae_backend_name =
-              fetch_gce_metadata('instance/attributes/gae_backend_name')
-          @gae_backend_version =
-              fetch_gce_metadata('instance/attributes/gae_backend_version')
-          @service_name = APPENGINE_SERVICE
-          common_labels["#{APPENGINE_SERVICE}/module_id"] = @gae_backend_name
-          common_labels["#{APPENGINE_SERVICE}/version_id"] =
-            @gae_backend_version
-        elsif attributes.include?('job_id')
-          # Dataflow
-          @service_name = DATAFLOW_SERVICE
-          @dataflow_job_id = fetch_gce_metadata('instance/attributes/job_id')
-          common_labels["#{DATAFLOW_SERVICE}/job_id"] = @dataflow_job_id
-        elsif attributes.include?('kube-env')
-          # Kubernetes/Container Engine
-          @service_name = CONTAINER_SERVICE
-          common_labels["#{CONTAINER_SERVICE}/instance_id"] = @vm_id
-          @raw_kube_env = fetch_gce_metadata('instance/attributes/kube-env')
-          @kube_env = YAML.load(@raw_kube_env)
-          common_labels["#{CONTAINER_SERVICE}/cluster_name"] =
-            cluster_name_from_kube_env(@kube_env)
+        if @detect_subservice
+          # Check for specialized GCE environments (Managed VM or Dataflow).
+          # TODO: Add config options for these to allow for running outside GCE?
+          attributes = fetch_gce_metadata('instance/attributes/').split
+          # Do nothing, just don't populate other service's labels.
+          if attributes.include?('gae_backend_name') &&
+             attributes.include?('gae_backend_version')
+            # Managed VM
+            @running_on_managed_vm = true
+            @gae_backend_name =
+                fetch_gce_metadata('instance/attributes/gae_backend_name')
+            @gae_backend_version =
+                fetch_gce_metadata('instance/attributes/gae_backend_version')
+            @service_name = APPENGINE_SERVICE
+            common_labels["#{APPENGINE_SERVICE}/module_id"] = @gae_backend_name
+            common_labels["#{APPENGINE_SERVICE}/version_id"] =
+              @gae_backend_version
+          elsif attributes.include?('job_id')
+            # Dataflow
+            @service_name = DATAFLOW_SERVICE
+            @dataflow_job_id = fetch_gce_metadata('instance/attributes/job_id')
+            common_labels["#{DATAFLOW_SERVICE}/job_id"] = @dataflow_job_id
+          elsif attributes.include?('kube-env')
+            # Kubernetes/Container Engine
+            @service_name = CONTAINER_SERVICE
+            common_labels["#{CONTAINER_SERVICE}/instance_id"] = @vm_id
+            @raw_kube_env = fetch_gce_metadata('instance/attributes/kube-env')
+            @kube_env = YAML.load(@raw_kube_env)
+            common_labels["#{CONTAINER_SERVICE}/cluster_name"] =
+              cluster_name_from_kube_env(@kube_env)
+          end
         end
         common_labels["#{COMPUTE_SERVICE}/resource_type"] = 'instance'
         common_labels["#{COMPUTE_SERVICE}/resource_id"] = @vm_id
@@ -569,7 +580,7 @@ module Fluent
     def init_api_client
       @client = Google::APIClient.new(
         application_name: 'Fluentd Google Cloud Logging plugin',
-        application_version: '0.4.6',
+        application_version: '0.4.7',
         retries: 1)
 
       if @auth_method == 'private_key'

data/test/plugin/test_out_google_cloud.rb

@@ -88,6 +88,10 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     use_metadata_service false
   )
 
+  NO_DETECT_SUBSERVICE_CONFIG = %(
+    detect_subservice false
+  )
+
   CUSTOM_METADATA_CONFIG = %(
     project_id #{CUSTOM_PROJECT_ID}
     zone #{CUSTOM_ZONE}
@@ -358,6 +362,16 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
     assert_equal false, d.instance.running_on_managed_vm
   end
 
+  def test_gce_used_when_detect_subservice_is_false
+    setup_gce_metadata_stubs
+    # This would cause the service to be container.googleapis.com if not for the
+    # detect_subservice=false config.
+    setup_container_metadata_stubs
+    d = create_driver(NO_DETECT_SUBSERVICE_CONFIG)
+    d.run
+    assert_equal COMPUTE_SERVICE_NAME, d.instance.service_name
+  end
+
   def test_metadata_overrides_on_gce
     # In this case we are overriding all configured parameters so we should
     # see all "custom" values rather than the ones from the metadata server.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd