Fix Logger setting in sandboxes

A filter sandbox cannot modify the Logger field

Change-Id: Ie50bf2acb3d764504be398685c8e4e61c4e1c61b
Closes-bug: #1662879
This commit is contained in:
Swann Croiset 2017-02-09 12:05:47 +01:00
parent 36224e6963
commit 4d025aa0ab
8 changed files with 6 additions and 13 deletions

View File

@ -74,7 +74,7 @@ function add_to_bulk_metric(name, value, tags)
end
-- Send the bulk metric message to the Heka pipeline
function inject_bulk_metric(ts, hostname, logger, source, m_type)
function inject_bulk_metric(ts, hostname, source, m_type)
if #bulk_datapoints == 0 then
return
end
@ -89,7 +89,6 @@ function inject_bulk_metric(ts, hostname, logger, source, m_type)
end
local msg = {
Logger = logger,
Hostname = hostname,
Timestamp = ts,
Payload = payload,

View File

@ -31,7 +31,6 @@ end
-- grace_interval parameter allows to take into account log messages that are
-- received in the current interval but emitted before it.
local grace_interval = (read_config('grace_interval') or 0) + 0
local metric_logger = read_config('logger')
local metric_source = read_config('source')
local error_counters = {}
@ -84,7 +83,7 @@ function timer_event(ns)
end
enter_at = ns
utils.inject_bulk_metric(ns, hostname, metric_logger, metric_source)
utils.inject_bulk_metric(ns, hostname, metric_source)
return 0
end

View File

@ -80,6 +80,6 @@ function process_message ()
end
end
utils.inject_bulk_metric(ts, hostname, 'heka_monitoring', 'internal')
utils.inject_bulk_metric(ts, hostname, 'internal')
return 0
end

View File

@ -34,7 +34,6 @@ local percentile_thresh = (read_config('percentile') or 90) + 0
-- and also to compensate the delay introduced by log parsing/decoding
-- which leads to arrive too late in its interval.
local grace_time = (read_config('grace_time') or 0) + 0
local metric_logger = read_config('logger')
local metric_source = read_config('source')
local inject_reached_error = 'too many metrics to aggregate, adjust bulk_size and/or max_timer_inject parameters'
@ -167,7 +166,7 @@ function timer_event(ns)
num_metrics = num_metrics - 1
if num >= bulk_size then
if msg_injected < max_timer_inject then
utils.inject_bulk_metric(ns, hostname, metric_logger, metric_source)
utils.inject_bulk_metric(ns, hostname, metric_source)
msg_injected = msg_injected + 1
num = 0
num_metrics = 0
@ -179,7 +178,7 @@ function timer_event(ns)
all_times[service] = nil
end
if num > 0 then
utils.inject_bulk_metric(ns, hostname, metric_logger, metric_source)
utils.inject_bulk_metric(ns, hostname, metric_source)
num = 0
num_metrics = 0
end

View File

@ -26,7 +26,6 @@ local hostname = read_config('hostname') or error('hostname must be specified')
-- older than the current time.
local grace_interval = (read_config('grace_interval') or 0) + 0
local logger_matcher = read_config('logger_matcher') or '.*'
local metric_logger = read_config('logger')
local metric_source = read_config('source')
local discovered_services = {}
@ -79,7 +78,7 @@ function timer_event(ns)
last_timer_event = ns
ok, err = utils.inject_bulk_metric(ns, hostname, metric_logger, metric_source, utils.metric_type['DERIVE'])
ok, err = utils.inject_bulk_metric(ns, hostname, metric_source, utils.metric_type['DERIVE'])
if ok ~= 0 then
return -1, err
end

View File

@ -37,7 +37,6 @@ class lma_collector::logs::aggregated_http_metrics (
bulk_size => $bulk_size,
percentile => $percentile,
grace_time => $grace_time,
logger => 'aggregated_http_metrics_filter',
source => 'log_collector',
},
module_directory => $lua_modules_dir,

View File

@ -33,7 +33,6 @@ class lma_collector::logs::counter (
hostname => $hostname,
grace_interval => $grace_interval,
logger_matcher => '^openstack%.(%a+)$',
logger => 'log_counter_filter',
source => 'log_collector',
},
module_directory => $lua_modules_dir,

View File

@ -31,7 +31,6 @@ class lma_collector::logs::hdd_errors_counter (
hostname => $hostname,
grace_interval => $grace_interval,
patterns => '/error%s.+([sv]d[a-z][a-z]?)%d?/ /([sv]d[a-z][a-z]?)%d?.+%serror/',
logger => 'hdd_errors_counter_filter',
source => 'log_collector',
},
module_directory => $lua_modules_dir,