#7963 Fixed netflow view
This commit is contained in:
parent
201fea9378
commit
af4e49e156
|
@ -4808,7 +4808,11 @@ function graph_netflow_aggregate_pie($data, $aggregate, $ttl=1, $only_image=fals
|
||||||
$water_mark,
|
$water_mark,
|
||||||
$config['fontpath'],
|
$config['fontpath'],
|
||||||
$config['font_size'],
|
$config['font_size'],
|
||||||
$ttl
|
$ttl,
|
||||||
|
false,
|
||||||
|
'',
|
||||||
|
false,
|
||||||
|
6
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4833,7 +4837,7 @@ function graph_netflow_circular_mesh($data)
|
||||||
|
|
||||||
include_once $config['homedir'].'/include/graphs/functions_d3.php';
|
include_once $config['homedir'].'/include/graphs/functions_d3.php';
|
||||||
|
|
||||||
return d3_relationship_graph($data['elements'], $data['matrix'], 700, true);
|
return d3_relationship_graph($data['elements'], $data['matrix'], 900, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1080,7 +1080,7 @@ function netflow_draw_item(
|
||||||
$filter,
|
$filter,
|
||||||
$aggregate,
|
$aggregate,
|
||||||
$max_aggregates,
|
$max_aggregates,
|
||||||
false,
|
true,
|
||||||
$connection_name,
|
$connection_name,
|
||||||
$address_resolution
|
$address_resolution
|
||||||
);
|
);
|
||||||
|
|
|
@ -782,7 +782,8 @@ function pie_graph(
|
||||||
$ttl=1,
|
$ttl=1,
|
||||||
$legend_position=false,
|
$legend_position=false,
|
||||||
$colors='',
|
$colors='',
|
||||||
$hide_labels=false
|
$hide_labels=false,
|
||||||
|
$max_values=9
|
||||||
) {
|
) {
|
||||||
if (empty($chart_data) === true) {
|
if (empty($chart_data) === true) {
|
||||||
return graph_nodata_image($width, $height, 'pie');
|
return graph_nodata_image($width, $height, 'pie');
|
||||||
|
@ -793,8 +794,7 @@ function pie_graph(
|
||||||
}
|
}
|
||||||
|
|
||||||
// This library allows only 8 colors.
|
// This library allows only 8 colors.
|
||||||
$max_values = 9;
|
// $max_values = 9;
|
||||||
|
|
||||||
// Remove the html_entities.
|
// Remove the html_entities.
|
||||||
$temp = [];
|
$temp = [];
|
||||||
foreach ($chart_data as $key => $value) {
|
foreach ($chart_data as $key => $value) {
|
||||||
|
|
|
@ -98,6 +98,19 @@ function chordDiagram(recipient, elements, matrix, width) {
|
||||||
})
|
})
|
||||||
.transition()
|
.transition()
|
||||||
.style("opacity", opacity);
|
.style("opacity", opacity);
|
||||||
|
|
||||||
|
svg.selectAll(".chord").filter(function(d) {
|
||||||
|
if (
|
||||||
|
event.type == "mouseover" &&
|
||||||
|
(d.source.index == i || d.target.index == i)
|
||||||
|
) {
|
||||||
|
show_tooltip(d);
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
hide_tooltip();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -122,7 +135,8 @@ function chordDiagram(recipient, elements, matrix, width) {
|
||||||
.style("stroke", fill)
|
.style("stroke", fill)
|
||||||
.attr("d", arc)
|
.attr("d", arc)
|
||||||
.on("mouseover", fade(0.1))
|
.on("mouseover", fade(0.1))
|
||||||
.on("mouseout", fade(1));
|
.on("mouseout", fade(1))
|
||||||
|
.on("mousemove", move_tooltip);
|
||||||
|
|
||||||
g.append("svg:text")
|
g.append("svg:text")
|
||||||
.each(function(d) {
|
.each(function(d) {
|
||||||
|
|
Loading…
Reference in New Issue