ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changes from !223 

Had to be manually merged because of Dashboard v3 framework change
merge-requests/367/merge
Moe 2022-08-09 17:05:17 -07:00
parent 693764e8a5
commit 637754e8c7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/events/utils.js
View File

@ -70,6 +70,9 @@ module.exports = (s,config,lang,app,io) => {
var newString = string + ''
var d = Object.assign(eventData,addOps)
var detailString = s.stringJSON(d.details)
var tag = d.details.matrices
&& d.details.matrices[0]
&& d.details.matrices[0].tag;
newString = newString
.replace(/{{TIME}}/g,d.currentTimestamp)
.replace(/{{REGION_NAME}}/g,d.details.name)
@ -77,7 +80,10 @@ module.exports = (s,config,lang,app,io) => {
.replace(/{{MONITOR_ID}}/g,d.id)
.replace(/{{MONITOR_NAME}}/g,s.group[d.ke].rawMonitorConfigurations[d.id].name)
.replace(/{{GROUP_KEY}}/g,d.ke)
.replace(/{{DETAILS}}/g,detailString)
.replace(/{{DETAILS}}/g,detailString);
if(tag){
newString = newString.replace(/{{TAG}}/g,tag)
}
if(d.details.confidence){
newString = newString
.replace(/{{CONFIDENCE}}/g,d.details.confidence)