mirror of https://github.com/MISP/misp-dashboard
commit
ac28784feb
|
@ -388,7 +388,7 @@ def check_server_listening(spinner):
|
||||||
try:
|
try:
|
||||||
r = requests.get(url)
|
r = requests.get(url)
|
||||||
except requests.exceptions.ConnectionError:
|
except requests.exceptions.ConnectionError:
|
||||||
return (False, 'Can\'t connect to {}').format(url)
|
return (False, 'Can\'t connect to {}'.format(url))
|
||||||
|
|
||||||
if '/error_page' in r.url:
|
if '/error_page' in r.url:
|
||||||
o = urlparse(r.url)
|
o = urlparse(r.url)
|
||||||
|
|
|
@ -127,7 +127,7 @@ mv temp/startbootstrap-sb-admin-2-${SBADMIN_VERSION}/bower_components/font-aweso
|
||||||
mv temp/startbootstrap-sb-admin-2-${SBADMIN_VERSION}/bower_components/bootstrap/fonts/* ./static/fonts
|
mv temp/startbootstrap-sb-admin-2-${SBADMIN_VERSION}/bower_components/bootstrap/fonts/* ./static/fonts
|
||||||
|
|
||||||
# leaflet
|
# leaflet
|
||||||
LEAFLET_VERSION="1.2.0"
|
LEAFLET_VERSION="1.9.3"
|
||||||
wget http://cdn.leafletjs.com/leaflet/v${LEAFLET_VERSION}/leaflet.zip -O temp/leaflet.zip
|
wget http://cdn.leafletjs.com/leaflet/v${LEAFLET_VERSION}/leaflet.zip -O temp/leaflet.zip
|
||||||
unzip -o temp/leaflet.zip -d temp/
|
unzip -o temp/leaflet.zip -d temp/
|
||||||
|
|
||||||
|
|
|
@ -328,9 +328,13 @@ class EventMessage():
|
||||||
if self.name == 'Attribute':
|
if self.name == 'Attribute':
|
||||||
self.feed = jsonMsg['log']
|
self.feed = jsonMsg['log']
|
||||||
self.feed = LogItem(self.feed, filters).get_row()
|
self.feed = LogItem(self.feed, filters).get_row()
|
||||||
|
if (self.feed[2]):
|
||||||
|
self.feed[2]['data'] = json.dumps(self.feed[2]['data'])
|
||||||
elif self.name == 'ObjectAttribute':
|
elif self.name == 'ObjectAttribute':
|
||||||
self.feed = jsonMsg['log']
|
self.feed = jsonMsg['log']
|
||||||
self.feed = LogItem(self.feed, filters).get_row()
|
self.feed = LogItem(self.feed, filters).get_row()
|
||||||
|
if (self.feed[2]):
|
||||||
|
self.feed[2]['data'] = json.dumps(self.feed[2]['data'])
|
||||||
else:
|
else:
|
||||||
self.feed = jsonMsg['log']
|
self.feed = jsonMsg['log']
|
||||||
|
|
||||||
|
|
|
@ -93,5 +93,12 @@ else
|
||||||
echo -e $RED"\t* NOT starting flask server, made a very unrealiable check on port 8001, and something seems to be there… please double check if this is good!"$DEFAULT
|
echo -e $RED"\t* NOT starting flask server, made a very unrealiable check on port 8001, and something seems to be there… please double check if this is good!"$DEFAULT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
ps auxw |grep mispzmq.py |grep -v grep ; check_zmq_tool=$?
|
||||||
|
|
||||||
sleep 0.1
|
sleep 0.1
|
||||||
sudo -u zmqs /bin/bash ${DIR}/start_zmq.sh &
|
if [ "${check_zmq_tool}" == "1" ]; then
|
||||||
|
echo -e "MISP zmq tool is not currently running"
|
||||||
|
sudo -b su -c "/var/www/MISP/venv/bin/python /var/www/MISP/app/files/scripts/mispzmq/mispzmq.py"
|
||||||
|
fi
|
||||||
|
sleep 0.1
|
||||||
|
${DIR}/start_zmq.sh &
|
||||||
|
|
|
@ -174,7 +174,7 @@ $(document).ready(function () {
|
||||||
livelog = new $.livelog($("#divLogTable"), {
|
livelog = new $.livelog($("#divLogTable"), {
|
||||||
pollingFrequency: 5000,
|
pollingFrequency: 5000,
|
||||||
tableHeader: head,
|
tableHeader: head,
|
||||||
tableMaxEntries: 50,
|
tableMaxEntries: 300,
|
||||||
// animate: false,
|
// animate: false,
|
||||||
preDataURL: urlForLogs,
|
preDataURL: urlForLogs,
|
||||||
endpoint: urlForLogs
|
endpoint: urlForLogs
|
||||||
|
@ -194,9 +194,9 @@ function updateLogTable(name, log, zmqName, ignoreLed) {
|
||||||
ledmanager.updateKeepAlive(zmqName);
|
ledmanager.updateKeepAlive(zmqName);
|
||||||
}
|
}
|
||||||
|
|
||||||
// only add row for attribute
|
// add row for attribute and Object attribute
|
||||||
if (name == "Attribute" ) {
|
if (name == "Attribute" || name == "ObjectAttribute") {
|
||||||
var categName = log[toPlotLocationLog];
|
var categName = log[3];
|
||||||
sources.addIfNotPresent(categName);
|
sources.addIfNotPresent(categName);
|
||||||
sources.incCountOnSource(categName);
|
sources.incCountOnSource(categName);
|
||||||
sources.incCountOnSource('global');
|
sources.incCountOnSource('global');
|
||||||
|
@ -209,6 +209,7 @@ function updateLogTable(name, log, zmqName, ignoreLed) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function slideAndMax(orig, newData) {
|
function slideAndMax(orig, newData) {
|
||||||
var slided = [];
|
var slided = [];
|
||||||
var max = newData;
|
var max = newData;
|
||||||
|
@ -335,7 +336,8 @@ function createHead(callback) {
|
||||||
var $toRet;
|
var $toRet;
|
||||||
if (typeof data === 'object') {
|
if (typeof data === 'object') {
|
||||||
$toRet = $('<span></span>');
|
$toRet = $('<span></span>');
|
||||||
data.data.forEach(function(cur, i) {
|
let tagList = JSON.parse(data.data);
|
||||||
|
tagList.forEach(function(cur, i) {
|
||||||
switch (data.name) {
|
switch (data.name) {
|
||||||
case 'Tag':
|
case 'Tag':
|
||||||
var $tag = $('<a></a>');
|
var $tag = $('<a></a>');
|
||||||
|
@ -841,7 +843,7 @@ $(document).ready(function() {
|
||||||
$panel.removeClass('liveLogFullScreen');
|
$panel.removeClass('liveLogFullScreen');
|
||||||
$this.data('isfullscreen', false);
|
$this.data('isfullscreen', false);
|
||||||
$panel.find('#divLogTable').css({'overflow': 'hidden'});
|
$panel.find('#divLogTable').css({'overflow': 'hidden'});
|
||||||
livelog.changeOptions({tableMaxEntries: 50});
|
livelog.changeOptions({tableMaxEntries: 300});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
var updateIntervalDirect = 1000*2; // 2s
|
var updateIntervalDirect = 1000*2; // 2s
|
||||||
var updateInterval = 1000*60*60*graph_log_refresh_rate; // 1h
|
var updateInterval = 1000*60*60*graph_log_refresh_rate; // 1 hour
|
||||||
var maxNumPoint = hours_spanned+1;
|
var maxNumPoint = hours_spanned+1;
|
||||||
|
|
||||||
var optionsLineChart = {
|
var optionsLineChart = {
|
||||||
|
@ -8,7 +8,7 @@ var optionsLineChart = {
|
||||||
lines: {
|
lines: {
|
||||||
fill: true,
|
fill: true,
|
||||||
fillColor: {
|
fillColor: {
|
||||||
colors: [ { opacity: 1 }, { opacity: 0.1 } ]
|
colors: [ { opacity: 0.1 }, { opacity: 0.1 } ]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -17,14 +17,15 @@ var optionsLineChart = {
|
||||||
xaxis: { min: 0, max: maxNumPoint },
|
xaxis: { min: 0, max: maxNumPoint },
|
||||||
ticks: maxNumPoint+1,
|
ticks: maxNumPoint+1,
|
||||||
points: { show: true },
|
points: { show: true },
|
||||||
lines: { show: true, fill: true },
|
lines: { show: true, fill: true, lineDashType: "dash"},
|
||||||
grid: {
|
grid: {
|
||||||
tickColor: "#dddddd",
|
tickColor: "#dddddd",
|
||||||
borderWidth: 0
|
borderWidth: 0
|
||||||
},
|
},
|
||||||
legend: {
|
legend: {
|
||||||
show: true,
|
show: true,
|
||||||
position: "nw"
|
position: "nw",
|
||||||
|
dockInsidePlotArea: true
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -51,7 +52,8 @@ function updateChartDirect() {
|
||||||
plotLineChart.getOptions().yaxes[0].max = sources.getGlobalMax();
|
plotLineChart.getOptions().yaxes[0].max = sources.getGlobalMax();
|
||||||
plotLineChart.setupGrid();
|
plotLineChart.setupGrid();
|
||||||
plotLineChart.draw();
|
plotLineChart.draw();
|
||||||
//setTimeout(updateChartDirect, updateIntervalDirect);
|
setTimeout(updateChartDirect, updateIntervalDirect);
|
||||||
|
|
||||||
}
|
}
|
||||||
updateChartDirect()
|
updateChartDirect()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue