fluent-plugin-application-insights 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16cd7a0fed351fcf6f1c5c9030454658ea2bb1e6
-  data.tar.gz: '08af822420fb65b336283d29cd4fb23800aa3b10'
+  metadata.gz: fccdd3499c752fcd05f6dd4706e8e155b918ec7d
+  data.tar.gz: '07914eb737903feb35c708d8307162eb9f7aea05'
 SHA512:
-  metadata.gz: 73ff2242c21c5be630d7a10e15e406e9f517856261be253fa055fcd02dc66674b0f4d42882676d0612f17fef820612fccc5a22f2507675b6e68122c047b64071
-  data.tar.gz: e0933edfcbd3ff4f4c56185a166f506ddf47e7e74d107acb3f72051484f18546f2c943c8f0242e42b6af05232d1e4b3b04b536147a79d06522baab8f89f75f38
+  metadata.gz: 3b08ba753839bf9588a377085b8494644c1fdb9c69eeb2c0d6467b60f205f7982324902e949de4f11c3a52e8d3a614b7d3b901eede5c54327a9f2bc71e81c193
+  data.tar.gz: 0efaa1e0a4f3b9d3e4fec263e493de73e803e7174665602c9a70982d8d1c89ca2fa4e73932a25cbc7179ad30e1bb838624a0a41361643d7155809453eaf88559

data/README.md

@@ -56,7 +56,7 @@ If the record is not in standard schema, it will be tracked as Application Insig
 
 The standard schema for Application Insights telemetry is defined [here](https://github.com/Microsoft/ApplicationInsights-Home/tree/master/EndpointSpecs/Schemas/Bond).
 
-Below is an example of a Request telemetry in standard schema format. `name`, `time`, `data`, `data.baseType` and `data.baseData` are required properties. Different telemetry types will have different properties associated with the `baseData` object.
+Below is an example of a Request telemetry in standard schema format. `data`, `data.baseType` and `data.baseData` are required properties. Different telemetry types will have different properties associated with the `baseData` object.
 
 ```
 {

data/fluent-plugin-application-insights.gemspec

@@ -3,9 +3,9 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-application-insights"
-  spec.version = "0.2.1"
+  spec.version = "0.2.2"
   spec.authors = ["Microsoft Corporation"]
-  spec.email   = ["ctdiagcore@microsoft.com"]
+  spec.email   = ["azure-tools@microsoft.com"]
 
   spec.summary       = "This is the fluentd output plugin for Azure Application Insights."
   spec.description   = "Fluentd output plugin for Azure Application Insights."

data/lib/fluent/plugin/out_application_insights.rb

@@ -26,15 +26,15 @@ module Fluent::Plugin
     # The property name for severity level. It will be ignored if the record is in standard schema.
     config_param :severity_property, :string, default: 'severity'
     # The value of severity property that maps to Application Insights' verbose severity level.
-    config_param :severity_level_verbose, :string, default: 'verbose'
+    config_param :severity_level_verbose, :array, value_type: :string, default: ['verbose']
     # The value of severity property that maps to Application Insights' information severity level.
-    config_param :severity_level_information, :string, default: 'information'
+    config_param :severity_level_information, :array, value_type: :string, default: ['information']
     # The value of severity property that maps to Application Insights' warning severity level.
-    config_param :severity_level_warning, :string, default: 'warning'
+    config_param :severity_level_warning, :array, value_type: :string, default: ['warning']
     # The value of severity property that maps to Application Insights' error severity level.
-    config_param :severity_level_error, :string, default: 'error'
+    config_param :severity_level_error, :array, value_type: :string, default: ['error']
     # The value of severity property that maps to Application Insights' critical severity level.
-    config_param :severity_level_critical, :string, default: 'critical'
+    config_param :severity_level_critical, :array, value_type: :string, default: ['critical']
     # The dictionary that instructs the Application Insights plugin to set Application Insights context tags using record properties.
     # In this dictionary keys are Application Insights context tags to set, and values are names of properties to use as source of data.
     config_param :context_tag_sources, :hash, default: {}, value_type: :string
@@ -45,11 +45,11 @@ module Fluent::Plugin
       super
 
       @severity_level_mapping = {}
-      @severity_level_mapping[@severity_level_verbose.downcase] = Channel::Contracts::SeverityLevel::VERBOSE
-      @severity_level_mapping[@severity_level_information.downcase] = Channel::Contracts::SeverityLevel::INFORMATION
-      @severity_level_mapping[@severity_level_warning.downcase] = Channel::Contracts::SeverityLevel::WARNING
-      @severity_level_mapping[@severity_level_error.downcase] = Channel::Contracts::SeverityLevel::ERROR
-      @severity_level_mapping[@severity_level_critical.downcase] = Channel::Contracts::SeverityLevel::CRITICAL
+      @severity_level_verbose.each { |l| @severity_level_mapping[l.downcase] = Channel::Contracts::SeverityLevel::VERBOSE }
+      @severity_level_information.each { |l| @severity_level_mapping[l.downcase] = Channel::Contracts::SeverityLevel::INFORMATION }
+      @severity_level_warning.each { |l| @severity_level_mapping[l.downcase] = Channel::Contracts::SeverityLevel::WARNING }
+      @severity_level_error.each { |l| @severity_level_mapping[l.downcase] = Channel::Contracts::SeverityLevel::ERROR }
+      @severity_level_critical.each { |l| @severity_level_mapping[l.downcase] = Channel::Contracts::SeverityLevel::CRITICAL }
 
       context_tag_keys = []
       context_tag_keys.concat Channel::Contracts::Application.json_mappings.values
@@ -112,13 +112,14 @@ module Fluent::Plugin
     end
 
     def process_standard_schema_log(record, time)
-      if record["name"] && record["data"] && record["data"].is_a?(Hash) && record["data"]["baseType"] && record["data"]["baseData"]
+      if record["data"] && record["data"].is_a?(Hash) && record["data"]["baseType"] && record["data"]["baseData"]
         base_type = record["data"]["baseType"]
 
         if TELEMETRY_TYPES.include? base_type
           # If the record is processed by json parser plugin, e.g., in_http use it by default, the time property will be removed. Add it back in this case.
           record["time"] ||= time.iso8601(7)
           record["iKey"] = @instrumentation_key
+          set_name_property(record) if !record["name"]
           set_context_standard_schema record
 
           envelope = Channel::Contracts::Envelope.new
@@ -132,15 +133,22 @@ module Fluent::Plugin
 
           @tc.channel.queue.push(envelope)
         else
-          log.warn "Unknown telemetry type #{base_type}. Event will be treated as as non standard schema event."
+          log.debug "Unknown telemetry type #{base_type}. Event will be treated as as non standard schema event."
           process_non_standard_schema_log record, time
         end
       else
-        log.warn "The event does not meet the standard schema of Application Insights output. Missing name, data, baseType or baseData property. Event will be treated as as non standard schema event."
+        log.debug "The event does not meet the standard schema of Application Insights output. Missing data, baseType or baseData property. Event will be treated as as non standard schema event."
         process_non_standard_schema_log record, time
       end
     end
 
+    def set_name_property(record)
+      normalizedIKey = @instrumentation_key.gsub("-", "")
+      normalizedIKey = normalizedIKey.empty? ? "" : normalizedIKey + "."
+      type = record["data"]["baseType"][0..-5]
+      record["name"] = "Microsoft.ApplicationInsights.#{normalizedIKey}#{type}"
+    end
+
     def set_context_standard_schema(record)
       return if @context_tag_sources.length == 0
 

data/test/plugin/test_out_application_insights.rb

@@ -58,28 +58,66 @@ class ApplicationInsightsOutputTest < Test::Unit::TestCase
 
     test 'event missing required properties is treated as non standard schema' do
       time = event_time("2011-01-02 13:14:15 UTC")
+      @d.instance.log.level = "debug"
       @d.run(default_tag: 'test', shutdown: false) do
-          @d.feed(time, {"data" => {"baseType" => "RequestData", "baseData" => "data"}})
-          @d.feed(time, {"name" => "telemetry name"})
-          @d.feed(time, {"name" => "telemetry name", "data" => 2})
-          @d.feed(time, {"name" => "telemetry name", "data" => {}})
-          @d.feed(time, {"name" => "telemetry name", "data" => {"someprop" => "value"}})
-          @d.feed(time, {"name" => "telemetry name", "data" => {"baseType" => "type"}})
-          @d.feed(time, {"name" => "telemetry name", "data" => {"baseData" => "data"}})
+          @d.feed(time, {})
+          @d.feed(time, {"data" => 2})
+          @d.feed(time, {"data" => {}})
+          @d.feed(time, {"data" => {"someprop" => "value"}})
+          @d.feed(time, {"data" => {"baseType" => "type"}})
+          @d.feed(time, {"data" => {"baseData" => "data"}})
       end
 
       logs = @d.instance.log.out.logs
-      assert_equal 7, logs.length
-      assert_true logs.all?{ |log| log.include?("The event does not meet the standard schema of Application Insights output. Missing name, data, baseType or baseData property.") }
+      assert_equal 6, logs.length
+      assert_true logs.all?{ |log| log.include?("The event does not meet the standard schema of Application Insights output. Missing data, baseType or baseData property.") }
+    end
+
+    test 'event of standard schema will fill in the name property if it is empty' do
+      config = %[
+        instrumentation_key 000-000-000
+        standard_schema true
+      ]
+      d = create_driver config
+
+      time = event_time("2011-01-02 13:14:15 UTC")
+      d.run(default_tag: 'test', shutdown: false) do
+        d.feed(time, {
+          "data" => { "baseType" => "RequestData", "baseData" => {} }
+        })
+      end
+
+      envelope = d.instance.tc.channel.queue[0]
+      assert_equal "Microsoft.ApplicationInsights.000000000.Request", envelope.name
+    end
+
+    test 'event of standard schema will fill in the name property if it is empty and instrumentation key is empty' do
+      config = %[
+        instrumentation_key ""
+        standard_schema true
+      ]
+      d = create_driver config
+
+      time = event_time("2011-01-02 13:14:15 UTC")
+      d.run(default_tag: 'test', shutdown: false) do
+        d.feed(time, {
+          "data" => { "baseType" => "RequestData", "baseData" => {} }
+        })
+      end
+
+      envelope = d.instance.tc.channel.queue[0]
+      assert_equal "Microsoft.ApplicationInsights.Request", envelope.name
     end
 
     test 'event with unknown data type is treated as non standard schema' do
       time = event_time("2011-01-02 13:14:15 UTC")
+      @d.instance.log.level = "debug"
       @d.run(default_tag: 'test', shutdown: false) do
           @d.feed(time, {"name" => "telemetry name", "data" => {"baseType" => "unknown", "baseData" => {}}})
       end
 
       logs = @d.instance.log.out.logs
+      assert_true logs.length > 0
       assert_true logs.all?{ |log| log.include?("Unknown telemetry type unknown") }
     end
 
@@ -317,6 +355,37 @@ class ApplicationInsightsOutputTest < Test::Unit::TestCase
       assert_equal ApplicationInsights::Channel::Contracts::SeverityLevel::ERROR, envelope.data.base_data.severity_level
     end
 
+    test 'multiple severity levels' do
+      config = %[
+        instrumentation_key ikey
+        severity_property custom_severity_property
+        severity_level_critical fatal, panic
+      ]
+      d = create_driver config
+
+      time = event_time("2011-01-02 13:14:15 UTC")
+      d.run(default_tag: 'test', shutdown: false) do
+        d.feed(time, {"custom_severity_property" => "panic", "message" => "my message"})
+      end
+
+      d.run(default_tag: 'test', shutdown: false) do
+        d.feed(time, {"custom_severity_property" => "fatal", "message" => "my message"})
+      end
+
+      d.run(default_tag: 'test', shutdown: false) do
+        d.feed(time, {"custom_severity_property" => "critical", "message" => "my message"})
+      end
+
+      envelope = d.instance.tc.channel.queue[0]
+      assert_equal ApplicationInsights::Channel::Contracts::SeverityLevel::CRITICAL, envelope.data.base_data.severity_level
+
+      envelope = d.instance.tc.channel.queue[1]
+      assert_equal ApplicationInsights::Channel::Contracts::SeverityLevel::CRITICAL, envelope.data.base_data.severity_level
+      
+      envelope = d.instance.tc.channel.queue[2]
+      assert_not_equal ApplicationInsights::Channel::Contracts::SeverityLevel::CRITICAL, envelope.data.base_data.severity_level
+    end
+
     test 'properties are stringified' do
       d = create_driver
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-application-insights
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,7 +88,7 @@ dependencies:
         version: 0.5.5
 description: Fluentd output plugin for Azure Application Insights.
 email:
-- ctdiagcore@microsoft.com
+- azure-tools@microsoft.com
 executables: []
 extensions: []
 extra_rdoc_files: []