".$device['hostname'].' - '.$text_descr;
- $mempool_popup .= "
-
";
diff --git a/html/pages/device/health/processor.inc.php b/html/pages/device/health/processor.inc.php
index dd60448a3b..1ffdc2a6bb 100644
--- a/html/pages/device/health/processor.inc.php
+++ b/html/pages/device/health/processor.inc.php
@@ -3,21 +3,36 @@
$graph_type = 'processor_usage';
$i = '1';
-foreach (dbFetchRows('SELECT * FROM `processors` WHERE device_id = ?', array($device['device_id'])) as $proc) {
- $proc_url = 'graphs/id='.$proc['processor_id'].'/type=processor_usage/';
- $mini_url = 'graph.php?id='.$proc['processor_id'].'&type='.$graph_type.'&from='.$config['time']['day'].'&to='.$config['time']['now'].'&width=80&height=20&bg=f4f4f4';
+if (count_mib_processors($device) > 0) {
+ $processors = get_mib_processors($device);
+ $graph_type = 'device_processor';
+}
+else {
+ $processors = dbFetchRows('SELECT * FROM `processors` WHERE device_id = ?', array($device['device_id']));
+}
- $text_descr = $proc['processor_descr'];
+foreach ($processors as $proc) {
+ if ($graph_type == 'device_processor') {
+ $id = 'device';
+ $val = $device['device_id'];
+ }
+ else {
+ $id = 'id';
+ $val = $proc['processor_id'];
+ }
+ $proc_url = 'graphs/'.$id.'='.$val.'/type='.$graph_type.'/';
+ $base_url = 'graph.php?'.$id.'='.$val.'&type='.$graph_type.'&from='.$config['time']['day'].'&to='.$config['time']['now'];
+ $mini_url = $base_url.'&width=80&height=20&bg=f4f4f4';
- $text_descr = rewrite_entity_descr($text_descr);
+ $text_descr = rewrite_entity_descr($proc['processor_descr']);
$proc_popup = "onmouseover=\"return overlib('
- $text_descr
-
";
+ $text_descr $used/$total - $perc% used
- ";
+ if ($mempool['percentage'] === true) {
+ echo " $text_descr
";
+ }
+ else {
+ echo " $text_descr
";
+ }
+ echo "
";
echo "$text_descr $perc% used
";
+ }
+ else {
+ echo " $text_descr $used/$total - $perc% used
";
+ }
+ echo " ";
include 'includes/print-graphrow.inc.php';
echo "
".$device['hostname'].' - '.$text_descr;
- $proc_popup .= "
@@ -27,4 +42,4 @@ foreach (dbFetchRows('SELECT * FROM `processors` WHERE device_id = ?', array($de
echo "
";
-}//end foreach
\ No newline at end of file
+}//end foreach
diff --git a/html/pages/device/mib.inc.php b/html/pages/device/mib.inc.php
new file mode 100644
index 0000000000..7c56d57c3b
--- /dev/null
+++ b/html/pages/device/mib.inc.php
@@ -0,0 +1,88 @@
+
+ *
+ * Author: Paul Gear
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version. Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+if (!isset($vars['section'])) {
+ $vars['section'] = "mib";
+}
+?>
+
+";
include 'includes/print-graphrow.inc.php';
echo "
Device MIB associations
+
+
+
+
+
+
+| Module | +MIB | +Included by | +Last Modified | +
|---|
Device MIB values
+
+
+
+
+
+
+
+
+
diff --git a/html/pages/mib_assoc.inc.php b/html/pages/mib_assoc.inc.php
new file mode 100644
index 0000000000..a792e57966
--- /dev/null
+++ b/html/pages/mib_assoc.inc.php
@@ -0,0 +1,49 @@
+
+ *
+ * Author: Paul Gear
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version. Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+
+?>
+
+| Module | +MIB | +Object type | +OID | +Value | +Numeric Value | +Last Modified | +
|---|
MIB associations for all devices
+
+
+
+
+
+
+
diff --git a/html/pages/mibs.inc.php b/html/pages/mibs.inc.php
new file mode 100644
index 0000000000..43769fc73b
--- /dev/null
+++ b/html/pages/mibs.inc.php
@@ -0,0 +1,54 @@
+
+ *
+ * Author: Paul Gear
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version. Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ */
+?>
+
+| Hostname | +Module | +MIB | +Included by | +Last Modified | +
|---|
All MIB definitions
+
+
+
+
+
+
+
diff --git a/includes/common.php b/includes/common.php
index de68cfd788..559df195ae 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -580,6 +580,7 @@ function edit_service($service, $descr, $service_ip, $service_param = "", $servi
}
+
/*
* convenience function - please use this instead of 'if ($debug) { echo ...; }'
*/
@@ -596,7 +597,8 @@ function d_echo($text, $no_debug_text = null) {
elseif ($no_debug_text) {
echo "$no_debug_text";
}
-}
+} // d_echo
+
/*
* convenience function - please use this instead of 'if ($debug) { print_r ...; }'
@@ -609,37 +611,8 @@ function d_print_r($var, $no_debug_text = null) {
elseif ($no_debug_text) {
echo "$no_debug_text";
}
-}
+} // d_print_r
-/*
- * Shorten the name so it works as an RRD data source name (limited to 19 chars by default).
- * Substitute for $subst if necessary.
- * @return the shortened name
- */
-function name_shorten($name, $common = null, $subst = "mibval", $len = 19) {
- if ($common !== null) {
- // remove common from the beginning of the string, if present
- if (strlen($name) > $len && strpos($name, $common) >= 0) {
- $newname = str_replace($common, '', $name);
- $name = $newname;
- }
- }
- if (strlen($name) > $len) {
- $name = $subst;
- }
- return $name;
-}
-
-/*
- * @return the name of the rrd file for $host's $extra component
- * @param host Host name
- * @param extra Components of RRD filename - will be separated with "-"
- */
-function rrd_name($host, $extra, $exten = ".rrd") {
- global $config;
- $filename = safename(is_array($extra) ? implode("-", $extra) : $extra);
- return implode("/", array($config['rrd_dir'], $host, $filename.$exten));
-}
/*
* @return true if the given graph type is a dynamic MIB graph
@@ -647,7 +620,8 @@ function rrd_name($host, $extra, $exten = ".rrd") {
function is_mib_graph($type, $subtype) {
global $config;
return $config['graph_types'][$type][$subtype]['section'] == 'mib';
-}
+} // is_mib_graph
+
/*
* @return true if client IP address is authorized to access graphs
@@ -670,7 +644,8 @@ function is_client_authorized($clientip) {
}
return false;
-}
+} // is_client_authorized
+
/*
* @return an array of all graph subtypes for the given type
@@ -702,7 +677,8 @@ function get_graph_subtypes($type) {
sort($types);
return $types;
-}
+} // get_graph_subtypes
+
function get_smokeping_files($device) {
global $config;
@@ -733,6 +709,7 @@ function get_smokeping_files($device) {
return $smokeping_files;
} // end get_smokeping_files
+
function generate_smokeping_file($device,$file='') {
global $config;
if ($config['smokeping']['integration'] === true) {
@@ -741,7 +718,8 @@ function generate_smokeping_file($device,$file='') {
else {
return $config['smokeping']['dir'] . '/' . $file;
}
-}
+} // generate_smokeping_file
+
/*
* @return rounded value to 10th/100th/1000th depending on input (valid: 10, 100, 1000)
@@ -758,6 +736,153 @@ function round_Nth($val = 0, $round_to) {
}
} // end round_Nth
+
+/*
+ * FIXME: Dummy implementation
+ */
+function count_mib_mempools($device)
+{
+ if ($device['os'] == 'ruckuswireless') {
+ return 1;
+ }
+ return 0;
+} // count_mib_mempools
+
+
+/*
+ * FIXME: Dummy implementation
+ */
+function count_mib_processors($device)
+{
+ if ($device['os'] == 'ruckuswireless') {
+ return 1;
+ }
+ return 0;
+} // count_mib_processors
+
+
+function count_mib_health($device)
+{
+ return count_mib_mempools($device) + count_mib_processors($device);
+} // count_mib_health
+
+
+function get_mibval($device, $oid)
+{
+ $sql = 'SELECT * FROM `device_oids` WHERE `device_id` = ? AND `oid` = ?';
+ return dbFetchRow($sql, array($device['device_id'], $oid));
+} // get_mibval
+
+
+/*
+ * FIXME: Dummy implementation - needs an abstraction for each device
+ */
+function get_mib_mempools($device)
+{
+ $mempools = array();
+ if ($device['os'] == 'ruckuswireless') {
+ $mempool = array();
+ $mibvals = get_mibval($device, '.1.3.6.1.4.1.25053.1.2.1.1.1.15.14.0');
+ $mempool['mempool_descr'] = $mibvals['object_type'];
+ $mempool['mempool_id'] = 0;
+ $mempool['mempool_total'] = 100;
+ $mempool['mempool_used'] = $mibvals['numvalue'];
+ $mempool['mempool_free'] = 100 - $mibvals['numvalue'];
+ $mempool['percentage'] = true;
+ $mempools[] = $mempool;
+ }
+ return $mempools;
+} // get_mib_mempools
+
+
+/*
+ * FIXME: Dummy implementation - needs an abstraction for each device
+ */
+function get_mib_processors($device)
+{
+ $processors = array();
+ if ($device['os'] == 'ruckuswireless') {
+ $proc = array();
+ $mibvals = get_mibval($device, '.1.3.6.1.4.1.25053.1.2.1.1.1.15.13.0');
+ $proc['processor_descr'] = $mibvals['object_type'];
+ $proc['processor_id'] = 0;
+ $proc['processor_usage'] = $mibvals['numvalue'];
+ $processors[] = $proc;
+ }
+ return $processors;
+} // get_mib_processors
+
+
+/*
+ * FIXME: Dummy implementation - needs an abstraction for each device
+ * @return true if there is a custom graph defined for this type, subtype, and device
+ */
+function is_custom_graph($type, $subtype, $device)
+{
+ if ($device['os'] == 'ruckuswireless' && $type == 'device') {
+ switch ($subtype) {
+ case 'cpumem':
+ case 'mempool':
+ case 'processor':
+ return true;
+ }
+ }
+ return false;
+} // is_custom_graph
+
+
+/*
+ * FIXME: Dummy implementation
+ * Set section/graph entries in $graph_enable for graphs specific to $os.
+ */
+function enable_os_graphs($os, &$graph_enable)
+{
+ /*
+ foreach (dbFetchRows("SELECT * FROM graph_conditions WHERE graph_type = 'device' AND condition_name = 'os' AND condition_value = ?", array($os)) as $graph) {
+ $graph_enable[$graph['graph_section']][$graph['graph_subtype']] = "device_".$graph['graph_subtype'];
+ }
+ */
+} // enable_os_graphs
+
+
+/*
+ * For each os-based or global graph relevant to $device, set its section/graph entry in $graph_enable.
+ */
+function enable_graphs($device, &$graph_enable)
+{
+ // These are standard graphs we should have for all systems
+ $graph_enable['poller']['poller_perf'] = 'device_poller_perf';
+ if (can_ping_device($device) === true) {
+ $graph_enable['poller']['ping_perf'] = 'device_ping_perf';
+ }
+
+ enable_os_graphs($device['os'], $graph_enable);
+} // enable_graphs
+
+
+//
+// maintain a simple cache of objects
+//
+
+function object_add_cache($section, $obj)
+{
+ global $object_cache;
+ $object_cache[$section][$obj] = true;
+} // object_add_cache
+
+
+function object_is_cached($section, $obj)
+{
+ global $object_cache;
+ if (array_key_exists($obj, $object_cache)) {
+ return $object_cache[$section][$obj];
+ }
+ else {
+ return false;
+ }
+} // object_is_cached
+
+
/**
* Checks if config allows us to ping this device
* $attribs contains an array of all of this devices
@@ -775,6 +900,61 @@ function can_ping_device($attribs) {
}
} // end can_ping_device
+
+/*
+ * @return true if the requested module type & name is globally enabled
+ */
+function is_module_enabled($type, $module)
+{
+ global $config;
+ if (isset($config[$type.'_modules'][$module])) {
+ return $config[$type.'_modules'][$module] == 1;
+ }
+ else {
+ return false;
+ }
+} // is_module_enabled
+
+
+/*
+ * @return true if every string in $arr begins with $str
+ */
+function begins_with($str, $arr)
+{
+ foreach ($arr as $s) {
+ $pos = strpos($s, $str);
+ if ($pos === false || $pos > 0) {
+ return false;
+ }
+ }
+ return true;
+} // begins_with
+
+
+/*
+ * @return the longest starting portion of $str that matches everything in $arr
+ */
+function longest_matching_prefix($str, $arr)
+{
+ $len = strlen($str);
+ while ($len > 0) {
+ $prefix = substr($str, 0, $len);
+ if (begins_with($prefix, $arr)) {
+ return $prefix;
+ }
+ $len -= 1;
+ }
+ return '';
+} // longest_matching_prefix
+
+
+function search_phrase_column($c)
+{
+ global $searchPhrase;
+ return "$c LIKE '%$searchPhrase%'";
+} // search_phrase_column
+
+
/**
* Constructs the path to an RRD for the Ceph application
* @param string $gtype The type of rrd we're looking for
@@ -794,7 +974,7 @@ function ceph_rrd($gtype) {
$rrd = join('-', array('app', 'ceph', $vars['id'], $gtype, $var)).'.rrd';
return join('/', array($config['rrd_dir'], $device['hostname'], $rrd));
-}
+} // ceph_rrd
/**
* Parse location field for coordinates
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 189dc6a92d..f16e584879 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -315,6 +315,17 @@ $config['graph_colours']['purples'] = array(
);
$config['graph_colours']['default'] = $config['graph_colours']['blues'];
+// Colour values from http://www.sapdesignguild.org/goodies/diagram_guidelines/color_palettes.html
+$config['graph_colours']['manycolours'] = array(
+ "FFF8A3", "FAE16B", "F8D753", "F3C01C", "F0B400", // yellows
+ "A9CC8F", "82B16A", "5C9746", "3D8128", "1E6C0B", // greens
+ "B2C8D9", "779DBF", "3E75A7", "205F9A", "00488C", // blues
+ "BEA37A", "907A52", "7A653E", "63522B", "3D3000", // browns
+ "F3AA79", "EB8953", "E1662A", "DC5313", "D84000", // oranges
+ "B5B5A9", "8B8D82", "74796F", "5D645A", "434C43", // greys
+ "E6A4A5", "D6707B", "C4384F", "BC1C39", "B30023", // pinks
+);
+
// Map colors
$config['network_map_legend'] = array(
'0' => '#aeaeae',
diff --git a/includes/discovery/discovery-arp.inc.php b/includes/discovery/discovery-arp.inc.php
index fd5442b062..6894e0cc65 100644
--- a/includes/discovery/discovery-arp.inc.php
+++ b/includes/discovery/discovery-arp.inc.php
@@ -60,12 +60,12 @@ foreach (dbFetchRows($sql, array($deviceid)) as $entry) {
}
// Attempt discovery of each IP only once per run.
- if (arp_discovery_is_cached($ip)) {
+ if (object_is_cached('arp_discovery', $ip)) {
echo '.';
continue;
}
- arp_discovery_add_cache($ip);
+ object_add_cache('arp_discovery', $ip);
$name = gethostbyaddr($ip);
echo '+';
diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php
index a90a65d41e..309998f0f9 100644
--- a/includes/discovery/functions.inc.php
+++ b/includes/discovery/functions.inc.php
@@ -131,6 +131,11 @@ function discover_device($device, $options=null) {
}
}
+ if (is_mib_poller_enabled($device)) {
+ $devicemib = array($device['sysObjectID'] => 'all');
+ register_mibs($device, $devicemib, "includes/discovery/functions.inc.php");
+ }
+
// Set type to a predefined type for the OS if it's not already set
if ($device['type'] == 'unknown' || $device['type'] == '') {
if ($config['os'][$device['os']]['type']) {
@@ -575,7 +580,6 @@ function discover_processor(&$valid, $device, $oid, $index, $type, $descr, $prec
'processor_precision' => $precision,
);
dbUpdate($update_data, 'processors', '`device_id`=? AND `processor_index`=? AND `processor_type`=?', array($device['device_id'], $index, $type));
- d_echo($query."\n");
}//end if
$valid[$type][$index] = 1;
}//end if
@@ -630,7 +634,6 @@ function discover_mempool(&$valid, $device, $index, $type, $descr, $precision='1
}
dbUpdate($update_data, 'mempools', 'device_id=? AND mempool_index=? AND mempool_type=?', array($device['device_id'], $index, $type));
- d_echo($query."\n");
}//end if
$valid[$type][$index] = 1;
}//end if
@@ -704,25 +707,3 @@ function discover_process_ipv6(&$valid, $ifIndex, $ipv6_address, $ipv6_prefixlen
}//end if
}//end discover_process_ipv6()
-
-
-// maintain a simple cache of seen IPs during ARP discovery
-
-
-function arp_discovery_add_cache($ip) {
- global $arp_discovery;
- $arp_discovery[$ip] = true;
-
-}//end arp_discovery_add_cache()
-
-
-function arp_discovery_is_cached($ip) {
- global $arp_discovery;
- if (array_key_exists($ip, $arp_discovery)) {
- return $arp_discovery[$ip];
- }
- else {
- return false;
- }
-
-}//end arp_discovery_is_cached()
diff --git a/includes/discovery/os/ruckuswireless.inc.php b/includes/discovery/os/ruckuswireless.inc.php
index 2321b1300d..dad1284847 100644
--- a/includes/discovery/os/ruckuswireless.inc.php
+++ b/includes/discovery/os/ruckuswireless.inc.php
@@ -3,6 +3,8 @@
* LibreNMS Ruckus Wireless OS information module
*
* Copyright (c) 2015 Søren Friis Rosiak | Module | +MIB | +Object Type | +Object Id | +Syntax | +Description | + +Included by | +Last modified | +
|---|