fluent-plugin-google-cloud 0.6.18 → 0.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d57de12626e44569ef8632b11d8f9be32d21e6ec
-  data.tar.gz: 7fdf443f3cf74396870514e283d41ed8d86c3426
+  metadata.gz: a6d301ee1e5098270379065a452a62e1764d322e
+  data.tar.gz: 973c4d138bd5ac58f44c21a49afc3146949446d4
 SHA512:
-  metadata.gz: 7c057a1068429f5954105063eaf40f6425c64dc72394696d7ecc7476c0feeebaa995d01338cf8dd3bd0e14625aca48a9ef0261f46f72b49ae46ce63af47ffe05
-  data.tar.gz: 48a2c5109b9719750e8216101a40d2e5b91bf4efbbad787b2d4d58c3e4954956de9187ed52366492586da193f7a6a52759fcbfaa22e9958a1098f74da8d9abd1
+  metadata.gz: 2d5120e4508b5d218241cdca371b878e64d2d8da6c1a97bc712f845363886e2a8cd96807bc2098ab55232bcf2c7f97b103766ae446b71adea874aa713af5e7db
+  data.tar.gz: b4a3e052be29fe201d6c7ca3a10893ad53a292fe09ad309e20a04cc7af979d12548b483a3ca72d51734125bc27a35fdefa123d8d315ad210b7b011408597f9d9

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.18'
+  gem.version       = '0.6.19'
   gem.authors       = ['Ling Huang', 'Igor Peshansky']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.2')

data/lib/fluent/plugin/out_google_cloud.rb

@@ -226,7 +226,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'.freeze
-    PLUGIN_VERSION = '0.6.18'.freeze
+    PLUGIN_VERSION = '0.6.19'.freeze
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'.freeze
@@ -258,6 +258,11 @@ module Fluent
     config_param :zone, :string, :default => nil
     config_param :vm_id, :string, :default => nil
     config_param :vm_name, :string, :default => nil
+    # Kubernetes-specific parameters, only used to override these values in
+    # the fallback path when the metadata agent is temporarily unavailable.
+    # They have to match the configuration of the metadata agent.
+    config_param :k8s_cluster_name, :string, :default => nil
+    config_param :k8s_cluster_location, :string, :default => nil
 
     # Map keys from a JSON payload to corresponding LogEntry fields.
     config_param :http_request_key, :string, :default =>
@@ -2181,7 +2186,7 @@ module Fluent
       begin
         @k8s_cluster_name ||= fetch_gce_metadata(
           'instance/attributes/cluster-name')
-        @k8s_location ||= fetch_gce_metadata(
+        @k8s_cluster_location ||= fetch_gce_metadata(
           'instance/attributes/cluster-location')
       rescue StandardError => e
         @log.error 'Failed to retrieve k8s cluster name and location.', \
@@ -2194,18 +2199,18 @@ module Fluent
           'pod_name' => pod_name,
           'container_name' => container_name,
           'cluster_name' => @k8s_cluster_name,
-          'location' => @k8s_location
+          'location' => @k8s_cluster_location
         }
         fallback_resource = GKE_CONSTANTS[:resource_type]
       when K8S_NODE_CONSTANTS[:resource_type]
         labels = {
           'node_name' => node_name,
           'cluster_name' => @k8s_cluster_name,
-          'location' => @k8s_location
+          'location' => @k8s_cluster_location
         }
         fallback_resource = COMPUTE_CONSTANTS[:resource_type]
       end
-      unless @k8s_cluster_name && @k8s_location
+      unless @k8s_cluster_name && @k8s_cluster_location
         @log.error "Failed to construct #{resource_type} resource locally." \
                    ' Falling back to writing logs against' \
                    " #{fallback_resource} resource.", error: e

data/test/plugin/base_test.rb

@@ -1310,28 +1310,28 @@ module BaseTest
       # k8s_container.
       # When enable_metadata_agent is false.
       {
-        enable_metadata_agent: false,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_metadata_agent_stub: false,
         setup_k8s_stub: false,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: false,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: false,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: false,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: false,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_metadata_agent_stub: false,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(log_entry(0)),
@@ -1339,28 +1339,35 @@ module BaseTest
       },
       # When enable_metadata_agent is true.
       {
-        enable_metadata_agent: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: false,
         setup_k8s_stub: false,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: false,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: K8S_CONTAINER_PARAMS_FROM_LOCAL
       },
       {
-        enable_metadata_agent: true,
+        config: CUSTOM_K8S_ENABLE_METADATA_AGENT_CONFIG,
+        setup_metadata_agent_stub: false,
+        setup_k8s_stub: false,
+        log_entry: k8s_container_log_entry(log_entry(0)),
+        expected_params: K8S_CONTAINER_PARAMS_CUSTOM
+      },
+      {
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: false,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: K8S_CONTAINER_PARAMS
       },
       {
-        enable_metadata_agent: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(log_entry(0)),
@@ -1368,7 +1375,7 @@ module BaseTest
       },
       # When local_resource_id is not present or does not match k8s regexes.
       {
-        enable_metadata_agent: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(
@@ -1376,7 +1383,7 @@ module BaseTest
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(
@@ -1388,21 +1395,28 @@ module BaseTest
       },
       # Specific cases for k8s_node.
       {
-        enable_metadata_agent: false,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_node_log_entry(log_entry(0)),
         expected_params: COMPUTE_PARAMS
       },
       {
-        enable_metadata_agent: true,
-        setup_metadata_agent_stub: true,
+        config: ENABLE_METADATA_AGENT_CONFIG,
+        setup_metadata_agent_stub: false,
         setup_k8s_stub: true,
         log_entry: k8s_node_log_entry(log_entry(0)),
-        expected_params: K8S_NODE_PARAMS
+        expected_params: K8S_NODE_PARAMS_FROM_LOCAL
       },
       {
-        enable_metadata_agent: true,
+        config: CUSTOM_K8S_ENABLE_METADATA_AGENT_CONFIG,
+        setup_metadata_agent_stub: false,
+        setup_k8s_stub: false,
+        log_entry: k8s_node_log_entry(log_entry(0)),
+        expected_params: K8S_NODE_PARAMS_CUSTOM
+      },
+      {
+        config: ENABLE_METADATA_AGENT_CONFIG,
         setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_node_log_entry(log_entry(0)),
@@ -1422,12 +1436,7 @@ module BaseTest
           setup_no_k8s_metadata_stubs
         end
         setup_logging_stubs do
-          config = if test_params[:enable_metadata_agent]
-                     ENABLE_METADATA_AGENT_CONFIG
-                   else
-                     APPLICATION_DEFAULT_CONFIG
-                   end
-          d = create_driver(config)
+          d = create_driver(test_params[:config])
           d.emit(test_params[:log_entry])
           d.run
         end

data/test/plugin/constants.rb

@@ -43,6 +43,9 @@ module Constants
   CUSTOM_FULLY_QUALIFIED_ZONE = "projects/#{PROJECT_ID}/zones/#{ZONE}".freeze
   CUSTOM_VM_ID = 'C9876543210'.freeze
   CUSTOM_HOSTNAME = 'custom.hostname.org'.freeze
+  # Kubernetes-specific attributes.
+  CUSTOM_K8S_CLUSTER_NAME = 'kubernetes-cluster'.freeze
+  CUSTOM_K8S_LOCATION = 'kubernetes-location'.freeze
 
   # Attributes used for the EC2 metadata service.
   EC2_PROJECT_ID = 'test-ec2-project-id'.freeze
@@ -257,6 +260,12 @@ module Constants
   CONFIG_MISSING_METADATA_ALL = %(
   ).freeze
 
+  CUSTOM_K8S_ENABLE_METADATA_AGENT_CONFIG = %(
+    enable_metadata_agent true
+    k8s_cluster_name #{CUSTOM_K8S_CLUSTER_NAME}
+    k8s_cluster_location #{CUSTOM_K8S_LOCATION}
+  ).freeze
+
   CONFIG_EC2_PROJECT_ID = %(
     project_id #{EC2_PROJECT_ID}
   ).freeze
@@ -441,6 +450,14 @@ module Constants
       )
     )
   ).freeze
+  K8S_CONTAINER_PARAMS_CUSTOM = K8S_CONTAINER_PARAMS.merge(
+    resource: K8S_CONTAINER_PARAMS[:resource].merge(
+      labels: K8S_CONTAINER_PARAMS[:resource][:labels].merge(
+        'cluster_name' => CUSTOM_K8S_CLUSTER_NAME,
+        'location' => CUSTOM_K8S_LOCATION
+      )
+    )
+  ).freeze
 
   # K8s Node.
   K8S_NODE_PARAMS = {
@@ -463,6 +480,14 @@ module Constants
       )
     )
   ).freeze
+  K8S_NODE_PARAMS_CUSTOM = K8S_NODE_PARAMS.merge(
+    resource: K8S_NODE_PARAMS[:resource].merge(
+      labels: K8S_NODE_PARAMS[:resource][:labels].merge(
+        'cluster_name' => CUSTOM_K8S_CLUSTER_NAME,
+        'location' => CUSTOM_K8S_LOCATION
+      )
+    )
+  ).freeze
 
   # Docker Container.
   DOCKER_CONTAINER_PARAMS = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.18
+  version: 0.6.19
 platform: ruby
 authors:
 - Ling Huang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd