mirror of
https://github.com/stylersnico/librenms.git
synced 2026-07-12 16:06:25 +02:00
syntaxer run
git-svn-id: http://www.observium.org/svn/observer/trunk@3117 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
@@ -7,7 +7,6 @@ include("includes/graphs/common.inc.php");
|
||||
|
||||
$device = device_by_id_cache($id);
|
||||
|
||||
|
||||
$rrd_options .= " DEF:uptime=".$rrd_filename.":uptime:AVERAGE";
|
||||
$rrd_options .= " CDEF:cuptime=uptime,86400,/";
|
||||
$rrd_options .= " 'COMMENT:Days Current Minimum Maximum Average\\n'";
|
||||
|
||||
@@ -68,6 +68,7 @@ $colour_area_in = "91B13C";
|
||||
$colour_area_out = "8080BD";
|
||||
|
||||
include("includes/graphs/generic_multi_seperated.inc.php");
|
||||
|
||||
#include("includes/graphs/generic_multi_bits_separated.inc.php");
|
||||
#include("includes/graphs/generic_multi_data_separated.inc.php");
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@ if($width > "500")
|
||||
$rrd_options .= " COMMENT:'".substr(str_pad($mplug['mplug_vlabel'], $descr_len),0,$descr_len)." Current Average Maximum\l'";
|
||||
}
|
||||
|
||||
|
||||
$c_i = 0;
|
||||
$dbq = dbFetchRows("SELECT * FROM `munin_plugins_ds` WHERE `mplug_id` = ?", array($mplug['mplug_id']));
|
||||
foreach ($dbq as $ds)
|
||||
|
||||
@@ -227,7 +227,6 @@ if (device_permitted($vars['device']) || $check_device == $vars['device'])
|
||||
</li>');
|
||||
}
|
||||
|
||||
|
||||
if ($_SESSION['userlevel'] >= "5" && dbFetchCell("SELECT COUNT(*) FROM links AS L, ports AS I WHERE I.device_id = '".$device['device_id']."' AND I.interface_id = L.local_interface_id"))
|
||||
{
|
||||
$discovery_links = TRUE;
|
||||
|
||||
@@ -70,6 +70,7 @@ foreach($graph_enable as $graph => $entry)
|
||||
$graph_title = $config['graph_types']['device'][$graph]['descr'];
|
||||
$graph_array['type'] = "device_" . $graph;
|
||||
}
|
||||
|
||||
include("includes/print-device-graph.php");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,7 +18,9 @@ if ($ports['down']) { $ports_colour = $warn_colour_a; } else { $ports_colour = $
|
||||
echo("<table width=100% cellspacing=0 cellpadding=0><tr><td style='width: 50%; vertical-align: top;>");
|
||||
|
||||
echo("<div style='background-color: #eeeeee; margin: 5px; padding: 5px;'>");
|
||||
|
||||
include("includes/dev-overview-data.inc.php");
|
||||
|
||||
echo("</div>");
|
||||
|
||||
include("overview/ports.inc.php");
|
||||
|
||||
@@ -14,7 +14,6 @@ if ($config['memcached']['enable'])
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$port_details = 1;
|
||||
|
||||
$hostname = $device['hostname'];
|
||||
|
||||
@@ -70,8 +70,7 @@ if ($vars['view'] == 'minigraphs')
|
||||
echo("<div style='display: block; clear: both; margin: auto; min-height: 500px;'>");
|
||||
unset ($seperator);
|
||||
|
||||
## FIX THIS. UGLY.
|
||||
|
||||
## FIXME - FIX THIS. UGLY.
|
||||
foreach (dbFetchRows("select * from ports WHERE device_id = ? ORDER BY ifIndex", array($device['device_id'])) as $port)
|
||||
{
|
||||
echo("<div style='display: block; padding: 3px; margin: 3px; min-width: 183px; max-width:183px; min-height:90px; max-height:90px; text-align: center; float: left; background-color: #e9e9e9;'>
|
||||
@@ -107,7 +106,6 @@ if ($vars['view'] == 'minigraphs')
|
||||
|
||||
foreach ($ports as $port)
|
||||
{
|
||||
|
||||
if ($config['memcached']['enable'])
|
||||
{
|
||||
$oids = array('ifInOctets', 'ifOutOctets', 'ifInUcastPkts', 'ifOutUcastPkts', 'ifInErrors', 'ifOutErrors');
|
||||
@@ -118,8 +116,8 @@ if ($vars['view'] == 'minigraphs')
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
include("includes/print-interface.inc.php");
|
||||
|
||||
$i++;
|
||||
}
|
||||
echo("</table></div>");
|
||||
|
||||
@@ -77,7 +77,6 @@ foreach (dbFetchRows($query, $param) as $entry)
|
||||
if ($arp_host['device_id'] == $entry['device_id']) { $arp_name = "Localhost"; }
|
||||
if ($arp_host['interface_id'] == $entry['interface_id']) { $arp_if = "Local port"; }
|
||||
|
||||
|
||||
echo('<tr class="search">
|
||||
<td width="160">' . formatMac($entry['mac_address']) . '</td>
|
||||
<td width="140">' . $entry['ipv4_address'] . '</td>
|
||||
|
||||
@@ -24,7 +24,6 @@ if ($config['enable_pseudowires'] && $device['os_group'] == "cisco")
|
||||
/// For MPLS pseudowires
|
||||
$pws = snmpwalk_cache_oid($device, "cpwVcMplsPeerLdpID", $pws, "CISCO-IETF-PW-MPLS-MIB");
|
||||
|
||||
|
||||
foreach ($pws as $pw_id => $pw)
|
||||
{
|
||||
list($cpw_remote_id) = explode(":", $pw['cpwVcMplsPeerLdpID']);
|
||||
|
||||
@@ -75,7 +75,6 @@ foreach ($device['vlans'] as $domain_id => $vlans)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
foreach ($vlans_db as $domain_id => $vlans)
|
||||
{
|
||||
foreach ($vlans as $vlan_id => $vlan)
|
||||
|
||||
@@ -17,6 +17,7 @@ include_once($config['install_dir'] . "/includes/snmp.inc.php");
|
||||
include_once($config['install_dir'] . "/includes/services.inc.php");
|
||||
include_once($config['install_dir'] . "/includes/dbFacile.php");
|
||||
include_once($config['install_dir'] . "/includes/console_colour.php");
|
||||
|
||||
if ($config['alerts']['email']['enable'])
|
||||
{
|
||||
include_once($config['install_dir'] . "/includes/phpmailer/class.phpmailer.php");
|
||||
|
||||
@@ -40,5 +40,4 @@ echo("memcached(".$app['app_instance'].") ");
|
||||
|
||||
rrdtool_update($rrd_filename, "N:".implode(":", $values));
|
||||
|
||||
|
||||
?>
|
||||
|
||||
@@ -241,5 +241,4 @@ if (!is_file($mysql_status_rrd))
|
||||
|
||||
rrdtool_update($mysql_status_rrd, "N:$string");
|
||||
|
||||
|
||||
?>
|
||||
|
||||
@@ -19,7 +19,6 @@ $stat_serial = base64_encode(serialize($stats));
|
||||
$url = "http://www.observium.org/latest.php?i=".$stats['ports']."&d=".$stats['devices']."&stats=".$stat_serial."&v=".$config['version'];
|
||||
$dataHandle = fopen($url, r);
|
||||
|
||||
|
||||
if ($dataHandle)
|
||||
{
|
||||
while (!feof($dataHandle))
|
||||
|
||||
Reference in New Issue
Block a user