Skip to content

added meta data field support #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2019
Merged

added meta data field support #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cloudwatchlogs-with-dlq/cloudwatchlogs_lambda.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,12 @@ function getConfig(env) {
// SumoLogic Endpoint to post logs
"SumoURL": env.SUMO_ENDPOINT,

// The following parameters override the sourceCategory, sourceHost and sourceName metadata fields within SumoLogic.
// The following parameters override the sourceCategory, sourceHost, sourceName and sourceFields metadata fields within SumoLogic.
// Not these can also be overridden via json within the message payload. See the README for more information.
"sourceCategoryOverride": ("SOURCE_CATEGORY_OVERRIDE" in env) ? env.SOURCE_CATEGORY_OVERRIDE: '', // If none sourceCategoryOverride will not be overridden
"sourceHostOverride": ("SOURCE_HOST_OVERRIDE" in env) ? env.SOURCE_HOST_OVERRIDE : '', // If none sourceHostOverride will not be set to the name of the logGroup
"sourceNameOverride": ("SOURCE_NAME_OVERRIDE" in env) ? env.SOURCE_NAME_OVERRIDE : '', // If none sourceNameOverride will not be set to the name of the logStream
"sourceFieldsOverride": ("SOURCE_FIELDS_OVERRIDE" in env) ? env.SOURCE_FIELDS_OVERRIDE: '', // If none sourceFieldsOverride will not be overridden
"sourceHostOverride": ("SOURCE_HOST_OVERRIDE" in env) ? env.SOURCE_HOST_OVERRIDE : '', // If none sourceHostOverride will not be set to the name of the logGroup
"sourceNameOverride": ("SOURCE_NAME_OVERRIDE" in env) ? env.SOURCE_NAME_OVERRIDE : '', // If none sourceNameOverride will not be set to the name of the logStream
"SUMO_CLIENT_HEADER": env.SUMO_CLIENT_HEADER || 'cwl-aws-lambda',
// CloudWatch logs encoding
"encoding": env.ENCODING || 'utf-8', // default is utf-8
Expand Down
9 changes: 6 additions & 3 deletions cloudwatchlogs-with-dlq/sumo-dlq-function-utils/lib/sumologsclient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@ function SumoLogsClient(config) {

SumoLogsClient.prototype.generateHeaders = function(config, message, awslogsData) {
var sourceCategory = config.sourceCategoryOverride || '';
var sourceFields = config.sourceFieldsOverride || '';
var sourceName = config.sourceNameOverride || ((awslogsData) ? awslogsData.logStream : '');
var sourceHost = config.sourceHostOverride || ((awslogsData) ? awslogsData.logGroup : '');

var headerObj = {
'X-Sumo-Name':sourceName, 'X-Sumo-Category':sourceCategory,
'X-Sumo-Host':sourceHost, 'X-Sumo-Client': config.SUMO_CLIENT_HEADER
'X-Sumo-Host':sourceHost, 'X-Sumo-Fields':sourceFields,
'X-Sumo-Client': config.SUMO_CLIENT_HEADER
};

var metadataMap = {category: "X-Sumo-Category", sourceName: "X-Sumo-Name", sourceHost: "X-Sumo-Host"};
var metadataMap = {category: "X-Sumo-Category", sourceName: "X-Sumo-Name", sourceHost: "X-Sumo-Host", sourceFieldsOverride: "X-Sumo-Fields"};
if (message.hasOwnProperty('_sumo_metadata')) {
var metadataOverride = message._sumo_metadata;
Object.getOwnPropertyNames(metadataOverride).forEach( function(property) {
Expand All @@ -47,6 +49,7 @@ SumoLogsClient.prototype.createPromises = function(messages, is_compressed) {
'X-Sumo-Name': headerArray[0],
'X-Sumo-Category': headerArray[1],
'X-Sumo-Host': headerArray[2],
'X-Sumo-Fields': headerArray[3],
'X-Sumo-Client': self.SUMO_CLIENT_HEADER
};
var options = Object.assign({}, self.options);
Expand Down Expand Up @@ -100,7 +103,7 @@ SumoLogsClient.prototype.postToSumo = function(messages, is_compressed) {
};

SumoLogsClient.prototype.getMetaDataKey = function(headerObj) {
return headerObj['X-Sumo-Name'] + ':' + headerObj['X-Sumo-Category'] + ':' + headerObj['X-Sumo-Host'];
return headerObj['X-Sumo-Name'] + ':' + headerObj['X-Sumo-Category'] + ':' + headerObj['X-Sumo-Host'] + ':' + headerObj['X-Sumo-Fields'];
};


Expand Down