some database updates (adding some _deleted fields) and fix links table.

git-svn-id: http://www.observium.org/svn/observer/trunk@3199 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-05-17 10:33:56 +00:00
parent 5d148bab86
commit 2880cf8f23
4 changed files with 17 additions and 7 deletions

View File

@@ -357,7 +357,9 @@ function generate_entity_link($type, $entity, $text = NULL, $graph_type=NULL)
$link = generate_port_link($entity, $text, $graph_type);
break;
case "storage":
$url = generate_url(array('page' => 'device', 'device' => $entity['device_id'], 'tab' => 'health', 'metric' => 'storage'));
if(empty($text)) { $text = $entity['storage_descr']; }
$link = generate_link($text, array('page' => 'device', 'device' => $entity['device_id'], 'tab' => 'health', 'metric' => 'storage'));
break;
default:
$link = $entity[$type.'_id'];
}

View File

@@ -37,7 +37,7 @@ foreach ($devices as $device)
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd");
$rrd_list[$i]['filename'] = $rrd_filename;
$rrd_list[$i]['descr'] = $port['label'];
$rrd_list[$i]['descr_in'] = $port['label'];
$rrd_list[$i]['descr_in'] = $device['hostname'];
$rrd_list[$i]['descr_out'] = $port['ifAlias'];
$rrd_list[$i]['ds_in'] = $ds_in;
$rrd_list[$i]['ds_out'] = $ds_out;