Skip to content

Stringify objects #300

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

Open
slayer wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Stringify objects #300

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05e1d4f
json helper for handlebars
slayer Aug 9, 2018
1b45f63
fix var assign
slayer Aug 9, 2018
90da75e
bump version to 0.1.30
slayer Aug 9, 2018
f7b5f29
fix knownHelpersOnly
slayer Aug 9, 2018
3bdbf64
Merge remote-tracking branch 'src-origin/master'
slayer Jan 22, 2019
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
18 changes: 12 additions & 6 deletions server/routes/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ function getMessageTemplate(handlebar, selectedConfig) {
knownHelpers: {
log: false,
lookup: false
},
knownHelpersOnly: true
}
});
var messageField = selectedConfig.fields.mapping.message;
var messageTemplate = messageFormat;
Expand All @@ -28,20 +27,27 @@ function getMessageTemplate(handlebar, selectedConfig) {
return messageTemplate; //<a class="ng-binding" ng-click="onClick('pid','{{pid}}')">{{pid}}</a> : {{syslog_message}}
}

function handlebars() {
var handlebar = require('handlebars');
handlebar.registerHelper('json', function(context) {
return JSON.stringify(context);
});
return handlebar
}

function convertToClientFormat(selectedConfig, esResponse) {
var clientResponse = [];
var hits = esResponse.hits.hits;
var template = null;
var messageFormat = selectedConfig.fields.message_format;
if (messageFormat) {
var handlebar = require('handlebars');
var handlebar = handlebars()
var messageTemplate = getMessageTemplate(handlebar, selectedConfig);
template = handlebar.compile(messageTemplate, {
knownHelpers: {
log: false,
lookup: false
},
knownHelpersOnly: true
}
});
}
for (let i = 0; i < hits.length; i++) {
Expand Down Expand Up @@ -238,7 +244,7 @@ module.exports = function (server) {
const { callWithRequest } = server.plugins.elasticsearch.getCluster('data');
var selectedConfig = request.payload.config;
var index = request.payload.index;

var hostnameField = selectedConfig.fields.mapping.hostname;
let keywordSuffix = selectedConfig.fields.keyword_suffix;
if (keywordSuffix == undefined) {
Expand Down