fluent-plugin-google-cloud 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1989b8ce8911575be17949674d1d8dfb137dbeda
-  data.tar.gz: f5ac2f7ca47a5c61dfc7a32a9254b6de841a2182
+  metadata.gz: bae4e3edae194459b6bffe522aa070d6c96f4c01
+  data.tar.gz: 290eaab1b92a6cea5c9204f5892fb008c6334d57
 SHA512:
-  metadata.gz: 9de731cc6f29055be014d6894f0b4930c7c6b5d836c149789d0ae06fe7e14a09687307485b559b6cf77335770a1f84003945468ed9b863d11c49a079142dad1a
-  data.tar.gz: aa07feea223b293e68da01fcf7e35facef3aa3af7ce3a8ba014304479e3521129809f004bb94a342ac6a00a2ee83bb0fe4132a2caae87ecdfcc4691cf6adbb5b
+  metadata.gz: c8644923f32740b2aee18e0b71047c8dc6d1c881c7f590a88a7a5e136088c9eccd428bfcbe53aadaeedf6b301ecc5f6e29d9a7ec5545635b3f7a1021a2371aba
+  data.tar.gz: 8d101639abc752dd42a7c0dcf29bdc8834d20bbde8686e4eb3b41b6ca6c09b830e62b2a8ecc4551657eac3ef9baa5d779148358b6326dddd23749ea108a60dda

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.5.0'
+  gem.version       = '0.5.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

@@ -25,14 +25,13 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'
-    PLUGIN_VERSION = '0.5.0'
+    PLUGIN_VERSION = '0.5.1'
 
     # Constants for service names.
     APPENGINE_SERVICE = 'appengine.googleapis.com'
     CLOUDFUNCTIONS_SERVICE = 'cloudfunctions.googleapis.com'
     COMPUTE_SERVICE = 'compute.googleapis.com'
     CONTAINER_SERVICE = 'container.googleapis.com'
-    DATAFLOW_SERVICE = 'dataflow.googleapis.com'
     EC2_SERVICE = 'ec2.amazonaws.com'
 
     # Name of the the Google cloud logging write scope.
@@ -63,13 +62,16 @@ 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
+    # Whether to try to detect if 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
+    # The subservice_name overrides the subservice detection, if provided.
+    config_param :subservice_name, :string, :default => nil
 
     # The regular expression to use on Kubernetes logs to extract some basic
     # information about the log source. The regex must contain capture groups
@@ -97,6 +99,20 @@ module Fluent
     #   }
     config_param :label_map, :hash, :default => nil
 
+    # labels (specified as a JSON object) is a set of custom labels
+    # provided at configuration time. It allows users to inject extra
+    # environmental information into every message or to customize
+    # labels otherwise detected automatically.
+    #
+    # Each entry in the map is a {"label_name": "label_value"} pair.
+    #
+    # Example:
+    #   labels {
+    #     "label_name_1": "label_value_1",
+    #     "label_name_2": "label_value_2"
+    #   }
+    config_param :labels, :hash, :default => nil
+
     # DEPRECATED: The following parameters, if present in the config
     # indicate that the plugin configuration must be updated.
     config_param :auth_method, :string, :default => nil
@@ -147,6 +163,7 @@ module Fluent
 
       # TODO: Send instance tags as labels as well?
       @common_labels = {}
+      @common_labels.merge!(@labels) if @labels
 
       @compiled_kubernetes_tag_regexp = nil
       if @kubernetes_tag_regexp
@@ -222,7 +239,9 @@ module Fluent
       case @platform
       when Platform::GCE
         @service_name = COMPUTE_SERVICE
-        if @detect_subservice
+        if @subservice_name
+          @service_name = @subservice_name
+        elsif @detect_subservice
           # Check for specialized GCE environments.
           # TODO: Add config options for these to allow for running outside GCE?
           attributes = fetch_gce_metadata('instance/attributes/').split
@@ -239,11 +258,6 @@ module Fluent
             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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: fluentd output plugin for the Google Cloud Logging API