';
tablehtml += '| '+arrayqueryloglines[i].ReqDmn+' | ';
@@ -1476,29 +1603,33 @@ function BuildQueryLogTableHtml(){
return tablehtml;
}
-function get_querylog_file(){
+function get_querylog_file()
+{
$.ajax({
url: '/ext/uiDivStats/csv/SQLQueryLog.htm',
dataType: 'text',
error: function(xhr){
tout = setTimeout(get_querylog_file,1000);
},
- success: function(data){
+ success: function(data)
+ {
ParseQueryLog(data);
document.getElementById('imgRefreshNow').style.display = 'none';
showhide('spanRefreshNow',true);
- if(document.getElementById('auto_refresh').checked){
+ if (document.getElementById('auto_refresh').checked){
tout = setTimeout(get_querylog_file,60000);
}
}
});
}
-function ParseQueryLog(data){
+function ParseQueryLog(data)
+{
var arrayloglines = data.split('\n');
arrayloglines = arrayloglines.filter(Boolean);
arrayqueryloglines = [];
- for(var i = 0; i < arrayloglines.length; i++){
+ for (var i = 0; i < arrayloglines.length; i++)
+ {
var logfields = arrayloglines[i].split('|');
var parsedlogline = new Object();
parsedlogline.Time = moment.unix(logfields[0]).format('YYYY-MM-DD HH:mm').trim();
@@ -1512,46 +1643,57 @@ function ParseQueryLog(data){
FilterQueryLog();
}
-function FilterQueryLog(){
- if( $('#filter_reqdmn').val() == '' && $('#filter_srcip').val() == '' && $('#filter_qrytype option:selected').val() == 0 && $('#filter_result option:selected').val() == 0 ){
+function FilterQueryLog()
+{
+ if ($('#filter_reqdmn').val() == '' && $('#filter_srcip').val() == '' && $('#filter_qrytype option:selected').val() == 0 && $('#filter_result option:selected').val() == 0 )
+ {
arrayqueryloglines = originalarrayqueryloglines;
}
- else{
+ else
+ {
arrayqueryloglines = originalarrayqueryloglines;
- if($('#filter_reqdmn').val() != '' ){
- if($('#filter_reqdmn').val().startsWith('!')){
+ if ($('#filter_reqdmn').val() != '' )
+ {
+ if ($('#filter_reqdmn').val().startsWith('!'))
+ {
arrayqueryloglines = arrayqueryloglines.filter(function(item){
return item.ReqDmn.toLowerCase().indexOf($('#filter_reqdmn').val().replace('!','').toLowerCase()) == -1;
});
}
- else{
+ else
+ {
arrayqueryloglines = arrayqueryloglines.filter(function(item){
return item.ReqDmn.toLowerCase().indexOf($('#filter_reqdmn').val().toLowerCase()) != -1;
});
}
}
- if( $('#filter_srcip').val() != '' ){
- if($('#filter_srcip').val().startsWith('!')){
+ if ( $('#filter_srcip').val() != '' )
+ {
+ if ($('#filter_srcip').val().startsWith('!'))
+ {
arrayqueryloglines = arrayqueryloglines.filter(function(item){
return item.SrcIP.indexOf($('#filter_srcip').val().replace('!','')) == -1;
});
}
- else{
+ else
+ {
arrayqueryloglines = arrayqueryloglines.filter(function(item){
return item.SrcIP.indexOf($('#filter_srcip').val()) != -1;
});
}
}
- if( $('#filter_qrytype option:selected').val() != 0 ){
+ if ( $('#filter_qrytype option:selected').val() != 0 )
+ {
arrayqueryloglines = arrayqueryloglines.filter(function(item){
return item.QryType == $('#filter_qrytype option:selected').text();
});
}
- if( $('#filter_result option:selected').val() != 0 ){
+ if ( $('#filter_result option:selected').val() != 0 )
+ {
arrayqueryloglines = arrayqueryloglines.filter(function(item){
return item.Result == $('#filter_result option:selected').text();
});
@@ -1561,36 +1703,41 @@ function FilterQueryLog(){
SortTable(sortname+' '+sortdir.replace('desc','↑').replace('asc','↓').trim());
}
-function SortTable(sorttext){
+function SortTable(sorttext)
+{
sortname = sorttext.replace('↑','').replace('↓','').trim();
var sortfield = sortname;
- switch(sortname){
+ switch(sortname)
+ {
case 'Time':
sortfield='Time';
- break;
+ break;
case 'Domain':
sortfield='ReqDmn';
- break;
+ break;
case 'Client':
sortfield='SrcIP';
- break;
+ break;
case 'Type':
sortfield='QryType';
- break;
+ break;
case 'Result':
sortfield='Result';
- break;
+ break;
}
- if(sorttext.indexOf('↓') == -1 && sorttext.indexOf('↑') == -1){
+ if (sorttext.indexOf('↓') == -1 && sorttext.indexOf('↑') == -1)
+ {
eval('arrayqueryloglines = arrayqueryloglines.sort((a,b) => (a.'+sortfield+' > b.'+sortfield+') ? 1 : ((b.'+sortfield+' > a.'+sortfield+') ? -1 : 0)); ');
sortdir = 'asc';
}
- else if(sorttext.indexOf('↓') != -1){
+ else if (sorttext.indexOf('↓') != -1)
+ {
eval('arrayqueryloglines = arrayqueryloglines.sort((a,b) => (a.'+sortfield+' > b.'+sortfield+') ? 1 : ((b.'+sortfield+' > a.'+sortfield+') ? -1 : 0)); ');
sortdir = 'asc';
}
- else{
+ else
+ {
eval('arrayqueryloglines = arrayqueryloglines.sort((a,b) => (a.'+sortfield+' < b.'+sortfield+') ? 1 : ((b.'+sortfield+' < a.'+sortfield+') ? -1 : 0)); ');
sortdir = 'desc';
}
@@ -1610,7 +1757,8 @@ function SortTable(sorttext){
});
}
-function Assign_EventHandlers(){
+function Assign_EventHandlers()
+{
$('.collapsible-jquery').off('click').on('click',function(){
$(this).siblings().toggle('fast',function(){
if($(this).css('display') == 'none'){
@@ -1650,6 +1798,7 @@ function Assign_EventHandlers(){
$('#auto_refresh').off('click').on('click',function(){ToggleRefresh();});
}
-function ToggleRefresh(){
+function ToggleRefresh()
+{
$('#auto_refresh').prop('checked',function(i,v){ if(v){get_querylog_file();} else{clearTimeout(tout);} });
}
-
+
diff --git a/uidivstats_www.js b/uidivstats_www.js
index 2074f3f..b3e34d0 100644
--- a/uidivstats_www.js
+++ b/uidivstats_www.js
@@ -1,3 +1,7 @@
+/**----------------------------**/
+/** Last Modified: 2026-Jan-18 **/
+/**----------------------------**/
+
var maxNoChartsBlocked = 6;
var currentNoChartsBlocked = 0;
var maxNoChartsTotal = 6;
@@ -184,7 +188,11 @@ function Draw_Chart_NoData(txtchartname,texttodisplay)
ctx.restore();
}
-function Draw_Chart(txtchartname){
+/**----------------------------------------**/
+/** Modified by Martinski W. [2026-Jan-19] **/
+/**----------------------------------------**/
+function Draw_Chart(txtchartname)
+{
var chartperiod = getChartPeriod($('#'+txtchartname+'_Period option:selected').val());
var charttype = getChartType($('#'+txtchartname+'_Type option:selected').val());
var chartclientraw = $('#'+txtchartname+'_Clients option:selected').text();
@@ -192,39 +200,54 @@ function Draw_Chart(txtchartname){
var chartclient = chartclientraw.substring(chartclientraw.indexOf('(')+1,chartclientraw.indexOf(')',chartclientraw.indexOf('(')+1))
var dataobject;
- if(chartclientraw == 'All (*)'){
+ if (chartclientraw == 'All (*)')
+ {
dataobject = window[txtchartname+chartperiod];
}
- else{
+ else
+ {
dataobject = window[txtchartname+chartperiod+'clients'];
}
- if(typeof dataobject === 'undefined' || dataobject === null){ Draw_Chart_NoData(txtchartname,'No data to display'); return; }
- if(dataobject.length == 0){ Draw_Chart_NoData(txtchartname,'No data to display'); return; }
-
- var chartData,chartLabels;
+ if (typeof dataobject === 'undefined' || dataobject === null || dataobject.length === 0)
+ {
+ Draw_Chart_NoData(txtchartname,'No data to display');
+ return;
+ }
+ var chartData, chartLongLabels, chartShortLabels = [];
- if(chartclientraw == 'All (*)'){
+ if (chartclientraw == 'All (*)')
+ {
chartData = dataobject.map(function(d){return d.Count});
- chartLabels = dataobject.map(function(d){return d.ReqDmn});
+ chartLongLabels = dataobject.map(function(d){return d.ReqDmn});
}
- else{
- chartData = dataobject.filter(function(item){
- return item.SrcIP == chartclient;
- }).map(function(d){return d.Count});
- chartLabels = dataobject.filter(function(item){
- return item.SrcIP == chartclient;
- }).map(function(d){return d.ReqDmn});
+ else
+ {
+ chartData = dataobject.filter(function(item){return item.SrcIP == chartclient;}).map(function(d){return d.Count});
+ chartLongLabels = dataobject.filter(function(item){return item.SrcIP == chartclient;}).map(function(d){return d.ReqDmn});
+ }
+
+ for (var indx = 0; indx < chartLongLabels.length; indx++)
+ {
+ if (chartLongLabels[indx].length <= 33)
+ { chartShortLabels.push(chartLongLabels[indx]); }
+ else
+ { chartShortLabels.push(chartLongLabels[indx].substr(0, 25) + '...'); }
}
- $.each(chartLabels,function(index,value){
- chartLabels[index] = chunk(value.toLowerCase(),30).join('\n');
+ $.each(chartShortLabels,function(index,value){
+ chartShortLabels[index] = ChunkString(value.toLowerCase(),50).join('\n');
+ });
+
+ $.each(chartLongLabels,function(index,value){
+ chartLongLabels[index] = ChunkString(value.toLowerCase(),50).join('\n');
});
var objchartname = window['Chart'+txtchartname];;
- if(objchartname != undefined) objchartname.destroy();
+ if (objchartname !== undefined) { objchartname.destroy(); }
var ctx = document.getElementById('canvasChart'+txtchartname).getContext('2d');
- var chartOptions = {
+ var chartOptions =
+ {
segmentShowStroke: false,
segmentStrokeColor: '#000',
animationEasing: 'easeOutQuart',
@@ -250,12 +273,15 @@ function Draw_Chart(txtchartname){
position: 'top'
},
tooltips: {
- callbacks: {
- title: function(tooltipItem,data){
- return data.labels[tooltipItem[0].index];
+ callbacks:
+ {
+ title: function(tooltipItem,data)
+ {
+ return data.labelsLong[tooltipItem[0].index];
},
- label: function(tooltipItem,data){
- return comma(data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index]);
+ label: function(tooltipItem,data)
+ {
+ return data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
}
},
mode: 'point',
@@ -340,12 +366,15 @@ function Draw_Chart(txtchartname){
}
}
};
- var chartDataset = {
- labels: chartLabels,
+
+ var chartDataset =
+ {
+ labels: chartShortLabels,
+ labelsLong: chartLongLabels,
datasets: [{
data: chartData,
borderWidth: 1,
- backgroundColor: poolColors(chartLabels.length),
+ backgroundColor: poolColors(chartLongLabels.length),
borderColor: '#000000'
}]
};
@@ -354,11 +383,10 @@ function Draw_Chart(txtchartname){
options: chartOptions,
data: chartDataset,
plugins: [{
- beforeInit: function(chart){
- chart.data.labels.forEach(function(e,i,a){
- if(/\n/.test(e)){
- a[i] = e.split(/\n/);
- }
+ beforeInit: function(chart)
+ {
+ chart.data.labelsLong.forEach(function(e,i,a){
+ if (/\n/.test(e)) { a[i] = e.split(/\n/); }
});
}
}]
@@ -366,20 +394,26 @@ function Draw_Chart(txtchartname){
window['Chart'+txtchartname] = objchartname;
}
-function Draw_Time_Chart(txtchartname){
+function Draw_Time_Chart(txtchartname)
+{
var chartperiod = getChartPeriod($('#'+txtchartname+'time_Period option:selected').val());
var txttitle = 'DNS Queries';
var txtunitx = timeunitlist[$('#'+txtchartname+'time_Period option:selected').val()];
var numunitx = intervallist[$('#'+txtchartname+'time_Period option:selected').val()];
var dataobject = window[txtchartname+chartperiod+'time'];
- if(typeof dataobject === 'undefined' || dataobject === null){ Draw_Chart_NoData(txtchartname+'time','No data to display'); return; }
- if(dataobject.length == 0){ Draw_Chart_NoData(txtchartname+'time','No data to display'); return; }
+ if (typeof dataobject === 'undefined' || dataobject === null || dataobject.length === 0)
+ {
+ Draw_Chart_NoData(txtchartname+'time','No data to display');
+ return;
+ }
var unique = [];
var chartQueryTypes = [];
- for(let i = 0; i < dataobject.length; i++ ){
- if( !unique[dataobject[i].Fieldname]){
+ for (let i = 0; i < dataobject.length; i++)
+ {
+ if (!unique[dataobject[i].Fieldname])
+ {
chartQueryTypes.push(dataobject[i].Fieldname);
unique[dataobject[i].Fieldname] = 1;
}
@@ -388,16 +422,19 @@ function Draw_Time_Chart(txtchartname){
var chartData = dataobject.map(function(d){ return {x: d.Time,y: d.QueryCount}});
var objchartname = window['Chart'+txtchartname+'time'];;
- factor=0;
- if(txtunitx=='hour'){
- factor=60*60*1000;
+ let factor = 0, hour_factor = (60 * 60 * 1000);
+ if (txtunitx === 'hour')
+ {
+ factor = hour_factor;
}
- else if(txtunitx=='day'){
- factor=60*60*24*1000;
+ else if (txtunitx === 'day')
+ {
+ factor = (hour_factor * 24);
}
- if(objchartname != undefined) objchartname.destroy();
+ if (objchartname != undefined) { objchartname.destroy(); }
var ctx = document.getElementById('canvasChart'+txtchartname+'time').getContext('2d');
- var lineOptions = {
+ var lineOptions =
+ {
segmentShowStroke : false,
segmentStrokeColor : '#000',
animationEasing : 'easeOutQuart',
@@ -421,10 +458,10 @@ function Draw_Time_Chart(txtchartname){
type: 'time',
gridLines: { display: true,color: '#282828' },
ticks: {
- min: moment().subtract(numunitx,txtunitx+'s'),
+ min: moment().subtract(numunitx, txtunitx+'s'),
display: true
},
- time: { parser: 'X',unit: txtunitx,stepSize: 1 }
+ time: { parser: 'X',unit: txtunitx, stepSize: 1}
}],
yAxes: [{
type: getChartScale($('#'+txtchartname+'time_Scale option:selected').val(),'time','y'),
@@ -483,11 +520,13 @@ function Draw_Time_Chart(txtchartname){
window['Chart'+txtchartname+'time']=objchartname;
}
-function getDataSets(txtchartname,objdata,objQueryTypes){
+function getDataSets(txtchartname,objdata,objQueryTypes)
+{
var datasets = [];
colourname='#fc8500';
- for(var i = 0; i < objQueryTypes.length; i++){
+ for (var i = 0; i < objQueryTypes.length; i++)
+ {
var querytypedata = objdata.filter(function(item){
return item.Fieldname == objQueryTypes[i];
}).map(function(d){return {x: d.Time,y: d.QueryCount}});
@@ -498,49 +537,61 @@ function getDataSets(txtchartname,objdata,objQueryTypes){
return datasets;
}
-function chunk(str,n){
- var ret = [];
- var i;
- var len;
+function ChunkString(theString,chunkSize)
+{
+ var strArray = [];
+ var strLength = theString.length;
- for(var i = 0,len = str.length; i < len; i += n){
- ret.push(str.substr(i,n));
+ for (var indx = 0; indx < strLength; indx += chunkSize)
+ {
+ strArray.push(theString.substr(indx,chunkSize));
}
-
- return ret;
+ return strArray;
};
-function LogarithmicFormatter(tickValue,index,ticks){
- if(this.type != 'logarithmic'){
- if(! isNaN(tickValue)){
+function LogarithmicFormatter(tickValue,index,ticks)
+{
+ if (this.type !== 'logarithmic')
+ {
+ if (! isNaN(tickValue))
+ {
return round(tickValue,0).toFixed(0);
}
- else{
+ else
+ {
return tickValue;
}
}
- else{
+ else
+ {
var labelOpts = this.options.ticks.labels || {};
var labelIndex = labelOpts.index || ['min','max'];
var labelSignificand = labelOpts.significand || [1,2,5];
var significand = tickValue / (Math.pow(10,Math.floor(Chart.helpers.log10(tickValue))));
var emptyTick = labelOpts.removeEmptyLines === true ? undefined : '';
var namedIndex = '';
- if(index === 0){
+ if (index === 0)
+ {
namedIndex = 'min';
}
- else if(index === ticks.length - 1){
+ else if (index === ticks.length - 1)
+ {
namedIndex = 'max';
}
- if(labelOpts === 'all' || labelSignificand.indexOf(significand) !== -1 || labelIndex.indexOf(index) !== -1 || labelIndex.indexOf(namedIndex) !== -1){
- if(tickValue === 0){
+ if (labelOpts === 'all' || labelSignificand.indexOf(significand) !== -1 || labelIndex.indexOf(index) !== -1 || labelIndex.indexOf(namedIndex) !== -1)
+ {
+ if (tickValue === 0)
+ {
return '0';
}
- else{
- if(! isNaN(tickValue)){
+ else
+ {
+ if (! isNaN(tickValue))
+ {
return round(tickValue,0).toFixed(0);
}
- else{
+ else
+ {
return tickValue;
}
}
@@ -551,24 +602,28 @@ function LogarithmicFormatter(tickValue,index,ticks){
function GetCookie(cookiename,returntype)
{
- if(cookie.get('uidivstats_'+cookiename) != null){
+ if (cookie.get('uidivstats_'+cookiename) !== null)
+ {
return cookie.get('uidivstats_'+cookiename);
}
- else{
- if(returntype == 'string'){
+ else
+ {
+ if (returntype === 'string'){
return '';
}
- else if(returntype == 'number'){
+ else if(returntype === 'number'){
return 0;
}
}
}
-function SetCookie(cookiename,cookievalue){
+function SetCookie(cookiename,cookievalue)
+{
cookie.set('uidivstats_'+cookiename,cookievalue,10 * 365);
}
-function SetCurrentPage(){
+function SetCurrentPage()
+{
document.form.next_page.value = window.location.pathname.substring(1);
document.form.current_page.value = window.location.pathname.substring(1);
}
@@ -616,6 +671,8 @@ function get_sqldata_file()
{
var backgroundProcsStateStr;
SetuiDivStatsTitle();
+ showhide('imgUpdateStats',false);
+ showhide('uidivstats_text',false);
document.getElementById('databaseSize_text').textContent = 'Database Size: '+sqlDatabaseFileSize;
document.getElementById('tmpfsFreeSpace_text').innerHTML =
'TMPFS Reported: '+tmpfsAvailableSpace+'