Merge pull request #2169 from openshift-cherrypick-robot/cherry-pick-2163-to-master

[master] fix for https://issues.redhat.com/browse/LOG-1647

Author: openshift-merge-robot

fluentd/lib/fluent-plugin-collected/lib/fluent/plugin/in_collected_tail_monitor.rb

@@ -114,22 +114,25 @@ def labels(plugin_info, path)
         namespace = path_match_data['namespace'],
         containername = path_match_data['container_name'],
         dockerid = path_match_data['docker_id']
-
-        @log.debug "path #{path}, namespace #{namespace}, podname #{podname},containername #{containername}"
+        
+        @log.debug "path #{path}, namespace #{namespace}, podname #{podname[0]},containername #{containername}"
 
         @base_labels.merge(
         plugin_id: plugin_info["plugin_id"],
         type: plugin_info["type"],
         path: path,
         namespace: namespace,
-        podname: podname,
+        podname: podname[0],
         containername: containername,
       )
       else
         @base_labels.merge(
         plugin_id: plugin_info["plugin_id"],
         type: plugin_info["type"],
         path: path,
+        namespace: "notfound",
+        podname: "notfound",
+        containername: "notfound",
         )
       end
     end

fluentd/lib/fluent-plugin-collected/test/plugin/test_in_collected_tail_monitor.rb

@@ -9,16 +9,14 @@ def setup
   end
 
   MONITOR_CONFIG = %[
+  @type tail
+     path /tmp/tmp.log, /var/log/containers/mypodname_mynamespace_mycontainername-34646d7fb38199129ab8d0e6f41833d26e1826cba92571100fd6c53904a5317e.log
+  
   @type collected_tail_monitor
-  <metric>
-    name log_collected_bytes_total
-    type counter
-    desc Total bytes collected from file
     <labels>
-      tag ${tag}
-      hostname ${hostname}
+      tag mytag
+      host example.com
     </labels>
-  </metric>
 ]
 
   INVALID_MONITOR_CONFIG = %[
@@ -32,19 +30,52 @@ def setup
   </labels>
   ]
 
-  def create_driver(conf = MONITOR_CONFIG)
+  def create_driver(conf)
     Fluent::Test::Driver::Input.new(Fluent::Plugin::CollectedTailMonitorInput).configure(conf)
   end
 
   def test_configure
     d = create_driver(MONITOR_CONFIG)
   end
 
+  def test_labels_applied_to_metrics
+    conf = MONITOR_CONFIG
+    puts "passing this #{conf}"
+    d = create_driver(conf)
+    beforerunlabels = d.instance.instance_variable_get(:@base_labels)
+    puts "before base labels set to ...#{beforerunlabels}"
+    d.run {
+    d.instance.update_monitor_info()
+    postrunlabels = d.instance.instance_variable_get(:@base_labels)
+    path = "/tmp/tmp.log"
+    mergedlabels  = d.instance.labels({"plugin_id" => "mypluginid", "type" => "input_plugin"}, path)
+    puts "with logfilepath as #{path} post merging base labels set to ...#{mergedlabels}"
+
+    path = "/var/log/containers/mypodname_mynamespace_mycontainername-34646d7fb38199129ab8d0e6f41833d26e1826cba92571100fd6c53904a5317e.log"
+    newmergedlabels  = d.instance.labels({"plugin_id" => "mypluginid", "type" => "input_plugin"}, path)
+    puts "with logfilepath as #{path} post merging base labels set to ...#{newmergedlabels}"
+
+    assert_equal('mynamespace',newmergedlabels[:namespace])
+    assert_equal('mycontainername',newmergedlabels[:containername])
+    assert_equal('mypodname',newmergedlabels[:podname])
+    }
+ end 
+
   def test_invalid_configure
       assert_raise(Fluent::ConfigError) {
         d = create_driver(INVALID_MONITOR_CONFIG)
       }
   end
 
+  test 'emit' do
+    d = create_driver(MONITOR_CONFIG)
+    d.run(timeout: 0.5)
+
+    d.events.each do |tag, time, record|
+      assert_equal('input.test', tag)
+      assert_equal({'plugin_id' => 'fluentd','type' => 'tail'}, record)
+      assert(time.is_a?(Fluent::EventTime))
+    end
+  end
 
 end