diff --git a/html/images/icons/current.png b/html/images/icons/current.png index d79c3191c..5bab62bb4 100644 Binary files a/html/images/icons/current.png and b/html/images/icons/current.png differ diff --git a/html/images/icons/eventlog.png b/html/images/icons/eventlog.png new file mode 100755 index 000000000..779ad58ef Binary files /dev/null and b/html/images/icons/eventlog.png differ diff --git a/html/images/icons/frequencies.png b/html/images/icons/frequencies.png index 2e09e08a9..970c3f79d 100644 Binary files a/html/images/icons/frequencies.png and b/html/images/icons/frequencies.png differ diff --git a/html/images/icons/inventory.png b/html/images/icons/inventory.png new file mode 100755 index 000000000..0905f933b Binary files /dev/null and b/html/images/icons/inventory.png differ diff --git a/html/images/icons/ipv4.png b/html/images/icons/ipv4.png new file mode 100644 index 000000000..2b29604aa Binary files /dev/null and b/html/images/icons/ipv4.png differ diff --git a/html/images/icons/ipv6.png b/html/images/icons/ipv6.png new file mode 100644 index 000000000..d3e47a2d0 Binary files /dev/null and b/html/images/icons/ipv6.png differ diff --git a/html/images/icons/port.png b/html/images/icons/port.png new file mode 100755 index 000000000..024138eb3 Binary files /dev/null and b/html/images/icons/port.png differ diff --git a/html/images/icons/syslog.png b/html/images/icons/syslog.png new file mode 100755 index 000000000..a350d1871 Binary files /dev/null and b/html/images/icons/syslog.png differ diff --git a/html/images/icons/toner.png b/html/images/icons/toner.png new file mode 100755 index 000000000..adcc0046f Binary files /dev/null and b/html/images/icons/toner.png differ diff --git a/html/images/icons/voltages.png b/html/images/icons/voltages.png index a7e9f7d45..f100dd82e 100644 Binary files a/html/images/icons/voltages.png and b/html/images/icons/voltages.png differ diff --git a/html/includes/print-event-short.inc b/html/includes/print-event-short.inc index 941310b41..f0f27fba4 100644 --- a/html/includes/print-event-short.inc +++ b/html/includes/print-event-short.inc @@ -16,12 +16,11 @@ if($bg == $list_colour_a) { $bg = $list_colour_b; } else { $bg=$list_colour_a; } "); - $if = mysql_fetch_array(mysql_query("SELECT * from ports AS I, devices as D where I.device_id = D.device_id AND I.interface_id = '".$entry['interface']."'")); + if($entry['type'] == "interface") { + $entry['link'] = "".generateiflink(getifbyid($entry['reference'])).""; + } - echo(" - " . generateiflink($if) . " - " . - htmlspecialchars($entry['message']) + echo($entry['link'] ." ". htmlspecialchars($entry['message']) . " "); diff --git a/html/pages/about.php b/html/pages/about.php index d277087e9..a86c7b0ab 100644 --- a/html/pages/about.php +++ b/html/pages/about.php @@ -20,8 +20,106 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. + +  + + + + +

Statistics

+ + + + Devices$stat_devices + Ports$stat_ports + + + IPv4 Addresses$stat_ipv4_addy + IPv4 Networks$stat_ipv4_nets + + + IPv6 Addresses$stat_ipv6_addy + IPv6 Networks$stat_ipv6_nets + + + Services$stat_services + Applications$stat_apps + + + Processors$stat_processors + Memory$stat_memory + + + Storage$stat_storage + Disk I/O$stat_diskio + + + HR-MIB$stat_hrdev + Entity-MIB$stat_entphys + + + Syslog Entries$stat_syslog + Eventlog Entries$stat_events + + + Temperatures$stat_temp + Fanspeeds$stat_fanspeeds + + + Voltage$stat_volt + Current$stat_amp + + + + Frequency$stat_hz + Toner$stat_toner + + + + +"); + + + +print_optionbar_end(); ?> + + +
+ ve; $netsnmp_version = shell_exec($config['snmpget'] . " --version"); +print_optionbar_start(NULL); echo(" - - - - - - +

Versions

+
ObserverNMS$observer_version
Apache$apache_version
PHP$php_version
MySQL$mysql_version
+ + + +
ObserverNMS$observer_versionApache$apache_version
PHP$php_versionMySQL$mysql_version
"); - +print_optionbar_end(); ?>