-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
feat: development of Loggly logging plugin #6113
Merged
spacewander
merged 14 commits into
apache:master
from
bisakhmondal:plugin/logger/loggly
Jan 26, 2022
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
2f07687
working implementation of loggly plugin
bisakhmondal 376a19e
fixed formatting issue
bisakhmondal 2ab6f1f
revert rfc5424 module
bisakhmondal b885086
loggly tests
bisakhmondal 7fa9cc1
loggly documentation
bisakhmondal a3e4559
remove latency details method from recalling
bisakhmondal 3976fa4
update with log_format
bisakhmondal 9f4f17a
applied code review suggestions
bisakhmondal 7f71ddc
fail fast batch processor exec
bisakhmondal 1086d94
new test
bisakhmondal b432d13
Merge branch 'master' into plugin/logger/loggly
bisakhmondal f708656
streamline mock layer4 methods
bisakhmondal 0705084
tests with log_format and include_resp_body_expr
bisakhmondal dc65f2c
lint fix
bisakhmondal File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,260 @@ | ||
-- | ||
-- Licensed to the Apache Software Foundation (ASF) under one or more | ||
-- contributor license agreements. See the NOTICE file distributed with | ||
-- this work for additional information regarding copyright ownership. | ||
-- The ASF licenses this file to You under the Apache License, Version 2.0 | ||
-- (the "License"); you may not use this file except in compliance with | ||
-- the License. You may obtain a copy of the License at | ||
-- | ||
-- http://www.apache.org/licenses/LICENSE-2.0 | ||
-- | ||
-- Unless required by applicable law or agreed to in writing, software | ||
-- distributed under the License is distributed on an "AS IS" BASIS, | ||
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
-- See the License for the specific language governing permissions and | ||
-- limitations under the License. | ||
-- | ||
local core = require("apisix.core") | ||
local plugin = require("apisix.plugin") | ||
local bp_manager_mod = require("apisix.utils.batch-processor-manager") | ||
local log_util = require("apisix.utils.log-util") | ||
local ngx = ngx | ||
local tostring = tostring | ||
local pairs = pairs | ||
local tab_concat = table.concat | ||
local udp = ngx.socket.udp | ||
|
||
local plugin_name = "loggly" | ||
local batch_processor_manager = bp_manager_mod.new(plugin_name) | ||
|
||
|
||
local severity = { | ||
EMEGR = 0, -- system is unusable | ||
ALERT = 1, -- action must be taken immediately | ||
CRIT = 2, -- critical conditions | ||
ERR = 3, -- error conditions | ||
WARNING = 4, -- warning conditions | ||
NOTICE = 5, -- normal but significant condition | ||
INFO = 6, -- informational | ||
DEBUG = 7, -- debug-level messages | ||
} | ||
|
||
|
||
local severity_enums = {} | ||
do | ||
for k, _ in pairs(severity) do | ||
severity_enums[#severity_enums+1] = k | ||
severity_enums[#severity_enums+1] = k:lower() | ||
end | ||
end | ||
|
||
|
||
local schema = { | ||
type = "object", | ||
properties = { | ||
customer_token = {type = "string"}, | ||
severity = { | ||
type = "string", | ||
default = "INFO", | ||
enum = severity_enums, | ||
description = "base severity log level", | ||
}, | ||
include_req_body = {type = "boolean", default = false}, | ||
include_resp_body = {type = "boolean", default = false}, | ||
include_resp_body_expr = { | ||
type = "array", | ||
minItems = 1, | ||
items = { | ||
type = "array" | ||
} | ||
}, | ||
tags = { | ||
type = "array", | ||
minItems = 1, | ||
items = { | ||
type = "string", | ||
-- we prevent of having `tag=` prefix | ||
pattern = "^(?!tag=)[ -~]*", | ||
}, | ||
}, | ||
}, | ||
required = {"customer_token"} | ||
} | ||
|
||
|
||
local defaults = { | ||
host = "logs-01.loggly.com", | ||
port = 514, | ||
protocol = "syslog", | ||
timeout = 5000 | ||
} | ||
|
||
|
||
local metadata_schema = { | ||
type = "object", | ||
properties = { | ||
host = { | ||
type = "string", | ||
default = defaults.host | ||
}, | ||
port = { | ||
type = "integer", | ||
default = defaults.port | ||
}, | ||
protocol = { | ||
type = "string", | ||
default = defaults.protocol, | ||
-- more methods coming soon | ||
enum = {"syslog"} | ||
}, | ||
timeout = { | ||
type = "integer", | ||
minimum = 1, | ||
default= defaults.timeout | ||
}, | ||
log_format = { | ||
type = "object", | ||
} | ||
} | ||
} | ||
|
||
|
||
local _M = { | ||
version = 0.1, | ||
priority = 411, | ||
name = plugin_name, | ||
schema = batch_processor_manager:wrap_schema(schema), | ||
metadata_schema = metadata_schema | ||
} | ||
|
||
|
||
function _M.check_schema(conf, schema_type) | ||
if schema_type == core.schema.TYPE_METADATA then | ||
return core.schema.check(metadata_schema, conf) | ||
end | ||
|
||
local ok, err = core.schema.check(schema, conf) | ||
if not ok then | ||
return nil, err | ||
end | ||
return log_util.check_log_schema(conf) | ||
shuaijinchao marked this conversation as resolved.
Show resolved
Hide resolved
|
||
end | ||
|
||
|
||
function _M.body_filter(conf, ctx) | ||
log_util.collect_body(conf, ctx) | ||
end | ||
|
||
|
||
local function generate_log_message(conf, ctx) | ||
local metadata = plugin.plugin_metadata(plugin_name) | ||
local entry | ||
|
||
if metadata and metadata.value.log_format | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's refactor it in the next PR There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes |
||
and core.table.nkeys(metadata.value.log_format) > 0 | ||
then | ||
entry = log_util.get_custom_format_log(ctx, metadata.value.log_format) | ||
else | ||
entry = log_util.get_full_log(ngx, conf) | ||
end | ||
|
||
-- generate rfc5424 compliant syslog event | ||
local json_str, err = core.json.encode(entry) | ||
if not json_str then | ||
core.log.error('error occurred while encoding the data: ', err) | ||
return nil | ||
end | ||
|
||
local timestamp = log_util.get_rfc3339_zulu_timestamp() | ||
local taglist = {} | ||
if conf.tags then | ||
for i = 1, #conf.tags do | ||
core.table.insert(taglist, "tag=\"" .. conf.tags[i] .. "\"") | ||
end | ||
end | ||
local message = { | ||
-- facility LOG_USER - random user level message | ||
"<".. tostring(8 + severity[conf.severity:upper()]) .. ">1",-- <PRIVAL>1 | ||
timestamp, -- timestamp | ||
ctx.var.host or "-", -- hostname | ||
"apisix", -- appname | ||
ctx.var.pid, -- proc-id | ||
"-", -- msgid | ||
"[" .. conf.customer_token .. "@41058 " .. tab_concat(taglist, " ") .. "]", | ||
json_str | ||
} | ||
|
||
return tab_concat(message, " ") | ||
end | ||
|
||
|
||
local function send_data_over_udp(message) | ||
local metadata = plugin.plugin_metadata(plugin_name) | ||
core.log.info("metadata: ", core.json.delay_encode(metadata)) | ||
|
||
if not metadata then | ||
core.log.info("received nil metadata: using metadata defaults: ", | ||
core.json.delay_encode(defaults, true)) | ||
metadata = {} | ||
metadata.value = defaults | ||
end | ||
local err_msg | ||
local res = true | ||
local sock = udp() | ||
local host, port = metadata.value.host, metadata.value.port | ||
sock:settimeout(metadata.value.timeout) | ||
|
||
core.log.info("sending a batch logs to ", host, ":", port) | ||
|
||
local ok, err = sock:setpeername(host, port) | ||
|
||
if not ok then | ||
core.log.error("failed to send log: ", err) | ||
return false, "failed to connect to UDP server: host[" .. host | ||
.. "] port[" .. tostring(port) .. "] err: " .. err | ||
end | ||
|
||
ok, err = sock:send(message) | ||
if not ok then | ||
res = false | ||
core.log.error("failed to send log: ", err) | ||
err_msg = "failed to send data to UDP server: host[" .. host | ||
.. "] port[" .. tostring(port) .. "] err:" .. err | ||
end | ||
|
||
ok, err = sock:close() | ||
if not ok then | ||
core.log.error("failed to close the UDP connection, host[", | ||
host, "] port[", port, "] ", err) | ||
end | ||
|
||
return res, err_msg | ||
end | ||
|
||
|
||
local function handle_log(entries) | ||
for i = 1, #entries do | ||
local ok, err = send_data_over_udp(entries[i]) | ||
if not ok then | ||
return false, err | ||
end | ||
end | ||
return true | ||
end | ||
|
||
|
||
function _M.log(conf, ctx) | ||
local log_data = generate_log_message(conf, ctx) | ||
if not log_data then | ||
return | ||
end | ||
|
||
if batch_processor_manager:add_entry(conf, log_data) then | ||
return | ||
end | ||
|
||
batch_processor_manager:add_entry_to_new_processor(conf, log_data, ctx, handle_log) | ||
end | ||
|
||
|
||
return _M |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we refactor it to avoid adding the same group of fields to each logger?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And you miss to call
log_util.collect_body(conf, ctx)
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, similar to what we did to batchprocessor. Let's handle that in the next PR.
RE collect_body: Good catch. Adding, Thanks