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

add Log Stream in Monitor Settings window 

- Logging Section moved to bottom because it grows in size when logs are streaming.
merge-requests/7/head
Moe 2018-07-02 21:21:10 -07:00
parent 0fdbc9ecf0
commit 5a04813557
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
languages/en_CA.json
View File

@ -185,6 +185,7 @@
"Force Monitors Per Row": "Force Monitors Per Row",
"Monitors per row": "Monitors per row <small>for Montage</small>",
"Browser Console Log": "Browser Console Log",
"Log Stream": "Log Stream",
"All Monitors and Privileges": "All Monitors and Privileges",
"Permissions": "Permissions",
"Time-lapse Tool": "Time-lapse Tool",

3
web/libs/js/main.dash2.js
View File

@ -1734,7 +1734,8 @@ $.ccio.globalWebsocket=function(d,user){
$.ccio.pm(0,d,null,user)
break;
case'log':
$.ccio.tm(4,d,'#logs,.monitor_item[mid="'+d.mid+'"][ke="'+d.ke+'"][auth="'+user.auth_token+'"] .logs',user)
var attr = '[mid="'+d.mid+'"][ke="'+d.ke+'"][auth="'+user.auth_token+'"]'
$.ccio.tm(4,d,'#logs,'+attr+'.monitor_item .logs:visible,'+attr+'#add_monitor:visible .logs',user)
break;
case'os'://indicator
//cpu

50
web/pages/blocks/monitoredit.ejs
View File

@ -1308,30 +1308,6 @@
<input type="hidden" detail="groups">
</div>
</div>
<div class="form-group-group green" section id="monSectionLogging">
<h4><%-lang['Logging']%></h4>
<div class="row">
<div class="form-group col-md-12">
<label><div><span><%-lang['Log Level']%></span></div>
<div><select class="form-control" detail="loglevel">
<option value="quiet"><%-lang['Silent']%></option>
<option value="fatal"><%-lang['Fatal']%></option>
<option value="error" selected><%-lang['on Error']%></option>
<option value="warning"><%-lang['All Warnings']%></option>
<option value="debug"><%-lang['Debug']%></option>
</select></div>
</label>
</div>
<div class="form-group col-md-12">
<label><div><span><%-lang['Save Log in SQL']%></span></div>
<div><select class="form-control" detail="sqllog">
<option value="0" selected><%-lang.No%></option>
<option value="1"><%-lang.Yes%></option>
</select></div>
</label>
</div>
</div>
</div>
<div class="form-group-group orange" section id="monSectionCopying">
<h4><%-lang['Copy Settings']%></h4>
<div class="form-group">
@ -1435,6 +1411,32 @@
</div>
</div>
</div>
<div class="form-group-group green" section id="monSectionLogging">
<h4><%-lang['Logging']%></h4>
<div class="form-group">
<label><div><span><%-lang['Log Level']%></span></div>
<div><select class="form-control" detail="loglevel">
<option value="quiet"><%-lang['Silent']%></option>
<option value="fatal"><%-lang['Fatal']%></option>
<option value="error" selected><%-lang['on Error']%></option>
<option value="warning"><%-lang['All Warnings']%></option>
<option value="debug"><%-lang['Debug']%></option>
</select></div>
</label>
</div>
<div class="form-group">
<label><div><span><%-lang['Save Log in SQL']%></span></div>
<div><select class="form-control" detail="sqllog">
<option value="0" selected><%-lang.No%></option>
<option value="1"><%-lang.Yes%></option>
</select></div>
</label>
</div>
<div class="form-group-group green">
<h4><%-lang['Log Stream']%></h4>
<div class="data-menu logs"></div>
</div>
</div>
</div>
<div class="form-group" style="display:none">
<input type="hidden" detail="detector_cascades">