Commit 6549db07 authored by Olav Kvittem's avatar Olav Kvittem
Browse files

Otto updated microdep-map&al

parents b4cb0050 03837aac
Pipeline #126036 passed with stages
in 53 seconds
......@@ -25,7 +25,8 @@ dragonlab:
- big_gaps
- big_time
- small_gaps
- small_time
- small_time
see_routes: "traceroute" # Source for traceroute viewer
table:
# Table columns (in addition to date and time) to display in map popup windows
- tloss
......@@ -122,6 +123,7 @@ dragonlab:
- big_time
- small_gaps
- small_time -
see_routes: "traceroute" # Source for traceroute viewer
table:
# Table columns (in addition to date and time) to display in map popup windows
- h_jit
......@@ -207,6 +209,7 @@ dragonlab:
- max_length
- unique_hosts
- unique_hosts_per_hop
see_routes: "traceroute" # Source for traceroute viewer
table:
# Fields to display (in addition to date and time) as table columns in map popup windows
- anomaly_count
......@@ -304,6 +307,7 @@ dragonlab:
- max_length
- unique_hosts
- unique_hosts_per_hop
see_routes: "traceroute" # Source for traceroute viewer
table:
# Table columns (in addition to date and time) to display in map popup windows
- no_hops_over_ce_limit
......@@ -351,8 +355,9 @@ dragonlab:
title: "Route changes"
unit: "#"
type: "number"
aggr: "sum"
default_field: "no_hops_over_ce_limit"
aggr: "max" # Accumulative field, i.e. only last logged value is relevant
#aggr: "sum"
default_field: "route_changes"
field:
anomality_class:
title: "Status"
......@@ -396,6 +401,11 @@ dragonlab:
descr: "List of hosts in latest routes"
type: "string"
aggr: ""
route_changes:
title: "Route changes"
unit: "#"
type: "number"
aggr: "max" # Accumulative field, i.e. only last logged value is relevant
tcprouteerr:
enable: true
......@@ -413,6 +423,7 @@ dragonlab:
- max_length
- unique_hosts
- unique_hosts_per_hop
see_routes: "tcptraceroute" # Source for traceroute viewer
table:
# Table columns (in addition to date and time) to display in map popup windows
- anomaly_count
......@@ -509,6 +520,7 @@ dragonlab:
- max_length
- unique_hosts
- unique_hosts_per_hop
see_routes: "tcptraceroute" # Source for traceroute viewer
table:
# Table columns (in addition to date and time) to display in map popup windows
- no_hops_over_ce_limit
......@@ -556,8 +568,8 @@ dragonlab:
title: "Route changes"
unit: "#"
type: "number"
aggr: "sum"
default_field: "no_hops_over_ce_limit"
aggr: "max"
default_field: "route_changes"
field:
anomality_class:
title: "Status"
......@@ -601,6 +613,11 @@ dragonlab:
descr: "List of hosts in latest routes"
type: "string"
aggr: ""
route_changes:
title: "Route changes"
unit: "#"
type: "number"
aggr: "max"
uninett:
title: "Uninett"
......@@ -625,6 +642,7 @@ uninett:
- big_time
- small_gaps
- small_time
see_routes: "traceroute" # Source for traceroute viewer
table:
# Table columns (in addition to date and time) to display in map popup windows
- tloss
......@@ -721,6 +739,7 @@ uninett:
- big_time
- small_gaps
- small_time -
see_routes: "traceroute" # Source for traceroute viewer
table:
# Table columns (in addition to date and time) to display in map popup windows
- h_jit
......
......@@ -810,6 +810,11 @@ function link_popup(link){
var url = 'tracetree.html?topo=/' + parms.net + '/mp/' + link.from + '/' + dato
+ '/trace/' + to_adr + '1.json' + '&to=' + link.to;
if (! jQuery.isEmptyObject(conffile[parms.net].event_type[parms.event].popup.see_routes)) {
// Add traceroute type prefix
url += "&prefix=" + conffile[parms.net].event_type[parms.event].popup.see_routes;
}
html += '\n<p><button class=knapp><a title="See the routes graph and stats in this period" target="_blank" href="' + url + '">See routes' + '</a></button>' + "\n";
url = 'microdep-curve.html?index=' + parms.net + '_jitter&from=' + link.from + '&to=' + link.to + '&event_type=jitter&property=h_ddelay&start=' + start + '&end=' + end + "&title=From " + link.from + " to " + link.to + " on " + dato;
......@@ -840,11 +845,23 @@ function link_popup(link){
if (! jQuery.isEmptyObject(conffile)) {
var nrows=0;
var tip="<table width=100%><caption><b>" + title + '</b></caption>';
for (const s in conffile[parms.net].event_type[parms.event].popup.summary) {
var sum_var = conffile[parms.net].event_type[parms.event].popup.summary[s];
if ( typeof link[sum_var] != 'undefined' ) {
tip+= '<tr><td>' + prop_desc[sum_var] + '<td align=right>' + link[sum_var];
nrows++;
if ( selected_date_is_today_or_future() ) {
// Only digested summary of none-summary properties is available.
for (const sum_var in conffile[parms.net].event_type[parms.event].field) {
if ( typeof link[sum_var] != 'undefined' ) {
var prop_value = Math.round((link[sum_var] + Number.EPSILON) * 100) / 100; // Round off to (max) 2 decimals
tip+= '<tr><td>' + prop_desc[sum_var] + '<td align=right>' + prop_value;
nrows++;
}
}
} else {
for (const s in conffile[parms.net].event_type[parms.event].popup.summary) {
var sum_var = conffile[parms.net].event_type[parms.event].popup.summary[s];
if ( typeof link[sum_var] != 'undefined' ) {
var prop_value = Math.round((link[sum_var] + Number.EPSILON) * 100) / 100; // Round off to (max) 2 decimals
tip+= '<tr><td>' + prop_desc[sum_var] + '<td align=right>' + prop_value;
nrows++;
}
}
}
if ( nrows > 0 ){
......@@ -1114,10 +1131,10 @@ function gap_list( from, to){
// Variable (property) has aggregation method specified
switch (prop_aggr[prop]) {
case "sum":
rec[prop]=stat[ab][prop].sum;
rec[prop]=stat[ab][prop].sum
break;
case "avg":
rec[prop]=stat[ab][prop].average();
rec[prop]=stat[ab][prop].average()
case "max":
rec[prop]=stat[ab][prop].max();
break;
......@@ -1126,12 +1143,13 @@ function gap_list( from, to){
break;
default:
console.log("Unsupported aggregation method " + prop_aggr[prop] + ". Applying average.");
rec[prop]=stat[ab][prop].average();
rec[prop]=stat[ab][prop].average()
}
} else {
console.log("Aggregation method unspecified. Applying average.");
rec[prop]=stat[ab][prop].average();
rec[prop]=stat[ab][prop].average()
}
rec[prop]=Math.round((rec[prop] + Number.EPSILON) * 100) / 100; // Round off to (max) 2 decimals
rec[prop + "_max"] = stat[ab][prop].max();
rec[prop + "_sum"] = stat[ab][prop].sum;
} else {
......@@ -1967,6 +1985,10 @@ function get_connections(){
if (parms.debug) console.log(url);
// Clear current dataset (details and summary)
last_hits=[];
summary=[];
$.getJSON( url,
function(resp){
if (resp.hits && resp.hits.total.value > 0){
......
Markdown is supported
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