Skip to content
Snippets Groups Projects
Commit a620bc2f authored by Nigel Kukard's avatar Nigel Kukard
Browse files

Removed awit-flot, we now using a submodule

parent 07b8c174
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
opentrafficshaper/plugins/webserver/pages/static/awit-flot/functions.js deleted 100644 → 0
+ 0
− 167
View file @ 07b8c174
/*
* Functions used for FLOT charts
* Copyright (c) 2013, AllWorldIT
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
*
*/
// Function to format thousands with , and add Kbps
function awit_flot_format_bandwidth(value, axis) {
return awit_flot_format_thousands(value,axis) + ' Kbps';
}
// Function to format thousands
function awit_flot_format_thousands(value, axis) {
// Convert number to string
value = value.toString();
// Match on 3 digits
var R = new RegExp('(-?[0-9]+)([0-9]{3})');
while(R.test(value)) {
// Replace market with ,
value = value.replace(R, '$1,$2');
}
return value;
}
// Function draw a graph
function awit_flot_draw_graph(options) {
// Setting up the graph here
var baseOptions = {
series: {
lines: {
show: true,
lineWidth: 1,
fill: true,
fillColor: {
colors: [
{ opacity: 0.1 },
{ opacity: 0.13 }
]
}
},
points: {
show: false,
lineWidth: 2,
radius: 3
},
shadowSize: 0,
stack: true
},
grid: {
hoverable: true,
clickable: false,
tickColor: "#f9f9f9",
borderWidth: 1
},
legend: {
labelBoxBorderColor: "#aaa"
},
xaxes: [
{
mode: "time",
tickSize: [60, "second"],
tickFormatter: function (v, axis) {
var date = new Date(v);
if (date.getSeconds() % 5 == 0) {
var hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
var seconds = date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
return hours + ":" + minutes + ":" + seconds;
} else {
return "";
}
}
}
],
yaxes: [
{
min: 0,
tickFormatter: awit_flot_format_bandwidth
}
]
}
// Add additional yaxes if needed
if (options && options.yaxes && options.yaxes.length) {
for (k = 0; k < options.yaxes.length; k++) {
if (options.yaxes[k]) {
baseOptions.yaxes.push(options.yaxes[k]);
}
}
}
// Load data from ajax
jQuery.ajax({
url: options.url,
dataType: 'json',
success: function(statsData) {
plot = null;
for (i = 0; (i < statsData.length); i++) {
// Format time to match javascript's epoch in milliseconds
for (j = 0; j < statsData[i].data.length; j++) {
d = new Date(statsData[i].data[j][0] * 1000);
statsData[i].data[j][0] = statsData[i].data[j][0] * 1000;
}
// Loop with yaxes
for (k = 0; k < baseOptions.yaxes.length; k++) {
// Check if there are labels
if (baseOptions.yaxes[k].labels && baseOptions.yaxes[k].labels.length) {
// Loop through labels
for (l = 0; l < baseOptions.yaxes[k].labels.length; l++) {
// Check for match
if (statsData[i].label == baseOptions.yaxes[k].labels[l]) {
statsData[i].yaxis = k + 1;
}
}
}
}
}
if (statsData.length > 0) {
plot = jQuery.plot(jQuery("#flotCanvas"), statsData, baseOptions);
}
}
});
}
// vim: ts=4
opentrafficshaper/plugins/webserver/pages/static/awit-flot/jquery.flot.websockets.js deleted 100644 → 0
+ 0
− 178
View file @ 07b8c174
/*
* Copyright (c) 2013, AllWorldIT
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use,
* copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following
* conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*
*
* Author: Charl Mert <cmert@lbsd.net>, 2013
*
*/
(function ($) {
var options = {
debug :true
};
var socket = null;
var buffer = [];
function log_error(message)
{
if (typeof(console.error) != 'undefined' && options.debug) {
console.error(message);
}
}
function log_info(message)
{
if (typeof(console.info) != 'undefined' && options.debug) {
console.info(message);
}
}
function log(message)
{
if (typeof(console.log) != 'undefined' && options.debug) {
console.log(message);
}
}
// Expecting column data format: [yyyy-mm-dd hh-mm-ss, value]
function addColumn(column, options)
{
// Converting timestamps
// Creating dataset
changed = [];
jQuery.each(column, function(key, val) {
columnData = statsData[key];
if (typeof(columnData) == 'undefined') {
// Creating new field
statsData[key] = {
label: key,
data: [new Date(val[0].replace(/-/g, '/')).getTime(), val[1]]
};
changed.push(statsData[key]);
} else {
// Appending existing field
columnData = statsData[key];
if (columnData.data.length >= options.websocket.maxTicksX) {
columnData.data.shift();
}
columnData.data.push([new Date(val[0].replace(/-/g, '/')).getTime(), val[1]]);
changed.push(statsData[key]);
}
});
//console.log(JSON.stringify(changed));
return changed;
}
// update the chart to reflect the new column
function updateChart(plot, options, column) {
// add column
chartData = addColumn(column, options);
if (plot) {
jQuery.plot(plot.getPlaceholder(), chartData, options);
} else {
log_error('Plot object not initialized');
}
}
// connect websocket
function connectWebsocket(uri) {
try {
log('Connecting...: ' + uri);
socket = window['MozWebSocket'] ? new MozWebSocket(uri) : new WebSocket(uri);
return socket;
} catch (e) {
log_error('Sorry, the web socket at ' + uri + ' is un-available (' + e + ')', uri, e);
}
}
function init(plot) {
plot.hooks.processOptions.push(function (plot, options) {
if (typeof(options.websocket) != 'undefined') {
if (options.websocket.enabled == false) {
return false;
}
if (typeof(options.websocket.maxTicksX) == 'undefined') {
options.websocket.maxTicksX = 20;
}
uri = options.websocket.uri;
if (socket == null) {
socket = connectWebsocket(uri);
}
// When the connection is open, send some data to the server
socket.onopen = function () {
log('Sending Hello ... ');
log('Socket State: ['+socket.readyState+']');
if (socket && socket.readyState == 1) {
socket.send('Ping'); // Send the message to the server
} else {
log_error("Couldn't send Ping!");
}
};
// Log errors
socket.onerror = function (error) {
log('WebSocket Error:');
log(error);
};
// Log messages from the server
socket.onmessage = function (e) {
try {
column = JSON.parse(e.data);
updateChart(plot, options, column);
} catch (err) {
//couldn't parse json
log('Exception: ' + e);
log(e);
}
};
} else {
log('Websocket options not specified');
}
});
}
$.plot.plugins.push({
init: init,
options: options,
name: 'websockets',
version: '1.0'
});
})(jQuery);
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment