fluent-plugin-google-cloud 0.6.17 → 0.6.18.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '03907dea1776a461bfedccdc6bc8c05fa099e557'
-  data.tar.gz: 81d1c2a217900442793ae78dccf58ccafc88d21e
+  metadata.gz: 96a5943e560b95ee0e8427efb2eef06d17218f75
+  data.tar.gz: 944c1f9d6391f286a00024ad69a433725b82bdd5
 SHA512:
-  metadata.gz: 269987948317e7917f8e237132a741d363baa9a273e1e936b5170e551d39a27cb7c480ca59295a5eae6136eb49156ae0e0f2ece80c3a2c5870305127a1fbc2da
-  data.tar.gz: e9c791824dcc361f6d958aeb6dd423ec3d8f51168cc448883f777c775e6ac6c33aebe443912883c0dd61e9079cf501ab15b93fc3e474989ff5d1ab3df40050e5
+  metadata.gz: 75e217bea7703bddf67cba284afb6cab2c16b70e18ae1f7e87e6e8e0e7a8fdfd434c1a6dd8be91f299f5e6dac9643ebb9d2c240ca6369f744b9837bd13d9ec59
+  data.tar.gz: b3f7a0aa1b2df536bff44bdcb1272a4d8a70b7ce4c8737ad79f28b1615945b698a9683b7d291c22566a22f9ffa98d382a82a518c3238a28cdce5c7b6bd605f8f

data/Gemfile.lock

@@ -0,0 +1,162 @@
+PATH
+  remote: .
+  specs:
+    fluent-plugin-google-cloud (0.6.17)
+      fluentd (~> 0.10)
+      google-api-client (~> 0.17)
+      google-cloud-logging (~> 1.3, >= 1.3.2)
+      googleapis-common-protos (~> 1.3)
+      googleauth (~> 0.6)
+      grpc (~> 1.0)
+      json (~> 1.8)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    ast (2.4.0)
+    cool.io (1.5.3)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    declarative (0.0.10)
+    declarative-option (0.1.0)
+    faraday (0.14.0)
+      multipart-post (>= 1.2, < 3)
+    fluentd (0.14.25)
+      cool.io (>= 1.4.5, < 2.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.0)
+      msgpack (>= 0.7.0, < 2.0.0)
+      ruby_dig (~> 0.0.2)
+      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.19.8)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.5, < 0.7.0)
+      httpclient (>= 2.8.1, < 3.0)
+      mime-types (~> 3.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+    google-cloud-core (1.2.0)
+      google-cloud-env (~> 1.0)
+    google-cloud-env (1.0.1)
+      faraday (~> 0.11)
+    google-cloud-logging (1.5.0)
+      google-cloud-core (~> 1.2)
+      google-gax (~> 1.0)
+      stackdriver-core (~> 1.3)
+    google-gax (1.0.1)
+      google-protobuf (~> 3.2)
+      googleapis-common-protos (>= 1.3.5, < 2.0)
+      googleauth (~> 0.6.2)
+      grpc (>= 1.7.2, < 2.0)
+      rly (~> 0.2.3)
+    google-protobuf (3.5.1.2-x86_64-linux)
+    googleapis-common-protos (1.3.7)
+      google-protobuf (~> 3.0)
+      googleapis-common-protos-types (~> 1.0)
+      grpc (~> 1.0)
+    googleapis-common-protos-types (1.0.1)
+      google-protobuf (~> 3.0)
+    googleauth (0.6.2)
+      faraday (~> 0.12)
+      jwt (>= 1.4, < 3.0)
+      logging (~> 2.0)
+      memoist (~> 0.12)
+      multi_json (~> 1.11)
+      os (~> 0.9)
+      signet (~> 0.7)
+    grpc (1.10.0-x86_64-linux)
+      google-protobuf (~> 3.1)
+      googleapis-common-protos-types (~> 1.0.0)
+      googleauth (>= 0.5.1, < 0.7)
+    hashdiff (0.3.7)
+    http_parser.rb (0.6.0)
+    httpclient (2.8.3)
+    json (1.8.6)
+    jwt (2.1.0)
+    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.3.0)
+      metaclass (~> 0.0.1)
+    msgpack (1.2.4)
+    multi_json (1.13.1)
+    multipart-post (2.0.0)
+    os (0.9.6)
+    parser (2.5.0.3)
+      ast (~> 2.4.0)
+    power_assert (1.1.1)
+    powerpack (0.1.1)
+    prometheus-client (0.7.1)
+      quantile (~> 0.2.0)
+    public_suffix (3.0.2)
+    quantile (0.2.0)
+    rainbow (2.2.2)
+      rake
+    rake (10.5.0)
+    representable (3.0.4)
+      declarative (< 0.1.0)
+      declarative-option (< 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.1)
+    rly (0.2.3)
+    rubocop (0.39.0)
+      parser (>= 2.3.0.7, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    ruby_dig (0.0.2)
+    safe_yaml (1.0.4)
+    serverengine (2.0.6)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    signet (0.8.1)
+      addressable (~> 2.3)
+      faraday (~> 0.9)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    stackdriver-core (1.3.0)
+      google-cloud-core (~> 1.2)
+    strptime (0.1.9)
+    test-unit (3.2.7)
+      power_assert
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2018.3)
+      tzinfo (>= 1.0.0)
+    uber (0.1.0)
+    unicode-display_width (1.3.0)
+    webmock (2.3.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    yajl-ruby (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fluent-plugin-google-cloud!
+  mocha (~> 1.1)
+  prometheus-client (~> 0.7.1)
+  rake (~> 10.3)
+  rubocop (~> 0.39.0)
+  test-unit (~> 3.0)
+  webmock (~> 2.3.1)
+
+BUNDLED WITH
+   1.16.1

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.17'
+  gem.version       = '0.6.18.pre.1'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')

data/lib/fluent/plugin/out_google_cloud.rb

@@ -92,6 +92,12 @@ module Fluent
           'stderr' => 'ERROR'
         }
       }.freeze
+      K8S_CONTAINER_CONSTANTS = {
+        resource_type: 'k8s_container'
+      }.freeze
+      K8S_NODE_CONSTANTS = {
+        resource_type: 'k8s_node'
+      }.freeze
       DOCKER_CONSTANTS = {
         service: 'docker.googleapis.com',
         resource_type: 'docker_container'
@@ -220,7 +226,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'.freeze
-    PLUGIN_VERSION = '0.6.17'.freeze
+    PLUGIN_VERSION = '0.6.18.pre.1'.freeze
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'.freeze
@@ -974,6 +980,16 @@ module Fluent
 
       @compiled_http_latency_regexp =
         /^\s*(?<seconds>\d+)(?<decimal>\.\d+)?\s*s\s*$/
+
+      # TODO(qingling128): Temporary fallback for metadata agent restarts.
+      @compiled_k8s_container_local_resource_id_regexp = /^
+        (?<resource_type>k8s_container)
+        \.(?<namespace_name>[0-9a-z-]+)
+        \.(?<pod_name>[0-9a-z-.]+)
+        \.(?<container_name>[0-9a-z-]+)$/x
+      @compiled_k8s_node_local_resource_id_regexp = /^
+        (?<resource_type>k8s_node)
+        \.(?<node_name>[0-9a-z-]+)$/x
     end
 
     # Set required variables like @project_id, @vm_id, @vm_name and @zone.
@@ -1238,6 +1254,16 @@ module Fluent
           # TODO(qingling128): Fix this temporary renaming from 'gke_container'
           # to 'container'.
           resource.type = 'container' if resource.type == 'gke_container'
+        else
+          # TODO(qingling128): This entire else clause is temporary before we
+          # implement buffering and caching.
+          @log.warn('Failing to retrieve monitored resource from Metadata' \
+                     " Agent with local_resource_id #{local_resource_id}." \
+                     ' Trying to construct resource locally if it is a k8s' \
+                     ' resource.')
+          constructed_k8s_resource = construct_k8s_resource_locally(
+            local_resource_id)
+          resource = constructed_k8s_resource if constructed_k8s_resource
         end
       end
 
@@ -1288,7 +1314,11 @@ module Fluent
       # Docker container.
       # TODO(qingling128): Remove this logic once the resource is retrieved at a
       # proper time (b/65175256).
-      when DOCKER_CONSTANTS[:resource_type]
+      when DOCKER_CONSTANTS[:resource_type],
+           # TODO(qingling128): Temporary fallback for metadata agent restarts.
+           K8S_CONTAINER_CONSTANTS[:resource_type],
+           K8S_NODE_CONSTANTS[:resource_type]
+
         common_labels.delete("#{COMPUTE_CONSTANTS[:service]}/resource_name")
       end
 
@@ -2145,6 +2175,89 @@ module Fluent
       {}
     end
 
+    # Construct monitored resource locally for k8s resources.
+    def construct_k8s_resource_locally(local_resource_id)
+      matched_regexp_group = nil
+      # Regex match the local_resource_id to make sure we only do
+      # this for 'k8s_container' and 'k8s_node'.
+      [@compiled_k8s_node_local_resource_id_regexp,
+       @compiled_k8s_container_local_resource_id_regexp].each do |id_regexp|
+        matched_regexp_group ||= id_regexp.match(local_resource_id)
+      end
+      return unless matched_regexp_group
+      case matched_regexp_group['resource_type']
+      when 'k8s_container'
+        @log.debug('Detected local_resource_id in k8s_container format.' \
+                   "Constructing resource locally with #{local_resource_id}.")
+        return construct_k8s_container_resource(matched_regexp_group)
+      when 'k8s_node'
+        @log.debug('Detected local_resource_id in k8s_node format.' \
+                   "Constructing resource locally with #{local_resource_id}.")
+        return construct_k8s_node_resource(matched_regexp_group)
+      end
+    end
+
+    # Construct the k8s_container monitored resource locally. In case of any
+    # exception, return nil.
+    def construct_k8s_container_resource(matched_regexp_group)
+      constructed_resource = Google::Apis::LoggingV2::MonitoredResource.new(
+        type: 'k8s_container',
+        labels: {
+          'namespace_name' => matched_regexp_group['namespace_name'],
+          'pod_name' => matched_regexp_group['pod_name'],
+          'container_name' => matched_regexp_group['container_name'],
+          'cluster_name' => retrieve_k8s_cluster_name,
+          'location' => retrieve_k8s_location
+        }
+      )
+      @log.debug('Constructed k8s_container resource locally:\n' \
+                 "#{constructed_resource.inspect}")
+      constructed_resource
+    rescue StandardError => e
+      @log.error 'Failed to construct "k8s_container" resource locally.' \
+                 ' Falling back to writing logs against instance resource.',
+                 error: e
+      # Fall back to legacy gke resource or default instance resource.
+      return
+    end
+
+    # Construct the k8s_node monitored resource locally. In case of any
+    # exception, return nil.
+    def construct_k8s_node_resource(matched_regexp_group)
+      constructed_resource = Google::Apis::LoggingV2::MonitoredResource.new(
+        type: 'k8s_node',
+        labels: {
+          'node_name' => matched_regexp_group['node_name'],
+          'cluster_name' => retrieve_k8s_cluster_name,
+          'location' => retrieve_k8s_location
+        }
+      )
+      @log.debug('Constructed k8s_node resource locally:\n' \
+                 "#{constructed_resource.inspect}")
+      constructed_resource
+    rescue StandardError => e
+      @log.error 'Failed to construct "k8s_node" resource locally. Falling' \
+                 ' back to writing logs against instance resource.', error: e
+      # Fall back to default instance resource.
+      return
+    end
+
+    # Only retrieve cluster name once since it's not changing for this
+    # agent instance's life time.
+    # Throw an error if failed to retrieve the cluster name.
+    def retrieve_k8s_cluster_name
+      @k8s_cluster_name ||= fetch_gce_metadata(
+        'instance/attributes/cluster-name')
+    end
+
+    # Only retrieve location once since it is the location of K8s Master which
+    # is not changing for this agent instance's life time.
+    # Throw an error if neither endpoint is available.
+    def retrieve_k8s_location
+      @k8s_location ||= fetch_gce_metadata(
+        'instance/attributes/cluster-location')
+    end
+
     def ensure_array(value)
       Array.try_convert(value) || (raise JSON::ParserError, value.class.to_s)
     end

data/test/plugin/base_test.rb

@@ -1303,6 +1303,143 @@ module BaseTest
     end
   end
 
+  # Test k8s monitored resource including the fallback when Metadata Agent
+  # restarts.
+  def test_k8s_monitored_resource_fallback
+    [
+      # k8s_container.
+      # When enable_metadata_agent is false.
+      {
+        enable_metadata_agent: false,
+        set_up_metadata_agent_stub: false,
+        set_up_k8s_stub: false,
+        log_entry: k8s_container_log_entry(log_entry(0)),
+        expected_params: COMPUTE_PARAMS
+      },
+      {
+        enable_metadata_agent: false,
+        set_up_metadata_agent_stub: true,
+        set_up_k8s_stub: false,
+        log_entry: k8s_container_log_entry(log_entry(0)),
+        expected_params: COMPUTE_PARAMS
+      },
+      {
+        enable_metadata_agent: false,
+        set_up_metadata_agent_stub: true,
+        set_up_k8s_stub: true,
+        log_entry: k8s_container_log_entry(log_entry(0)),
+        expected_params: COMPUTE_PARAMS
+      },
+      {
+        enable_metadata_agent: false,
+        set_up_metadata_agent_stub: false,
+        set_up_k8s_stub: true,
+        log_entry: k8s_container_log_entry(log_entry(0)),
+        expected_params: COMPUTE_PARAMS
+      },
+      # When enable_metadata_agent is true.
+      {
+        enable_metadata_agent: true,
+        set_up_metadata_agent_stub: false,
+        set_up_k8s_stub: false,
+        log_entry: k8s_container_log_entry(log_entry(0)),
+        expected_params: COMPUTE_PARAMS
+      },
+      {
+        enable_metadata_agent: true,
+        set_up_metadata_agent_stub: false,
+        set_up_k8s_stub: true,
+        log_entry: k8s_container_log_entry(log_entry(0)),
+        expected_params: K8S_CONTAINER_PARAMS_FROM_LOCAL
+      },
+      {
+        enable_metadata_agent: true,
+        set_up_metadata_agent_stub: true,
+        set_up_k8s_stub: false,
+        log_entry: k8s_container_log_entry(log_entry(0)),
+        expected_params: K8S_CONTAINER_PARAMS
+      },
+      {
+        enable_metadata_agent: true,
+        set_up_metadata_agent_stub: true,
+        set_up_k8s_stub: true,
+        log_entry: k8s_container_log_entry(log_entry(0)),
+        expected_params: K8S_CONTAINER_PARAMS
+      },
+      # When local_resource_id is not present or does not match k8s regexes.
+      {
+        enable_metadata_agent: true,
+        set_up_metadata_agent_stub: true,
+        set_up_k8s_stub: true,
+        log_entry: k8s_container_log_entry(
+          log_entry(0)).reject { |k, _| k == LOCAL_RESOURCE_ID_KEY },
+        expected_params: COMPUTE_PARAMS
+      },
+      {
+        enable_metadata_agent: true,
+        set_up_metadata_agent_stub: true,
+        set_up_k8s_stub: true,
+        log_entry: k8s_container_log_entry(
+          log_entry(0),
+          local_resource_id: RANDOM_LOCAL_RESOURCE_ID),
+        expected_params: COMPUTE_PARAMS
+      },
+      # Specific cases for k8s_node.
+      {
+        enable_metadata_agent: false,
+        set_up_metadata_agent_stub: true,
+        set_up_k8s_stub: true,
+        log_entry: k8s_node_log_entry(log_entry(0)),
+        expected_params: COMPUTE_PARAMS
+      },
+      {
+        enable_metadata_agent: true,
+        set_up_metadata_agent_stub: true,
+        set_up_k8s_stub: true,
+        log_entry: k8s_node_log_entry(log_entry(0)),
+        expected_params: K8S_NODE_PARAMS
+      },
+      {
+        enable_metadata_agent: true,
+        set_up_metadata_agent_stub: true,
+        set_up_k8s_stub: true,
+        log_entry: k8s_node_log_entry(log_entry(0)),
+        expected_params: K8S_NODE_PARAMS
+      }
+    ].each do |test_params|
+      new_stub_context do
+        setup_gce_metadata_stubs
+        if test_params[:set_up_metadata_agent_stub]
+          setup_metadata_agent_stubs
+        else
+          setup_no_metadata_agent_stubs
+        end
+        if test_params[:set_up_k8s_stub]
+          set_up_k8s_metadata_stubs
+        else
+          set_up_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.emit(test_params[:log_entry])
+          d.run
+        end
+        verify_log_entries(1, test_params[:expected_params],
+                           'jsonPayload') do |entry|
+          fields = get_fields(entry['jsonPayload'])
+          assert_equal 2, fields.size, entry
+          assert_equal 'test log entry 0', get_string(fields['log']), entry
+          assert_equal K8S_STREAM, get_string(fields['stream']), entry
+        end
+      end
+    end
+  end
+
   # Test that the 'time' field from the json record is extracted and set to
   # entry.timestamp for Docker container logs.
   def test_time_field_extraction_for_docker_container_logs
@@ -1466,6 +1603,22 @@ module BaseTest
                           'KUBE_BEARER_TOKEN: AoQiMuwkNP2BMT0S')
   end
 
+  def set_up_k8s_metadata_stubs
+    stub_metadata_request(
+      'instance/attributes/',
+      "attribute1\ncluster-name\ncluster-location\nlast_attribute")
+    stub_metadata_request('instance/attributes/cluster-location', K8S_LOCATION2)
+    stub_metadata_request('instance/attributes/cluster-name', K8S_CLUSTER_NAME)
+  end
+
+  def set_up_no_k8s_metadata_stubs
+    # Simulate an environment with no new k8s endpoints present.
+    stub_request(:get, %r{.*instance/attributes/cluster-location.*})
+      .to_raise(Errno::EHOSTUNREACH)
+    stub_request(:get, %r{.*instance/attributes/cluster-name.*})
+      .to_raise(Errno::EHOSTUNREACH)
+  end
+
   def setup_cloudfunctions_metadata_stubs
     stub_metadata_request(
       'instance/attributes/',
@@ -1514,6 +1667,14 @@ module BaseTest
       stub_request(:get, metadata_request_url(local_resource_id))
         .to_return(status: 200, body: resource)
     end
+    stub_request(:get, metadata_request_url(RANDOM_LOCAL_RESOURCE_ID))
+      .to_return(status: 404, body: '')
+  end
+
+  def setup_no_metadata_agent_stubs
+    # Simulate an environment with no metadata agent endpoint present.
+    stub_request(:get, %r{#{DEFAULT_METADATA_AGENT_URL}\/monitoredResource/.*})
+      .to_raise(Errno::EHOSTUNREACH)
   end
 
   def assert_requested_metadata_agent_stub(local_resource_id)
@@ -1589,6 +1750,29 @@ module BaseTest
     }
   end
 
+  # k8s resources.
+
+  def k8s_container_log_entry(log,
+                              local_resource_id: K8S_LOCAL_RESOURCE_ID)
+    {
+      log: log,
+      stream: K8S_STREAM,
+      time: K8S_TIMESTAMP,
+      LOCAL_RESOURCE_ID_KEY => local_resource_id
+    }
+  end
+
+  def k8s_node_log_entry(log)
+    {
+      log: log,
+      stream: K8S_STREAM,
+      time: K8S_TIMESTAMP,
+      LOCAL_RESOURCE_ID_KEY =>
+        "#{K8S_NODE_LOCAL_RESOURCE_ID_PREFIX}" \
+        ".#{K8S_NODE_NAME}"
+    }
+  end
+
   def cloudfunctions_log_entry(i)
     {
       stream: 'stdout',
@@ -1631,6 +1815,7 @@ module BaseTest
   end
 
   def check_labels(labels, expected_labels)
+    return if labels.empty? && expected_labels.empty?
     labels.each do |key, value|
       assert value.is_a?(String), "Value #{value} for label #{key} " \
         'is not a string: ' + value.class.name

data/test/plugin/constants.rb

@@ -31,6 +31,8 @@ module Constants
   FULLY_QUALIFIED_ZONE = "projects/#{PROJECT_ID}/zones/#{ZONE}".freeze
   VM_ID = '9876543210'.freeze
 
+  RANDOM_LOCAL_RESOURCE_ID = 'ehb.jjk.poq.ll'.freeze
+
   # Attributes used for the Metadata Agent resources.
   METADATA_ZONE = 'us-central1-c'.freeze
   METADATA_VM_ID = '0123456789'.freeze
@@ -75,6 +77,30 @@ module Constants
   DOCKER_CONTAINER_NANOS = 987_654_321
   DOCKER_CONTAINER_LOCAL_RESOURCE_ID_PREFIX = 'container'.freeze
 
+  # New K8s resource constants.
+  K8S_LOCATION = 'us-central1-b'.freeze
+  K8S_LOCATION2 = 'us-central1-c'.freeze
+  K8S_CLUSTER_NAME = 'cluster-1'.freeze
+  K8S_NAMESPACE_NAME = 'kube-system'.freeze
+  K8S_NODE_NAME = 'performance--default-pool-cabf1342-08jc'.freeze
+  K8S_POD_NAME = 'redis-master-c0l82.foo.bar'.freeze
+  K8S_CONTAINER_NAME = 'redis'.freeze
+  K8S_STREAM = 'stdout'.freeze
+  # Timestamp for 1234567890 seconds and 987654321 nanoseconds since epoch.
+  K8S_TIMESTAMP = '2009-02-13T23:31:30.987654321Z'.freeze
+  K8S_SECONDS_EPOCH = 1_234_567_890
+  K8S_NANOS = 987_654_321
+  K8S_CONTAINER_LOCAL_RESOURCE_ID_PREFIX = 'k8s_container'.freeze
+  K8S_NODE_LOCAL_RESOURCE_ID_PREFIX = 'k8s_node'.freeze
+  K8S_TAG =
+    "var.log.containers.#{K8S_NAMESPACE_NAME}_#{K8S_POD_NAME}_" \
+    "#{K8S_CONTAINER_NAME}.log".freeze
+  K8S_LOCAL_RESOURCE_ID =
+    "#{K8S_CONTAINER_LOCAL_RESOURCE_ID_PREFIX}" \
+    ".#{K8S_NAMESPACE_NAME}" \
+    ".#{K8S_POD_NAME}" \
+    ".#{K8S_CONTAINER_NAME}".freeze
+
   # Container Engine / Kubernetes specific labels.
   CONTAINER_CLUSTER_NAME = 'cluster-1'.freeze
   CONTAINER_NAMESPACE_ID = '898268c8-4a36-11e5-9d81-42010af0194c'.freeze
@@ -392,6 +418,52 @@ module Constants
     }
   }.freeze
 
+  # K8s Container.
+  K8S_CONTAINER_PARAMS = {
+    resource: {
+      type: K8S_CONTAINER_CONSTANTS[:resource_type],
+      labels: {
+        'namespace_name' => K8S_NAMESPACE_NAME,
+        'pod_name' => K8S_POD_NAME,
+        'container_name' => K8S_CONTAINER_NAME,
+        'cluster_name' => K8S_CLUSTER_NAME,
+        'location' => K8S_LOCATION
+      }
+    },
+    log_name: 'test',
+    project_id: PROJECT_ID,
+    labels: {}
+  }.freeze
+  K8S_CONTAINER_PARAMS_FROM_LOCAL = K8S_CONTAINER_PARAMS.merge(
+    resource: K8S_CONTAINER_PARAMS[:resource].merge(
+      labels: K8S_CONTAINER_PARAMS[:resource][:labels].merge(
+        'location' => K8S_LOCATION2
+      )
+    )
+  ).freeze
+
+  # K8s Node.
+  K8S_NODE_PARAMS = {
+    resource: {
+      type: K8S_NODE_CONSTANTS[:resource_type],
+      labels: {
+        'node_name' => K8S_NODE_NAME,
+        'cluster_name' => K8S_CLUSTER_NAME,
+        'location' => K8S_LOCATION
+      }
+    },
+    log_name: 'test',
+    project_id: PROJECT_ID,
+    labels: {}
+  }.freeze
+  K8S_NODE_PARAMS_FROM_LOCAL = K8S_NODE_PARAMS.merge(
+    resource: K8S_NODE_PARAMS[:resource].merge(
+      labels: K8S_NODE_PARAMS[:resource][:labels].merge(
+        'location' => K8S_LOCATION2
+      )
+    )
+  ).freeze
+
   # Docker Container.
   DOCKER_CONTAINER_PARAMS = {
     resource: {
@@ -647,6 +719,29 @@ module Constants
           'pod_id' => CONTAINER_POD_ID,
           'zone' => ZONE
         }
+      }.to_json,
+    # K8s container logs.
+    "#{K8S_CONTAINER_LOCAL_RESOURCE_ID_PREFIX}.#{K8S_NAMESPACE_NAME}" \
+    ".#{K8S_POD_NAME}.#{K8S_CONTAINER_NAME}" =>
+      {
+        'type' => K8S_CONTAINER_CONSTANTS[:resource_type],
+        'labels' => {
+          'namespace_name' => K8S_NAMESPACE_NAME,
+          'pod_name' => K8S_POD_NAME,
+          'container_name' => K8S_CONTAINER_NAME,
+          'cluster_name' => K8S_CLUSTER_NAME,
+          'location' => K8S_LOCATION
+        }
+      }.to_json,
+    # K8s node logs.
+    "#{K8S_NODE_LOCAL_RESOURCE_ID_PREFIX}.#{K8S_NODE_NAME}" =>
+      {
+        'type' => K8S_NODE_CONSTANTS[:resource_type],
+        'labels' => {
+          'node_name' => K8S_NODE_NAME,
+          'cluster_name' => K8S_CLUSTER_NAME,
+          'location' => K8S_LOCATION
+        }
       }.to_json
   }.freeze
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.17
+  version: 0.6.18.pre.1
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -212,6 +212,7 @@ extra_rdoc_files: []
 files:
 - CONTRIBUTING
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -244,9 +245,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14