mirror of
				https://github.com/librenms/librenms.git
				synced 2024-10-07 16:52:45 +00:00 
			
		
		
		
	move all RRA decisions to config. switch mempool/storage to new rrds (sorry, data lost, the old rrds sucked). added some more apps pages.
git-svn-id: http://www.observium.org/svn/observer/trunk@3068 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
		@@ -3,18 +3,13 @@
 | 
			
		||||
include("includes/graphs/common.inc.php");
 | 
			
		||||
 | 
			
		||||
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/cipsec_flow.rrd";
 | 
			
		||||
 | 
			
		||||
$ds = "Tunnels";
 | 
			
		||||
 | 
			
		||||
$colour_area = "9999cc";
 | 
			
		||||
$colour_line = "0000cc";
 | 
			
		||||
 | 
			
		||||
$colour_area_max = "aaaaacc";
 | 
			
		||||
 | 
			
		||||
$scale_min = 0;
 | 
			
		||||
 | 
			
		||||
$unit_text = "Active Tunnels";
 | 
			
		||||
 | 
			
		||||
include("includes/graphs/generic_simplex.inc.php");
 | 
			
		||||
 | 
			
		||||
?>
 | 
			
		||||
?>
 | 
			
		||||
 
 | 
			
		||||
@@ -18,7 +18,7 @@ foreach (dbFetchRows("SELECT * FROM `mempools` where `device_id` = ?", array($id
 | 
			
		||||
 | 
			
		||||
  $descr = substr(str_pad(short_hrDeviceDescr($mempool['mempool_descr']), 22),0,22);
 | 
			
		||||
  $descr = str_replace(":", "\:", $descr);
 | 
			
		||||
  $rrd_filename  = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempool-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
 | 
			
		||||
  $rrd_filename  = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("mempoolX-".$mempool['mempool_type']."-".$mempool['mempool_index'].".rrd");
 | 
			
		||||
 | 
			
		||||
  if (is_file($rrd_filename))
 | 
			
		||||
  {
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@ foreach (dbFetchRows("SELECT * FROM storage where device_id = ?", array($id)) as
 | 
			
		||||
 | 
			
		||||
  $descr = substr(str_pad($storage[storage_descr], 12),0,12);
 | 
			
		||||
  $descr = str_replace(":","\:",$descr);
 | 
			
		||||
  $rrd = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("storage-".$storage['storage_mib']."-".$storage['storage_descr'].".rrd");
 | 
			
		||||
  $rrd = $config['rrd_dir'] . "/".$device['hostname']."/" . safename("storageX-".$storage['storage_mib']."-".$storage['storage_descr'].".rrd");
 | 
			
		||||
  $rrd_options .= " DEF:$storage[storage_id]used=$rrd:used:AVERAGE";
 | 
			
		||||
  $rrd_options .= " DEF:$storage[storage_id]free=$rrd:free:AVERAGE";
 | 
			
		||||
  $rrd_options .= " CDEF:$storage[storage_id]size=$storage[storage_id]used,$storage[storage_id]free,+";
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user