Skip to content

Commit

Permalink
Only have -pc/-pk apply to syscall rules (#495)
Browse files Browse the repository at this point in the history
Currently, -pc/-pk results in extra fields added to the output field of
all rules. They should only be added for syscall rules.
  • Loading branch information
mstemm committed Jan 14, 2019
1 parent 611877e commit 5e5742f
Showing 1 changed file with 17 additions and 15 deletions.
32 changes: 17 additions & 15 deletions userspace/engine/lua/rule_loader.lua
Original file line number Diff line number Diff line change
Expand Up @@ -493,24 +493,26 @@ function load_rules(sinsp_lua_parser,
-- If the format string contains %container.info, replace it
-- with extra. Otherwise, add extra onto the end of the format
-- string.
if string.find(v['output'], "%container.info", nil, true) ~= nil then

-- There may not be any extra, or we're not supposed
-- to replace it, in which case we use the generic
-- "%container.name (id=%container.id)"
if replace_container_info == false then
v['output'] = string.gsub(v['output'], "%%container.info", "%%container.name (id=%%container.id)")
if v['source'] == "syscall" then
if string.find(v['output'], "%container.info", nil, true) ~= nil then

-- There may not be any extra, or we're not supposed
-- to replace it, in which case we use the generic
-- "%container.name (id=%container.id)"
if replace_container_info == false then
v['output'] = string.gsub(v['output'], "%%container.info", "%%container.name (id=%%container.id)")
if extra ~= "" then
v['output'] = v['output'].." "..extra
end
else
safe_extra = string.gsub(extra, "%%", "%%%%")
v['output'] = string.gsub(v['output'], "%%container.info", safe_extra)
end
else
-- Just add the extra to the end
if extra ~= "" then
v['output'] = v['output'].." "..extra
end
else
safe_extra = string.gsub(extra, "%%", "%%%%")
v['output'] = string.gsub(v['output'], "%%container.info", safe_extra)
end
else
-- Just add the extra to the end
if extra ~= "" then
v['output'] = v['output'].." "..extra
end
end

Expand Down

0 comments on commit 5e5742f

Please sign in to comment.