Added support for ip to sysName option in csv export and graphs (#9352)

* Update html/includes/common/server-stats.inc.php

allow 6 icons wide on server stats

* sysname to ip config following

follow ip to sysname config option on csv export and graphs

* Revert "Update html/includes/common/server-stats.inc.php"

This reverts commit db10e46f04.

* formatting

* syntax fix

too many brackets

* Update html/includes/graphs/multiport/bits_separate.inc.php

bad tab

* format_hostname

Use format_hostname to resolve the sysname.

* Update bits_separate.inc.php
This commit is contained in:
VirTechSystems
2018-10-22 21:58:36 +01:00
committed by Neil Lathwood
parent e11beb5a77
commit 3fcf51d177
2 changed files with 3 additions and 3 deletions
@@ -8,8 +8,8 @@ foreach (explode(',', $vars['id']) as $ifid) {
if (rrdtool_check_rrd_exists($rrd_file)) {
$port = cleanPort($port);
$rrd_list[$i]['filename'] = $rrd_file;
$rrd_list[$i]['descr'] = $port['hostname'].' '.$port['ifDescr'];
$rrd_list[$i]['descr_in'] = $port['hostname'];
$rrd_list[$i]['descr'] = format_hostname($port, $port['hostname']).' '.$port['ifDescr'];
$rrd_list[$i]['descr_in'] = format_hostname($port, $port['hostname']);
$rrd_list[$i]['descr_out'] = makeshortif($port['label']);
$i++;
}
+1 -1
View File
@@ -159,7 +159,7 @@ foreach ($ports as $port) {
$port['out_rate'] = formatRates(($port['ifOutOctets_rate'] * 8));
$port = cleanPort($port, $device);
$csv[] = array(
$port['hostname'],
format_hostname($port, $port['hostname']),
fixIfName($port['label']),
$speed,
$port['in_rate'],