fluent-plugin-google-cloud 0.6.4.pre.2 → 0.6.4.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e87c18a3faae1b0b748c947487bac806f9af22ff
-  data.tar.gz: 7aa3fb16a6625f55e86dd7a1b2b983ce090b0803
+  metadata.gz: dacc67fcefff073a113c1c73ef7644ae802916e9
+  data.tar.gz: b2caa333b793ae00c8541e8b0c475fd0e71824a3
 SHA512:
-  metadata.gz: 16e3e4c2db4dc5dccc26c403bd1a64802afa7fd97fa0a9bdc3109a583d865c594958efeb7e769a7aa45987d237f4842ecadb18280c6c6adc87ee6bee2a1a34b6
-  data.tar.gz: 07a36c3637028e394f84f01baa05650f6d8db4260db6b64dae92ff7d1f4b6af6bca3173162bcbb588dffbc765e9426c24588ef30523d1dd29e0f6f1ca13d502c
+  metadata.gz: ee282c69851a0bf8dee3e2110f7a6635016c573af24f1b0757cf8d0a541b2396560976e8a064950087fc601a90441983dabb6312465d7873f90509236047717c
+  data.tar.gz: 5142fb67ba45c13759dfdd79d15f7e1cbfdf1a354da1423c2442bffc21003a1177410cbd8cb6c85495b9a501a3a74ea70a8dd1c87397199d38c1b7d74810640a

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.6.4.pre.2'
+  gem.version       = '0.6.4.pre.3'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')
@@ -19,7 +19,7 @@ eos
   gem.test_files    = gem.files.grep(/^(test)/)
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'excon', '~> 0.56.0'
+  gem.add_runtime_dependency 'excon', '~> 0.57.1'
   gem.add_runtime_dependency 'fluentd', '~> 0.10'
   gem.add_runtime_dependency 'googleapis-common-protos', '~> 1.3'
   gem.add_runtime_dependency 'google-api-client', '~> 0.9.0'

data/lib/fluent/plugin/out_google_cloud.rb

@@ -85,6 +85,11 @@ module Fluent
       # resource can be implicitly inferred by Metadata Agent.
       IMPLICIT_MONITORED_RESOURCE_UNIQUE_KEY = ''
 
+      # The label name of locally unique id in the json payload. When a record
+      # has this field in the payload, we will use the value to retrieve
+      # monitored resource from Stackdriver Metadata agent.
+      LOCALLY_UNIQUE_ID_LABEL_NAME = 'logging.googleapis.com/locally_unique_id'
+
       # Docker container support.
       DEFAULT_DOCKER_API_SOCKET_PATH = '/var/run/docker.sock'
     end
@@ -94,7 +99,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'
-    PLUGIN_VERSION = '0.6.4.pre.2'
+    PLUGIN_VERSION = '0.6.4.pre.3'
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'
@@ -362,6 +367,10 @@ module Fluent
       grouped_entries = {}
       chunk.msgpack_each do |tag, *arr|
         sanitized_tag = sanitize_tag(tag)
+        @log.error("tag is: ")
+        @log.error(tag.inspect)
+        @log.error("arr is: ")
+        @log.error(arr.inspect)
         if sanitized_tag.nil?
           @log.warn "Dropping log entries with invalid tag: '#{tag}'. " \
                     'A tag should be a string with utf8 characters.'
@@ -880,12 +889,9 @@ module Fluent
         labels["#{COMPUTE_CONSTANTS[:service]}/resource_name"] = @vm_name
         labels["#{COMPUTE_CONSTANTS[:service]}/zone"] = @zone
 
-      # GCE.
-      when COMPUTE_CONSTANTS[:resource_type]
-        labels["#{COMPUTE_CONSTANTS[:service]}/resource_name"] = @vm_name
-
-      # GKE container.
-      when CONTAINER_CONSTANTS[:resource_type]
+      # GCE and GKE container.
+      when COMPUTE_CONSTANTS[:resource_type],
+           CONTAINER_CONSTANTS[:resource_type]
         labels["#{COMPUTE_CONSTANTS[:service]}/resource_name"] = @vm_name
 
       # Cloud Dataflow and Cloud Dataproc.
@@ -1099,36 +1105,35 @@ module Fluent
       resource_labels = {}
       common_labels = {}
 
-      if record.key?("#{CONTAINER_CONSTANTS[:service]}/namespace_id") &&
-         record.key?("#{CONTAINER_CONSTANTS[:service]}/pod_name") &&
-         record.key?("#{CONTAINER_CONSTANTS[:service]}/container_name")
-        if @enable_metadata_agent
-          # Call Metadata Agent with "gke_containerName.<namespace_id>.
-          # <pod_name>.<container_name>" as the locally-unique key to retrieve
-          # monitored resource.
-          locally_unique_id = 'gke_containerName.' \
-            "#{record["#{CONTAINER_CONSTANTS[:service]}/namespace_id"]}." \
-            "#{record["#{CONTAINER_CONSTANTS[:service]}/pod_name"]}." \
-            "#{record["#{CONTAINER_CONSTANTS[:service]}/container_name"]}"
-          @log.debug 'Calling metadata agent with locally unique id: ' \
-                    "#{locally_unique_id}."
-          retrieved_resource = call_metadata_agent_for_monitored_resource(
-            locally_unique_id)
-          @log.debug 'Retrieved monitored resource from metadata agent: ' \
-                    "#{retrieved_resource.inspect}."
-          unless retrieved_resource.nil?
-            # Temporarily renaming 'gke_container' to 'container'.
-            # resource_type = retrieved_resource.type
-            resource_type = 'container'
-            # If we successfully get a monitored resource from Metadata Agent,
-            # use this one instead of the original VM-level monitored resource.
-            resource_labels = retrieved_resource.labels.dup
-            record.delete("#{CONTAINER_CONSTANTS[:service]}/namespace_id")
-            record.delete("#{CONTAINER_CONSTANTS[:service]}/pod_name")
-            record.delete("#{CONTAINER_CONSTANTS[:service]}/container_name")
-            @log.debug 'Retrieved gke monitored resource from Metadata ' \
-                       "Agent: ' #{retrieved_resource.inspect}."
-          end
+      # The format of the locally unique key varies by monitored resource.
+      #
+      # Docker container:
+      #   "container.<container_id>"
+      #   "containerName.<container_name>"
+      # GKE container:
+      #   "gke_containerName.<namespace_id>.<pod_name>.<container_name>"
+      if @enable_metadata_agent && record.key?(LOCALLY_UNIQUE_ID_LABEL_NAME)
+        # Call Metadata Agent with "gke_containerName.<namespace_id>.
+        # <pod_name>.<container_name>" as the locally-unique key to retrieve
+        # monitored resource.
+        locally_unique_id = record[LOCALLY_UNIQUE_ID_LABEL_NAME]
+        @log.debug 'Calling metadata agent with locally unique id: ' \
+                  "#{locally_unique_id}."
+        retrieved_resource = call_metadata_agent_for_monitored_resource(
+          locally_unique_id)
+        @log.debug 'Retrieved monitored resource from metadata agent: ' \
+                  "#{retrieved_resource.inspect}."
+        unless retrieved_resource.nil?
+          resource_type = retrieved_resource.type
+          # Temporarily renaming 'gke_container' to 'container'.
+          resource_type = 'container' if resource_type == 'gke_container'
+          # If we successfully get a monitored resource from Metadata Agent,
+          # use this one instead of the original VM-level monitored resource.
+          resource_labels = retrieved_resource.labels.dup
+          record.delete(LOCALLY_UNIQUE_ID_LABEL_NAME)
+          @log.debug 'Retrieved gke_container monitored resource from' \
+                     'Stackdriver Metadata agent: ' \
+                     "#{retrieved_resource.inspect}."
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.4.pre.2
+  version: 0.6.4.pre.3
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: 0.57.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: 0.57.1
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +212,6 @@ extra_rdoc_files: []
 files:
 - CONTRIBUTING
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile

data/Gemfile.lock

@@ -1,157 +0,0 @@
-PATH
-  remote: .
-  specs:
-    fluent-plugin-google-cloud (0.6.4.pre.2)
-      excon (~> 0.56.0)
-      fluentd (~> 0.10)
-      google-api-client (~> 0.9.0)
-      google-cloud-logging (~> 0.23.2)
-      googleapis-common-protos (~> 1.3)
-      googleauth (~> 0.4)
-      grpc (~> 1.0, < 1.3)
-      json (~> 1.8)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    ast (2.3.0)
-    astrolabe (1.3.1)
-      parser (~> 2.2)
-    cool.io (1.5.0)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    excon (0.56.0)
-    faraday (0.12.1)
-      multipart-post (>= 1.2, < 3)
-    fluentd (0.14.19)
-      cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
-      msgpack (>= 0.7.0, < 2.0.0)
-      serverengine (>= 2.0.4, < 3.0.0)
-      sigdump (~> 0.2.2)
-      strptime (~> 0.1.7)
-      tzinfo (~> 1.0)
-      tzinfo-data (~> 1.0)
-      yajl-ruby (~> 1.0)
-    google-api-client (0.9.28)
-      addressable (~> 2.3)
-      googleauth (~> 0.5)
-      httpclient (~> 2.7)
-      hurley (~> 0.1)
-      memoist (~> 0.11)
-      mime-types (>= 1.6)
-      representable (~> 2.3.0)
-      retriable (~> 2.0)
-    google-cloud-core (0.21.1)
-      googleauth (~> 0.5.1)
-    google-cloud-logging (0.23.2)
-      google-cloud-core (~> 0.21.1)
-      google-gax (~> 0.6.0)
-      google-protobuf (~> 3.0)
-      googleapis-common-protos (~> 1.3)
-      grpc (~> 1.0)
-      orderedhash (= 0.0.6)
-      stackdriver-core (~> 0.21.0)
-    google-gax (0.6.0)
-      googleapis-common-protos (~> 1.3.1)
-      googleauth (~> 0.5.1)
-      grpc (~> 1.0)
-      rly (~> 0.2.3)
-    google-protobuf (3.3.0)
-    googleapis-common-protos (1.3.5)
-      google-protobuf (~> 3.2)
-      grpc (~> 1.0)
-    googleauth (0.5.1)
-      faraday (~> 0.9)
-      jwt (~> 1.4)
-      logging (~> 2.0)
-      memoist (~> 0.12)
-      multi_json (~> 1.11)
-      os (~> 0.9)
-      signet (~> 0.7)
-    grpc (1.2.5)
-      google-protobuf (~> 3.1)
-      googleauth (~> 0.5.1)
-    hashdiff (0.3.4)
-    http_parser.rb (0.6.0)
-    httpclient (2.8.3)
-    hurley (0.2)
-    json (1.8.6)
-    jwt (1.5.6)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    memoist (0.16.0)
-    metaclass (0.0.4)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mocha (1.2.1)
-      metaclass (~> 0.0.1)
-    msgpack (1.1.0)
-    multi_json (1.12.1)
-    multipart-post (2.0.0)
-    orderedhash (0.0.6)
-    os (0.9.6)
-    parser (2.4.0.0)
-      ast (~> 2.2)
-    power_assert (1.0.2)
-    powerpack (0.1.1)
-    public_suffix (2.0.5)
-    rainbow (2.2.2)
-      rake
-    rake (10.5.0)
-    representable (2.3.0)
-      uber (~> 0.0.7)
-    retriable (2.1.0)
-    rly (0.2.3)
-    rubocop (0.35.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.3.0, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.7)
-      tins (<= 1.6.0)
-    ruby-progressbar (1.8.1)
-    safe_yaml (1.0.4)
-    serverengine (2.0.5)
-      sigdump (~> 0.2.2)
-    sigdump (0.2.4)
-    signet (0.7.3)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (~> 1.5)
-      multi_json (~> 1.10)
-    stackdriver-core (0.21.0)
-    strptime (0.1.9)
-    test-unit (3.2.5)
-      power_assert
-    thread_safe (0.3.6)
-    tins (1.6.0)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2017.2)
-      tzinfo (>= 1.0.0)
-    uber (0.0.15)
-    webmock (1.24.6)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    yajl-ruby (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  fluent-plugin-google-cloud!
-  mocha (~> 1.1)
-  rake (~> 10.3)
-  rubocop (~> 0.35.0)
-  test-unit (~> 3.0)
-  webmock (~> 1.17)
-
-BUNDLED WITH
-   1.15.2