Support multiple values for severity level mapping

This commit is contained in:
Dennis Trautwein 2018-07-31 11:41:20 +02:00
Родитель 657bba865f
Коммит a1e07f11d1
2 изменённых файлов: 41 добавлений и 10 удалений

Просмотреть файл

@ -26,15 +26,15 @@ module Fluent::Plugin
# The property name for severity level. It will be ignored if the record is in standard schema. # The property name for severity level. It will be ignored if the record is in standard schema.
config_param :severity_property, :string, default: 'severity' config_param :severity_property, :string, default: 'severity'
# The value of severity property that maps to Application Insights' verbose severity level. # 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. # 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. # 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. # 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. # 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. # 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. # 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 config_param :context_tag_sources, :hash, default: {}, value_type: :string
@ -45,11 +45,11 @@ module Fluent::Plugin
super super
@severity_level_mapping = {} @severity_level_mapping = {}
@severity_level_mapping[@severity_level_verbose.downcase] = Channel::Contracts::SeverityLevel::VERBOSE @severity_level_verbose.each { |l| @severity_level_mapping[l.downcase] = Channel::Contracts::SeverityLevel::VERBOSE }
@severity_level_mapping[@severity_level_information.downcase] = Channel::Contracts::SeverityLevel::INFORMATION @severity_level_information.each { |l| @severity_level_mapping[l.downcase] = Channel::Contracts::SeverityLevel::INFORMATION }
@severity_level_mapping[@severity_level_warning.downcase] = Channel::Contracts::SeverityLevel::WARNING @severity_level_warning.each { |l| @severity_level_mapping[l.downcase] = Channel::Contracts::SeverityLevel::WARNING }
@severity_level_mapping[@severity_level_error.downcase] = Channel::Contracts::SeverityLevel::ERROR @severity_level_error.each { |l| @severity_level_mapping[l.downcase] = Channel::Contracts::SeverityLevel::ERROR }
@severity_level_mapping[@severity_level_critical.downcase] = Channel::Contracts::SeverityLevel::CRITICAL @severity_level_critical.each { |l| @severity_level_mapping[l.downcase] = Channel::Contracts::SeverityLevel::CRITICAL }
context_tag_keys = [] context_tag_keys = []
context_tag_keys.concat Channel::Contracts::Application.json_mappings.values context_tag_keys.concat Channel::Contracts::Application.json_mappings.values

Просмотреть файл

@ -355,6 +355,37 @@ class ApplicationInsightsOutputTest < Test::Unit::TestCase
assert_equal ApplicationInsights::Channel::Contracts::SeverityLevel::ERROR, envelope.data.base_data.severity_level assert_equal ApplicationInsights::Channel::Contracts::SeverityLevel::ERROR, envelope.data.base_data.severity_level
end 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 test 'properties are stringified' do
d = create_driver d = create_driver