Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Feb 2016 16:26:36 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r407957 - in head/net-mgmt/observium: . files
Message-ID:  <201602031626.u13GQadP006659@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Wed Feb  3 16:26:35 2016
New Revision: 407957
URL: https://svnweb.freebsd.org/changeset/ports/407957

Log:
  net-mgmt/observium: Update to latest community release 0.16.1.7533
  
  While here, hand over maintainership

Modified:
  head/net-mgmt/observium/Makefile
  head/net-mgmt/observium/distinfo
  head/net-mgmt/observium/files/patch-includes_defaults.inc.php
  head/net-mgmt/observium/files/pkg-message.in
  head/net-mgmt/observium/pkg-plist

Modified: head/net-mgmt/observium/Makefile
==============================================================================
--- head/net-mgmt/observium/Makefile	Wed Feb  3 15:54:30 2016	(r407956)
+++ head/net-mgmt/observium/Makefile	Wed Feb  3 16:26:35 2016	(r407957)
@@ -2,14 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	observium
-PORTVERSION=	0.15.06.6430
+PORTVERSION=	0.16.1.7533
 PORTREVISION=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.observium.org/
 DISTNAME=	${PORTNAME}-community-latest
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	feld@FreeBSD.org
+MAINTAINER=	dirkx@webweaving.org
 COMMENT=	Autodiscovering PHP/MySQL/SNMP based network monitoring
 
 LICENSE=	GPLv3
@@ -17,8 +17,7 @@ LICENSE=	GPLv3
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		python shebangfix
-SHEBANG_FILES=	html/js/makemini.pl \
-	mibs/process.pl \
+SHEBANG_FILES=	mibs/process.pl \
 	scripts/agent-local/areca-hw \
 	scripts/agent-local/asterisk \
 	scripts/agent-local/bind \
@@ -27,28 +26,33 @@ SHEBANG_FILES=	html/js/makemini.pl \
 	scripts/agent-local/exim-mailqueue.sh \
 	scripts/agent-local/hdarray \
 	scripts/agent-local/ipmitool-sensor \
+	scripts/agent-local/kamailio \
 	scripts/agent-local/ksm \
+	scripts/agent-local/lighttpd \
 	scripts/agent-local/lmsensors \
 	scripts/agent-local/postfix_mailgraph \
 	scripts/agent-local/postfix_qshape \
 	scripts/agent-local/postgresql.pl \
+	scripts/agent-local/proxmox-qemu \
 	scripts/agent-local/sabnzbd-qstatus \
 	scripts/agent-local/temperature \
+	scripts/agent-local/virt-what \
 	scripts/agent-local/vmwaretools \
 	scripts/agent-local/zimbra \
-	scripts/cron-hourly.sh \
-	scripts/cron-minute.sh \
-	scripts/cron.sh \
+	scripts/add_ds.pl \
 	scripts/get-geshi.sh \
 	scripts/get-jpgraph.sh \
-	scripts/ifAlias scripts/rename-mibs.pl \
+	scripts/ifAlias \
+	scripts/ifAlias_persist \
 	scripts/makecss.sh \
 	scripts/observium_agent \
-	scripts/removespikes.php scripts/rrdtoolx.py \
-	scripts/removespikes.pl scripts/add_ds.pl \
+	scripts/removespikes.php \
+	scripts/removespikes.pl \
+	scripts/rename-mibs.pl \
+	scripts/rrdtoolx.py \
 	scripts/watchmaillog/watchmaillog.pl
 
-USE_PHP=	ctype filter gd json mcrypt mysql session snmp tokenizer xml
+USE_PHP=	ctype filter gd iconv json mcrypt mysql mysqli posix session snmp tokenizer xml zlib
 WANT_PHP_CLI=	yes
 
 NO_BUILD=	yes
@@ -82,13 +86,13 @@ WMIC_RUN_DEPENDS=	wmic:${PORTSDIR}/net-m
 .include <bsd.port.options.mk>
 
 SUB_FILES+=	pkg-message
-SUB_LIST+=	PHP="${PHPBASE}/bin/php"
+SUB_LIST+=	PHP="${PHPBASE}/bin/php" PYTHON=${PHPBASE}/bin/python
 
-ROOT_FILES=	rename_device.php snmptrap.php .scrutinizer.yml add_device.php \
+ROOT_FILES=	rename_device.php snmptrap.php add_device.php \
 		snmpd.conf.example check-errors.php config_to_json.php delete_device.php \
 		syslog.php irc.php snmp.conf.example adduser.php discovery.php \
 		check-services.php poller.php config.php.default poller-wrapper.py
-ROOT_DIRS=	html scripts includes update mibs
+ROOT_DIRS=	html scripts includes update mibs libs
 
 PORTDOCS=	INSTALL README
 PORTEXAMPLES=	snmp.conf.example snmpd.conf.example
@@ -119,8 +123,8 @@ do-install:
 .for f in ${ROOT_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}/${WWWDIR}
 .endfor
-	# Create empty rrd dir writable by www
-	${MKDIR} ${STAGEDIR}/${WWWDIR}/rrd
+	# Create empty rrd dir and logs writable by www (the apache user)
+	${MKDIR} ${STAGEDIR}/${WWWDIR}/rrd ${STAGEDIR}/${WWWDIR}/logs
 	# Files in scripts dir should be executable
 	${FIND} ${STAGEDIR}/${WWWDIR}/scripts -type f -exec ${CHMOD} +x {} \;
 	# Ensure PHP and Python scripts are executable

Modified: head/net-mgmt/observium/distinfo
==============================================================================
--- head/net-mgmt/observium/distinfo	Wed Feb  3 15:54:30 2016	(r407956)
+++ head/net-mgmt/observium/distinfo	Wed Feb  3 16:26:35 2016	(r407957)
@@ -1,2 +1,2 @@
-SHA256 (observium-0.15.06.6430/observium-community-latest.tar.gz) = 60a8bbcba05c5b587856b8d2e9ec82507baa98affb82b17f297924a7eb62f560
-SIZE (observium-0.15.06.6430/observium-community-latest.tar.gz) = 41032260
+SHA256 (observium-0.16.1.7533/observium-community-latest.tar.gz) = 55f0feddf0595289c09304d0cf5a26625a057dfb314b22b9fe5726977d1c2b29
+SIZE (observium-0.16.1.7533/observium-community-latest.tar.gz) = 50107191

Modified: head/net-mgmt/observium/files/patch-includes_defaults.inc.php
==============================================================================
--- head/net-mgmt/observium/files/patch-includes_defaults.inc.php	Wed Feb  3 15:54:30 2016	(r407956)
+++ head/net-mgmt/observium/files/patch-includes_defaults.inc.php	Wed Feb  3 16:26:35 2016	(r407957)
@@ -1,15 +1,15 @@
---- includes/defaults.inc.php.orig	2014-11-21 12:33:07 UTC
+--- includes/defaults.inc.php.orig	2016-01-27 16:07:55 UTC
 +++ includes/defaults.inc.php
-@@ -17,7 +17,7 @@ error_reporting(E_ERROR);
+@@ -36,7 +36,7 @@ $config['db']['debug']      = TRUE;     
  
  // Default directories
  
--$config['install_dir']   = "/opt/observium";
+-#$config['install_dir']   = "/opt/observium";
 +$config['install_dir']   = "/usr/local/www/observium";
  #$config['html_dir']      = $config['install_dir'] . "/html";
  #$config['rrd_dir']       = $config['install_dir'] . "/rrd";
- #$config['log_file']      = $config['install_dir'] . "/observium.log";
-@@ -29,27 +29,27 @@ $config['install_dir']   = "/opt/observi
+ #$config['template_dir']  = $config['install_dir'] . "/templates";
+@@ -49,27 +49,27 @@ $config['db']['debug']      = TRUE;     
  
  // Location of executables
  
@@ -40,7 +40,7 @@
 -$config['neato']          = "/usr/bin/neato";
 -$config['sfdp']           = "/usr/bin/sfdp";
 -$config['svn']            = "/usr/bin/svn";
--#$config['git']            = '/usr/bin/git'; // Not enabled by default, used in show device config feature for git-enabled repos
+-$config['git']            = "/usr/bin/git"; // Used in show device config feature for git-enabled repos and rancid >= 3.2
 -$config['wmic']           = "/bin/wmic";
 +$config['mtr']            = "/usr/local/sbin/mtr";
 +$config['nmap']           = "/usr/local/bin/nmap";
@@ -52,7 +52,7 @@
 +$config['neato']          = "/usr/local/bin/neato";
 +$config['sfdp']           = "/usr/local/bin/sfdp";
 +$config['svn']            = "/usr/local/bin/svn";
-+#$config['git']            = "/usr/local/bin/git"; // Not enabled by default, used in show device config feature for git-enabled repos
++$config['git']            = "/usr/local/bin/git"; // Used in show device config feature for git-enabled repos and rancid >= 3.2
 +$config['wmic']           = "/usr/local/bin/wmic";
  $config['file']           = "/usr/bin/file";
  

Modified: head/net-mgmt/observium/files/pkg-message.in
==============================================================================
--- head/net-mgmt/observium/files/pkg-message.in	Wed Feb  3 15:54:30 2016	(r407956)
+++ head/net-mgmt/observium/files/pkg-message.in	Wed Feb  3 16:26:35 2016	(r407957)
@@ -10,8 +10,64 @@ with the following notes:
 33	*/6	*	*	*	www	cd %%WWWDIR%% && %%PHP%% discovery.php -h all
 */5	*	*	*	*	www	cd %%WWWDIR%% && %%PHP%% discovery.php -h new
 */5	*	*	*	*	www	cd %%WWWDIR%% && %%PHP%% poller.php -h all
+*/5	*	*	*	*	www	cd %%WWWDIR%% && %%PYTHON%% poller-wrapper.py 2
 
 Notes:
+
 - Setting $config['snmp']['internal'] to true is not recommended. The
   php function snmp_set_quick_print() used by Observium leaves units like
   kB in the value and Observium currently does not deal with that correctly.
+  
+  This line can be added to %%WWWDIR%%/config.php
+
+- With newer MySQL databases you may need to disable strict mode for
+  Observium to function:
+
+	SET GLOBAL sql_mode = '';
+
+- Apache needs mod_rewrite enable; uncomment the line below in httpd.conf as needed.
+
+    LoadModule rewrite_module libexec/apache24/mod_rewrite.so
+
+MINIMAL baseline install.
+
+A minimal install can be created with the following steps and configuration file:
+
+0: make sure apache and mysql are up and running.
+
+1: create the database and a dbaccount with the following (my)SQL commands:
+
+    CREATE DATABASE observium DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+    GRANT ALL PRIVILEGES ON observium.* TO 'observium'@'localhost' IDENTIFIED BY 'notSecure';
+    SET GLOBAL sql_mode = '';
+
+2: create a minimal config file at:
+
+	 %%WWWDIR%%/config.php
+
+    containing:
+
+<?php
+$config['db_host'] = 'localhost';
+$config['db_user'] = 'observium';
+$config['db_pass'] = 'notSecure';
+$config['db_name'] = 'observium';
+
+$config['snmp']['internal'] = TRUE;
+
+3:  populate the admin user and initialize the database (as 'www' user):
+
+sudo -u www %%WWWDIR%%/discovery.php -u
+sudo -u www %%WWWDIR%%/adduser.php admin SomeInsecureAdminPassword 10
+
+4:   and verify that collection is working:
+
+sudo -u www %%WWWDIR%%/discovery.php -h all -d
+sudo -u www %%WWWDIR%%/poller.php -h all -d
+
+5: Install the above crontabs.
+
+6: log in with a web browser; using the username 'admin' and the 
+   password 'SomeInsecureAdminPassword'.
+
+   Hosts can be added from the webinterface or from the commandline.

Modified: head/net-mgmt/observium/pkg-plist
==============================================================================
--- head/net-mgmt/observium/pkg-plist	Wed Feb  3 15:54:30 2016	(r407956)
+++ head/net-mgmt/observium/pkg-plist	Wed Feb  3 16:26:35 2016	(r407957)
@@ -1,4 +1,3 @@
-%%WWWDIR%%/.scrutinizer.yml
 %%WWWDIR%%/add_device.php
 %%WWWDIR%%/adduser.php
 %%WWWDIR%%/check-errors.php
@@ -8,15 +7,15 @@
 %%WWWDIR%%/delete_device.php
 %%WWWDIR%%/discovery.php
 %%WWWDIR%%/html/.htaccess
+%%WWWDIR%%/html/ajax/device_entities.php
 %%WWWDIR%%/html/ajax/device_ports.php
 %%WWWDIR%%/html/ajax/entity_popup.php
-%%WWWDIR%%/html/ajax/form.php
-%%WWWDIR%%/html/ajax/forms/device-rediscover.inc.php
+%%WWWDIR%%/html/ajax/input.php
 %%WWWDIR%%/html/ajax/search.php
-%%WWWDIR%%/html/api.php
 %%WWWDIR%%/html/bandwidth-graph.php
 %%WWWDIR%%/html/css/bootstrap-hacks.css
 %%WWWDIR%%/html/css/bootstrap-select.css
+%%WWWDIR%%/html/css/bootstrap-switch.css
 %%WWWDIR%%/html/css/bootstrap.css
 %%WWWDIR%%/html/css/flags.css
 %%WWWDIR%%/html/css/font-awesome/README.md
@@ -42,6 +41,25 @@
 %%WWWDIR%%/html/css/styles-wide.css
 %%WWWDIR%%/html/data.php
 %%WWWDIR%%/html/feed.php
+%%WWWDIR%%/html/fonts/SourceSansPro-Light.ttf
+%%WWWDIR%%/html/fonts/SourceSansPro-Regular.eot
+%%WWWDIR%%/html/fonts/SourceSansPro-Regular.otf
+%%WWWDIR%%/html/fonts/SourceSansPro-Regular.otf.woff
+%%WWWDIR%%/html/fonts/SourceSansPro-Regular.otf.woff2
+%%WWWDIR%%/html/fonts/SourceSansPro-Regular.ttf.woff
+%%WWWDIR%%/html/fonts/SourceSansPro-Regular.ttf.woff2
+%%WWWDIR%%/html/fonts/SourceSansPro-Semibold.eot
+%%WWWDIR%%/html/fonts/SourceSansPro-Semibold.otf
+%%WWWDIR%%/html/fonts/SourceSansPro-Semibold.otf.woff
+%%WWWDIR%%/html/fonts/SourceSansPro-Semibold.otf.woff2
+%%WWWDIR%%/html/fonts/SourceSansPro-Semibold.ttf
+%%WWWDIR%%/html/fonts/SourceSansPro-Semibold.ttf.woff
+%%WWWDIR%%/html/fonts/SourceSansPro-Semibold.ttf.woff2
+%%WWWDIR%%/html/fonts/glyphicons-halflings-regular.eot
+%%WWWDIR%%/html/fonts/glyphicons-halflings-regular.svg
+%%WWWDIR%%/html/fonts/glyphicons-halflings-regular.ttf
+%%WWWDIR%%/html/fonts/glyphicons-halflings-regular.woff
+%%WWWDIR%%/html/fonts/glyphicons-halflings-regular.woff2
 %%WWWDIR%%/html/graph-realtime.php
 %%WWWDIR%%/html/graph.php
 %%WWWDIR%%/html/icons.php
@@ -1056,6 +1074,7 @@
 %%WWWDIR%%/html/images/16/zoom_in.png
 %%WWWDIR%%/html/images/16/zoom_out.png
 %%WWWDIR%%/html/images/arrows.gif
+%%WWWDIR%%/html/images/brand-observium-x2.png
 %%WWWDIR%%/html/images/brand-observium.png
 %%WWWDIR%%/html/images/btn_donate_LG.gif
 %%WWWDIR%%/html/images/bullet.gif
@@ -1088,6 +1107,7 @@
 %%WWWDIR%%/html/images/icons/exim.png
 %%WWWDIR%%/html/images/icons/fanspeed.png
 %%WWWDIR%%/html/images/icons/firewall.png
+%%WWWDIR%%/html/images/icons/freeradius.png
 %%WWWDIR%%/html/images/icons/frequency.png
 %%WWWDIR%%/html/images/icons/graphs.png
 %%WWWDIR%%/html/images/icons/greyscale/alerts.png
@@ -1132,6 +1152,7 @@
 %%WWWDIR%%/html/images/icons/ipv4.png
 %%WWWDIR%%/html/images/icons/ipv6.png
 %%WWWDIR%%/html/images/icons/kamailio.png
+%%WWWDIR%%/html/images/icons/lighttpd.png
 %%WWWDIR%%/html/images/icons/loadbalancer.png
 %%WWWDIR%%/html/images/icons/memcached.png
 %%WWWDIR%%/html/images/icons/memory.png
@@ -1142,6 +1163,7 @@
 %%WWWDIR%%/html/images/icons/network.png
 %%WWWDIR%%/html/images/icons/nginx.png
 %%WWWDIR%%/html/images/icons/nographs.png
+%%WWWDIR%%/html/images/icons/openvpn.png
 %%WWWDIR%%/html/images/icons/overview.png
 %%WWWDIR%%/html/images/icons/overview/mempools.png
 %%WWWDIR%%/html/images/icons/overview/processors.png
@@ -1176,6 +1198,7 @@
 %%WWWDIR%%/html/images/icons/wireless.png
 %%WWWDIR%%/html/images/icons/zimbra.png
 %%WWWDIR%%/html/images/lightbg.png
+%%WWWDIR%%/html/images/lightbg2.png
 %%WWWDIR%%/html/images/loading.gif
 %%WWWDIR%%/html/images/login-hamster-large.png
 %%WWWDIR%%/html/images/login-hamster.png
@@ -1195,212 +1218,362 @@
 %%WWWDIR%%/html/images/os/acme.png
 %%WWWDIR%%/html/images/os/actelis.png
 %%WWWDIR%%/html/images/os/adtran.png
+%%WWWDIR%%/html/images/os/adtran_2x.png
 %%WWWDIR%%/html/images/os/adva.png
+%%WWWDIR%%/html/images/os/aerohive.png
 %%WWWDIR%%/html/images/os/aix.png
+%%WWWDIR%%/html/images/os/aix_2x.png
 %%WWWDIR%%/html/images/os/akcp.png
 %%WWWDIR%%/html/images/os/alcatellucent.png
-%%WWWDIR%%/html/images/os/allied.png
+%%WWWDIR%%/html/images/os/alcatellucent_2x.png
 %%WWWDIR%%/html/images/os/alliedtelesis.png
+%%WWWDIR%%/html/images/os/alliedtelesis_2x.png
 %%WWWDIR%%/html/images/os/alvarion.png
+%%WWWDIR%%/html/images/os/alvarion_2x.png
 %%WWWDIR%%/html/images/os/apc.png
+%%WWWDIR%%/html/images/os/apc_2x.png
 %%WWWDIR%%/html/images/os/apple.png
 %%WWWDIR%%/html/images/os/arbor.png
+%%WWWDIR%%/html/images/os/arbor_2x.png
 %%WWWDIR%%/html/images/os/archlinux.png
 %%WWWDIR%%/html/images/os/areca.png
 %%WWWDIR%%/html/images/os/arista.png
+%%WWWDIR%%/html/images/os/arista_2x.png
 %%WWWDIR%%/html/images/os/arris.png
-%%WWWDIR%%/html/images/os/arubaos.png
+%%WWWDIR%%/html/images/os/aruba.png
+%%WWWDIR%%/html/images/os/aruba_2x.png
+%%WWWDIR%%/html/images/os/aten.png
+%%WWWDIR%%/html/images/os/aten_2x.png
+%%WWWDIR%%/html/images/os/atto.png
+%%WWWDIR%%/html/images/os/atto_2x.png
 %%WWWDIR%%/html/images/os/audiocodes.png
+%%WWWDIR%%/html/images/os/audiocodes_2x.png
 %%WWWDIR%%/html/images/os/avaya.png
+%%WWWDIR%%/html/images/os/avaya_2x.png
 %%WWWDIR%%/html/images/os/avocent.png
 %%WWWDIR%%/html/images/os/avtech.png
 %%WWWDIR%%/html/images/os/axis.png
 %%WWWDIR%%/html/images/os/barracuda.png
+%%WWWDIR%%/html/images/os/baytech.png
+%%WWWDIR%%/html/images/os/baytech_2x.png
+%%WWWDIR%%/html/images/os/bdcom.png
+%%WWWDIR%%/html/images/os/billion.png
+%%WWWDIR%%/html/images/os/billion_2x.png
+%%WWWDIR%%/html/images/os/blackbox.png
+%%WWWDIR%%/html/images/os/blackbox_2x.png
 %%WWWDIR%%/html/images/os/bluecoat.png
+%%WWWDIR%%/html/images/os/bluecoat_2x.png
 %%WWWDIR%%/html/images/os/bnt.png
+%%WWWDIR%%/html/images/os/bridgewave.png
 %%WWWDIR%%/html/images/os/broadcom.png
 %%WWWDIR%%/html/images/os/brocade.png
+%%WWWDIR%%/html/images/os/brocade_2x.png
 %%WWWDIR%%/html/images/os/brother.png
 %%WWWDIR%%/html/images/os/bti.png
 %%WWWDIR%%/html/images/os/buffalo.png
+%%WWWDIR%%/html/images/os/buffalo_2x.png
 %%WWWDIR%%/html/images/os/calix.png
+%%WWWDIR%%/html/images/os/calix_2x.png
 %%WWWDIR%%/html/images/os/cambium.png
 %%WWWDIR%%/html/images/os/canon.png
 %%WWWDIR%%/html/images/os/carel.png
+%%WWWDIR%%/html/images/os/casa.png
+%%WWWDIR%%/html/images/os/casa_2x.png
+%%WWWDIR%%/html/images/os/ccpower.png
 %%WWWDIR%%/html/images/os/centos.png
+%%WWWDIR%%/html/images/os/centos_2x.png
 %%WWWDIR%%/html/images/os/checkpoint.png
+%%WWWDIR%%/html/images/os/checkpoint_2x.png
 %%WWWDIR%%/html/images/os/ciena.png
+%%WWWDIR%%/html/images/os/ciena_2x.png
 %%WWWDIR%%/html/images/os/cisco-old.png
 %%WWWDIR%%/html/images/os/cisco.png
+%%WWWDIR%%/html/images/os/cisco_2x.png
 %%WWWDIR%%/html/images/os/ciscosb.png
+%%WWWDIR%%/html/images/os/ciscosb_2x.png
 %%WWWDIR%%/html/images/os/citrix.png
+%%WWWDIR%%/html/images/os/clavister.png
+%%WWWDIR%%/html/images/os/clavister_2x.png
 %%WWWDIR%%/html/images/os/cloudlinux.png
 %%WWWDIR%%/html/images/os/comet.png
 %%WWWDIR%%/html/images/os/conexant.png
+%%WWWDIR%%/html/images/os/cyan.png
+%%WWWDIR%%/html/images/os/d-link.png
+%%WWWDIR%%/html/images/os/d-link_2x.png
+%%WWWDIR%%/html/images/os/darwin-old.png
+%%WWWDIR%%/html/images/os/darwin-old_2x.png
 %%WWWDIR%%/html/images/os/darwin.png
+%%WWWDIR%%/html/images/os/darwin_2x.png
+%%WWWDIR%%/html/images/os/dasan.png
+%%WWWDIR%%/html/images/os/datadomain.png
+%%WWWDIR%%/html/images/os/datadomain_2x.png
+%%WWWDIR%%/html/images/os/ddn.png
+%%WWWDIR%%/html/images/os/ddn_2x.png
 %%WWWDIR%%/html/images/os/ddwrt.png
 %%WWWDIR%%/html/images/os/debian.png
+%%WWWDIR%%/html/images/os/debian_2x.png
 %%WWWDIR%%/html/images/os/dell.png
+%%WWWDIR%%/html/images/os/dell_2x.png
 %%WWWDIR%%/html/images/os/delta.png
 %%WWWDIR%%/html/images/os/digi.png
-%%WWWDIR%%/html/images/os/dlink.png
 %%WWWDIR%%/html/images/os/dragonfly.png
 %%WWWDIR%%/html/images/os/draytek.png
+%%WWWDIR%%/html/images/os/draytek_2x.png
 %%WWWDIR%%/html/images/os/eaton.png
+%%WWWDIR%%/html/images/os/eltek.png
 %%WWWDIR%%/html/images/os/emerson.png
+%%WWWDIR%%/html/images/os/emerson_2x.png
 %%WWWDIR%%/html/images/os/endian.png
 %%WWWDIR%%/html/images/os/engenius.png
 %%WWWDIR%%/html/images/os/enterasys.png
 %%WWWDIR%%/html/images/os/epson.png
 %%WWWDIR%%/html/images/os/ericsson.png
+%%WWWDIR%%/html/images/os/ericsson_2x.png
 %%WWWDIR%%/html/images/os/exalt.png
+%%WWWDIR%%/html/images/os/exalt_2x.png
 %%WWWDIR%%/html/images/os/extreme.png
 %%WWWDIR%%/html/images/os/f5.png
+%%WWWDIR%%/html/images/os/f5_2x.png
 %%WWWDIR%%/html/images/os/fedora.png
+%%WWWDIR%%/html/images/os/fiberroad.png
+%%WWWDIR%%/html/images/os/fiberroad_2x.png
+%%WWWDIR%%/html/images/os/firebrick.png
 %%WWWDIR%%/html/images/os/fireeye.png
 %%WWWDIR%%/html/images/os/force10.png
+%%WWWDIR%%/html/images/os/force10_2x.png
 %%WWWDIR%%/html/images/os/fortinet.png
+%%WWWDIR%%/html/images/os/fortinet_2x.png
 %%WWWDIR%%/html/images/os/freebsd.png
+%%WWWDIR%%/html/images/os/freebsd_2x.png
 %%WWWDIR%%/html/images/os/freenas.png
+%%WWWDIR%%/html/images/os/freenas_2x.png
 %%WWWDIR%%/html/images/os/gamatronicups.png
+%%WWWDIR%%/html/images/os/gcom.png
+%%WWWDIR%%/html/images/os/ge.png
+%%WWWDIR%%/html/images/os/ge_2x.png
 %%WWWDIR%%/html/images/os/geist.png
+%%WWWDIR%%/html/images/os/geist_2x.png
 %%WWWDIR%%/html/images/os/generex.png
+%%WWWDIR%%/html/images/os/generex_2x.png
 %%WWWDIR%%/html/images/os/generic.png
+%%WWWDIR%%/html/images/os/generic_2x.png
 %%WWWDIR%%/html/images/os/gentoo.png
+%%WWWDIR%%/html/images/os/gta.png
 %%WWWDIR%%/html/images/os/gude.png
 %%WWWDIR%%/html/images/os/h3c.png
+%%WWWDIR%%/html/images/os/h3c_2x.png
+%%WWWDIR%%/html/images/os/hikvision.png
 %%WWWDIR%%/html/images/os/hp.png
+%%WWWDIR%%/html/images/os/hp_2x.png
 %%WWWDIR%%/html/images/os/huawei.png
+%%WWWDIR%%/html/images/os/huawei_2x.png
 %%WWWDIR%%/html/images/os/hwg-ste.png
+%%WWWDIR%%/html/images/os/hwg-ste_2x.png
 %%WWWDIR%%/html/images/os/ibm.png
+%%WWWDIR%%/html/images/os/ibm_2x.png
 %%WWWDIR%%/html/images/os/ibmi.png
+%%WWWDIR%%/html/images/os/imation.png
+%%WWWDIR%%/html/images/os/imation_2x.png
 %%WWWDIR%%/html/images/os/infinera.png
+%%WWWDIR%%/html/images/os/infinera_2x.png
 %%WWWDIR%%/html/images/os/infoblox.png
 %%WWWDIR%%/html/images/os/ingrasys.png
+%%WWWDIR%%/html/images/os/isilion.png
+%%WWWDIR%%/html/images/os/jacarta.png
+%%WWWDIR%%/html/images/os/janitza.png
+%%WWWDIR%%/html/images/os/janitza_2x.png
 %%WWWDIR%%/html/images/os/juniper.png
+%%WWWDIR%%/html/images/os/juniper_2x.png
 %%WWWDIR%%/html/images/os/junos.png
 %%WWWDIR%%/html/images/os/konica.png
 %%WWWDIR%%/html/images/os/korenix.png
 %%WWWDIR%%/html/images/os/kyocera.png
-%%WWWDIR%%/html/images/os/lcos.png
+%%WWWDIR%%/html/images/os/lancom.png
+%%WWWDIR%%/html/images/os/lancom_2x.png
 %%WWWDIR%%/html/images/os/lexmark.png
+%%WWWDIR%%/html/images/os/lexmark_2x.png
 %%WWWDIR%%/html/images/os/lg.png
+%%WWWDIR%%/html/images/os/lg_2x.png
 %%WWWDIR%%/html/images/os/linksys.png
 %%WWWDIR%%/html/images/os/linux.png
+%%WWWDIR%%/html/images/os/linux_2x.png
 %%WWWDIR%%/html/images/os/mailcleaner.png
+%%WWWDIR%%/html/images/os/mailcleaner_2x.png
+%%WWWDIR%%/html/images/os/maipu.png
+%%WWWDIR%%/html/images/os/maipu_2x.png
 %%WWWDIR%%/html/images/os/mandrake.png
 %%WWWDIR%%/html/images/os/mandriva.png
 %%WWWDIR%%/html/images/os/mellanox.png
 %%WWWDIR%%/html/images/os/meraki.png
+%%WWWDIR%%/html/images/os/meraki_2x.png
 %%WWWDIR%%/html/images/os/mge.png
 %%WWWDIR%%/html/images/os/microsens.png
+%%WWWDIR%%/html/images/os/mikrotik.png
+%%WWWDIR%%/html/images/os/mikrotik_2x.png
 %%WWWDIR%%/html/images/os/minkelsrms.png
 %%WWWDIR%%/html/images/os/mitel.png
+%%WWWDIR%%/html/images/os/mitel_2x.png
 %%WWWDIR%%/html/images/os/monowall.png
+%%WWWDIR%%/html/images/os/motorola.png
+%%WWWDIR%%/html/images/os/motorola_2x.png
+%%WWWDIR%%/html/images/os/moxa.png
 %%WWWDIR%%/html/images/os/mrv.png
 %%WWWDIR%%/html/images/os/nas4free.png
+%%WWWDIR%%/html/images/os/nas4free_2x.png
 %%WWWDIR%%/html/images/os/netapp.png
+%%WWWDIR%%/html/images/os/netapp_2x.png
 %%WWWDIR%%/html/images/os/netbotz.png
 %%WWWDIR%%/html/images/os/netbsd.png
 %%WWWDIR%%/html/images/os/netgear.png
+%%WWWDIR%%/html/images/os/netgear_2x.png
+%%WWWDIR%%/html/images/os/netinsight.png
 %%WWWDIR%%/html/images/os/netmanplus.png
 %%WWWDIR%%/html/images/os/netopia.png
+%%WWWDIR%%/html/images/os/netping.png
+%%WWWDIR%%/html/images/os/netping_2x.png
 %%WWWDIR%%/html/images/os/netvision.png
 %%WWWDIR%%/html/images/os/nexenta.png
 %%WWWDIR%%/html/images/os/nexsan.png
+%%WWWDIR%%/html/images/os/nexsan_2x.png
+%%WWWDIR%%/html/images/os/nortel.png
 %%WWWDIR%%/html/images/os/novell.png
+%%WWWDIR%%/html/images/os/novell_2x.png
 %%WWWDIR%%/html/images/os/nrg.png
+%%WWWDIR%%/html/images/os/nrg_2x.png
 %%WWWDIR%%/html/images/os/oec.png
+%%WWWDIR%%/html/images/os/oec_2x.png
 %%WWWDIR%%/html/images/os/oki.png
 %%WWWDIR%%/html/images/os/olivetti.png
+%%WWWDIR%%/html/images/os/olivetti_2x.png
+%%WWWDIR%%/html/images/os/oneaccess.png
+%%WWWDIR%%/html/images/os/oneaccess_2x.png
 %%WWWDIR%%/html/images/os/open-e.png
 %%WWWDIR%%/html/images/os/openbsd.png
+%%WWWDIR%%/html/images/os/openbsd_2x.png
 %%WWWDIR%%/html/images/os/opengear.png
 %%WWWDIR%%/html/images/os/openindiana.png
+%%WWWDIR%%/html/images/os/openindiana_2x.png
 %%WWWDIR%%/html/images/os/opensolaris.png
 %%WWWDIR%%/html/images/os/openwrt.png
+%%WWWDIR%%/html/images/os/openwrt_2x.png
 %%WWWDIR%%/html/images/os/packetflux.png
+%%WWWDIR%%/html/images/os/packetflux_2x.png
+%%WWWDIR%%/html/images/os/paloalto.png
 %%WWWDIR%%/html/images/os/panasonic.png
-%%WWWDIR%%/html/images/os/panos.png
+%%WWWDIR%%/html/images/os/panasonic_2x.png
 %%WWWDIR%%/html/images/os/papouch.png
 %%WWWDIR%%/html/images/os/patton.png
+%%WWWDIR%%/html/images/os/patton_2x.png
 %%WWWDIR%%/html/images/os/pc-bsd.png
 %%WWWDIR%%/html/images/os/pfsense.png
 %%WWWDIR%%/html/images/os/pica8.png
+%%WWWDIR%%/html/images/os/pica8_2x.png
 %%WWWDIR%%/html/images/os/poseidon.png
+%%WWWDIR%%/html/images/os/poseidon_2x.png
 %%WWWDIR%%/html/images/os/procera.png
 %%WWWDIR%%/html/images/os/proxim.png
 %%WWWDIR%%/html/images/os/proxyav.png
 %%WWWDIR%%/html/images/os/qnap.png
+%%WWWDIR%%/html/images/os/racktivity.png
 %%WWWDIR%%/html/images/os/radlan.png
 %%WWWDIR%%/html/images/os/radware.png
+%%WWWDIR%%/html/images/os/radware_2x.png
+%%WWWDIR%%/html/images/os/raisecom.png
 %%WWWDIR%%/html/images/os/raritan.png
 %%WWWDIR%%/html/images/os/raspbian.png
+%%WWWDIR%%/html/images/os/raspbian_2x.png
 %%WWWDIR%%/html/images/os/redhat.png
+%%WWWDIR%%/html/images/os/redhat_2x.png
 %%WWWDIR%%/html/images/os/ricoh.png
 %%WWWDIR%%/html/images/os/rittal.png
+%%WWWDIR%%/html/images/os/rittal_2x.png
 %%WWWDIR%%/html/images/os/riverbed.png
+%%WWWDIR%%/html/images/os/riverbed_2x.png
 %%WWWDIR%%/html/images/os/routeros.png
+%%WWWDIR%%/html/images/os/routeros_2x.png
 %%WWWDIR%%/html/images/os/ruckus.png
+%%WWWDIR%%/html/images/os/ruckus_2x.png
+%%WWWDIR%%/html/images/os/saf.png
 %%WWWDIR%%/html/images/os/samsung.png
 %%WWWDIR%%/html/images/os/screenos.png
 %%WWWDIR%%/html/images/os/servertech.png
+%%WWWDIR%%/html/images/os/servertech_2x.png
 %%WWWDIR%%/html/images/os/sharp.png
+%%WWWDIR%%/html/images/os/shoretel.png
+%%WWWDIR%%/html/images/os/shoretel_2x.png
 %%WWWDIR%%/html/images/os/shoretelos.png
 %%WWWDIR%%/html/images/os/sindoh.png
+%%WWWDIR%%/html/images/os/sindoh_2x.png
 %%WWWDIR%%/html/images/os/slackware.png
 %%WWWDIR%%/html/images/os/smartoptics.png
 %%WWWDIR%%/html/images/os/snom.png
 %%WWWDIR%%/html/images/os/solaris.png
 %%WWWDIR%%/html/images/os/sonicwall.png
+%%WWWDIR%%/html/images/os/sonicwall_2x.png
+%%WWWDIR%%/html/images/os/sophos.png
+%%WWWDIR%%/html/images/os/sophos_2x.png
 %%WWWDIR%%/html/images/os/speedtouch.png
+%%WWWDIR%%/html/images/os/speedtouch_2x.png
 %%WWWDIR%%/html/images/os/supermicro.png
 %%WWWDIR%%/html/images/os/suse.png
 %%WWWDIR%%/html/images/os/symbol.png
 %%WWWDIR%%/html/images/os/synology.png
+%%WWWDIR%%/html/images/os/teracom.png
+%%WWWDIR%%/html/images/os/teradici.png
 %%WWWDIR%%/html/images/os/toshiba.png
-%%WWWDIR%%/html/images/os/tplink.png
+%%WWWDIR%%/html/images/os/tp-link.png
+%%WWWDIR%%/html/images/os/tp-link_2x.png
 %%WWWDIR%%/html/images/os/trango.png
 %%WWWDIR%%/html/images/os/tranzeo.png
 %%WWWDIR%%/html/images/os/tripplite.png
+%%WWWDIR%%/html/images/os/tsl.png
 %%WWWDIR%%/html/images/os/ubiquiti.png
+%%WWWDIR%%/html/images/os/ubiquiti_2x.png
 %%WWWDIR%%/html/images/os/ubuntu.png
+%%WWWDIR%%/html/images/os/ubuntu_2x.png
 %%WWWDIR%%/html/images/os/uniflair.png
 %%WWWDIR%%/html/images/os/vmware.png
+%%WWWDIR%%/html/images/os/vmware_2x.png
 %%WWWDIR%%/html/images/os/voswall.png
 %%WWWDIR%%/html/images/os/vyatta.png
 %%WWWDIR%%/html/images/os/vyos.png
 %%WWWDIR%%/html/images/os/watchguard.png
+%%WWWDIR%%/html/images/os/watchguard_2x.png
 %%WWWDIR%%/html/images/os/wepresent.png
+%%WWWDIR%%/html/images/os/wepresent_2x.png
 %%WWWDIR%%/html/images/os/windows.png
+%%WWWDIR%%/html/images/os/windows10.png
+%%WWWDIR%%/html/images/os/windows10_2x.png
+%%WWWDIR%%/html/images/os/windows2003.png
+%%WWWDIR%%/html/images/os/windows2003_2x.png
+%%WWWDIR%%/html/images/os/windows_2x.png
 %%WWWDIR%%/html/images/os/windows_old.png
+%%WWWDIR%%/html/images/os/windows_old_2x.png
 %%WWWDIR%%/html/images/os/wut.png
+%%WWWDIR%%/html/images/os/wut_2x.png
 %%WWWDIR%%/html/images/os/wxgoos.png
 %%WWWDIR%%/html/images/os/xerox.png
 %%WWWDIR%%/html/images/os/zhone.png
 %%WWWDIR%%/html/images/os/zte.png
+%%WWWDIR%%/html/images/os/zte_2x.png
 %%WWWDIR%%/html/images/os/zyxel.png
 %%WWWDIR%%/html/images/password-blue.png
 %%WWWDIR%%/html/images/password.png
 %%WWWDIR%%/html/images/plus.gif
 %%WWWDIR%%/html/images/readme.html
 %%WWWDIR%%/html/images/readme.txt
+%%WWWDIR%%/html/images/subtle_grunge.png
+%%WWWDIR%%/html/images/subtle_grunge_x2.png
 %%WWWDIR%%/html/images/tiny_grid.png
 %%WWWDIR%%/html/img/flags.png
 %%WWWDIR%%/html/img/glyphicons-halflings-white.png
 %%WWWDIR%%/html/img/glyphicons-halflings.png
 %%WWWDIR%%/html/img/sprite.png
 %%WWWDIR%%/html/includes/.htaccess
-%%WWWDIR%%/html/includes/Mobile_Detect.php
-%%WWWDIR%%/html/includes/UserAgentParser.php
-%%WWWDIR%%/html/includes/api/errorcodes.inc.php
-%%WWWDIR%%/html/includes/api/functions.inc.php
-%%WWWDIR%%/html/includes/api/module.billing.inc.php
-%%WWWDIR%%/html/includes/api/module.demo.inc.php
-%%WWWDIR%%/html/includes/api/module.inventory.inc.php
-%%WWWDIR%%/html/includes/api/module.packages.inc.php
+%%WWWDIR%%/html/includes/alerting-navbar.inc.php
 %%WWWDIR%%/html/includes/authenticate-functions.inc.php
 %%WWWDIR%%/html/includes/authenticate.inc.php
+%%WWWDIR%%/html/includes/authentication/cas.inc.php
 %%WWWDIR%%/html/includes/authentication/http-auth.inc.php
 %%WWWDIR%%/html/includes/authentication/ldap.inc.php
 %%WWWDIR%%/html/includes/authentication/mysql.inc.php
@@ -1411,10 +1584,19 @@
 %%WWWDIR%%/html/includes/collectd/definitions.local.php
 %%WWWDIR%%/html/includes/collectd/definitions.php
 %%WWWDIR%%/html/includes/collectd/functions.php
+%%WWWDIR%%/html/includes/contacts-navbar.inc.php
 %%WWWDIR%%/html/includes/entities/device.inc.php
 %%WWWDIR%%/html/includes/entities/generic.inc.php
+%%WWWDIR%%/html/includes/entities/mempool.inc.php
+%%WWWDIR%%/html/includes/entities/p2pradio.inc.php
 %%WWWDIR%%/html/includes/entities/port.inc.php
-%%WWWDIR%%/html/includes/error-no-perm.inc.php
+%%WWWDIR%%/html/includes/entities/processor.inc.php
+%%WWWDIR%%/html/includes/entities/pseudowire.inc.php
+%%WWWDIR%%/html/includes/entities/sensor.inc.php
+%%WWWDIR%%/html/includes/entities/sla.inc.php
+%%WWWDIR%%/html/includes/entities/status.inc.php
+%%WWWDIR%%/html/includes/entities/storage.inc.php
+%%WWWDIR%%/html/includes/entities/toner.inc.php
 %%WWWDIR%%/html/includes/functions.inc.php
 %%WWWDIR%%/html/includes/graphs/XXX_device_memory_windows.inc.php
 %%WWWDIR%%/html/includes/graphs/accesspoints/auth.inc.php
@@ -1476,6 +1658,34 @@
 %%WWWDIR%%/html/includes/graphs/application/exim-mailqueue_total.inc.php
 %%WWWDIR%%/html/includes/graphs/application/freeradius_accounting.inc.php
 %%WWWDIR%%/html/includes/graphs/application/freeradius_authentication.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_classes.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_eden.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_gc_old_count.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_gc_old_time.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_gc_young_count.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_gc_young_time.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_heap.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_memory_summary.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_nonheap.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_old.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_perm.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_system_uptime.inc.php
+%%WWWDIR%%/html/includes/graphs/application/jvmoverjmx_threads.inc.php
+%%WWWDIR%%/html/includes/graphs/application/kamailio_core.inc.php
+%%WWWDIR%%/html/includes/graphs/application/kamailio_errors.inc.php
+%%WWWDIR%%/html/includes/graphs/application/kamailio_registrar.inc.php
+%%WWWDIR%%/html/includes/graphs/application/kamailio_shmen.inc.php
+%%WWWDIR%%/html/includes/graphs/application/kamailio_sl123.inc.php
+%%WWWDIR%%/html/includes/graphs/application/kamailio_sl4.inc.php
+%%WWWDIR%%/html/includes/graphs/application/kamailio_sl56.inc.php
+%%WWWDIR%%/html/includes/graphs/application/kamailio_tcp.inc.php
+%%WWWDIR%%/html/includes/graphs/application/kamailio_tmx.inc.php
+%%WWWDIR%%/html/includes/graphs/application/kamailio_usrloc.inc.php
+%%WWWDIR%%/html/includes/graphs/application/lighttpd_hits.inc.php
+%%WWWDIR%%/html/includes/graphs/application/lighttpd_scoreboardstatistics.inc.php
+%%WWWDIR%%/html/includes/graphs/application/lighttpd_servers.inc.php
+%%WWWDIR%%/html/includes/graphs/application/lighttpd_traffic.inc.php
+%%WWWDIR%%/html/includes/graphs/application/lighttpd_uptime.inc.php
 %%WWWDIR%%/html/includes/graphs/application/mailscanner_reject.inc.php
 %%WWWDIR%%/html/includes/graphs/application/mailscanner_sent.inc.php
 %%WWWDIR%%/html/includes/graphs/application/mailscanner_spam.inc.php
@@ -1517,9 +1727,20 @@
 %%WWWDIR%%/html/includes/graphs/application/nfs_nfs2.inc.php
 %%WWWDIR%%/html/includes/graphs/application/nfs_nfs3.inc.php
 %%WWWDIR%%/html/includes/graphs/application/nfs_nfs4.inc.php
+%%WWWDIR%%/html/includes/graphs/application/nfsd_io.inc.php
+%%WWWDIR%%/html/includes/graphs/application/nfsd_net.inc.php
+%%WWWDIR%%/html/includes/graphs/application/nfsd_proc3.inc.php
+%%WWWDIR%%/html/includes/graphs/application/nfsd_rc.inc.php
+%%WWWDIR%%/html/includes/graphs/application/nfsd_rpc.inc.php
 %%WWWDIR%%/html/includes/graphs/application/nginx_connections.inc.php
 %%WWWDIR%%/html/includes/graphs/application/nginx_req.inc.php
 %%WWWDIR%%/html/includes/graphs/application/nptd_uptime.inc.php
+%%WWWDIR%%/html/includes/graphs/application/nsd_axfr.inc.php
+%%WWWDIR%%/html/includes/graphs/application/nsd_memory.inc.php
+%%WWWDIR%%/html/includes/graphs/application/nsd_qtype.inc.php
+%%WWWDIR%%/html/includes/graphs/application/nsd_queries.inc.php
+%%WWWDIR%%/html/includes/graphs/application/nsd_rcode.inc.php
+%%WWWDIR%%/html/includes/graphs/application/nsd_zones.inc.php
 %%WWWDIR%%/html/includes/graphs/application/ntpclient_freq.inc.php
 %%WWWDIR%%/html/includes/graphs/application/ntpclient_stats.inc.php
 %%WWWDIR%%/html/includes/graphs/application/ntpd_bits.inc.php
@@ -1536,6 +1757,8 @@
 %%WWWDIR%%/html/includes/graphs/application/ntpdserver_stats.inc.php
 %%WWWDIR%%/html/includes/graphs/application/ntpdserver_stratum.inc.php
 %%WWWDIR%%/html/includes/graphs/application/ntpdserver_uptime.inc.php
+%%WWWDIR%%/html/includes/graphs/application/openvpn_bits.inc.php
+%%WWWDIR%%/html/includes/graphs/application/openvpn_nclients.inc.php
 %%WWWDIR%%/html/includes/graphs/application/postfix_reject.inc.php
 %%WWWDIR%%/html/includes/graphs/application/postfix_sent.inc.php
 %%WWWDIR%%/html/includes/graphs/application/postfix_spam.inc.php
@@ -1576,6 +1799,9 @@
 %%WWWDIR%%/html/includes/graphs/application/unbound_queries.inc.php
 %%WWWDIR%%/html/includes/graphs/application/unbound_queue.inc.php
 %%WWWDIR%%/html/includes/graphs/application/unbound_rcode.inc.php
+%%WWWDIR%%/html/includes/graphs/application/varnish_backend.inc.php
+%%WWWDIR%%/html/includes/graphs/application/varnish_cache.inc.php
+%%WWWDIR%%/html/includes/graphs/application/varnish_lru.inc.php
 %%WWWDIR%%/html/includes/graphs/application/vmwaretools_cpu.inc.php
 %%WWWDIR%%/html/includes/graphs/application/vmwaretools_mem.inc.php
 %%WWWDIR%%/html/includes/graphs/application/zimbra_connections.inc.php
@@ -1589,13 +1815,7 @@
 %%WWWDIR%%/html/includes/graphs/atmvp/errors.inc.php
 %%WWWDIR%%/html/includes/graphs/atmvp/packets.inc.php
 %%WWWDIR%%/html/includes/graphs/bgp/auth.inc.php
-%%WWWDIR%%/html/includes/graphs/bgp/prefixes.inc.php
-%%WWWDIR%%/html/includes/graphs/bgp/prefixes_ipv4multicast.inc.php
-%%WWWDIR%%/html/includes/graphs/bgp/prefixes_ipv4unicast.inc.php
-%%WWWDIR%%/html/includes/graphs/bgp/prefixes_ipv4vpn.inc.php
-%%WWWDIR%%/html/includes/graphs/bgp/prefixes_ipv6multicast.inc.php
-%%WWWDIR%%/html/includes/graphs/bgp/prefixes_ipv6unicast.inc.php
-%%WWWDIR%%/html/includes/graphs/bgp/prefixes_ipv6vpn.inc.php
+%%WWWDIR%%/html/includes/graphs/bgp/graph.inc.php
 %%WWWDIR%%/html/includes/graphs/bgp/updates.inc.php
 %%WWWDIR%%/html/includes/graphs/bill/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/bill/bits.inc.php
@@ -1615,6 +1835,9 @@
 %%WWWDIR%%/html/includes/graphs/common.inc.php
 %%WWWDIR%%/html/includes/graphs/customer/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/customer/bits.inc.php
+%%WWWDIR%%/html/includes/graphs/device/NETAPP-MIB_disk_io.inc.php
+%%WWWDIR%%/html/includes/graphs/device/NETAPP-MIB_net_io.inc.php
+%%WWWDIR%%/html/includes/graphs/device/NETAPP-MIB_tape_io.inc.php
 %%WWWDIR%%/html/includes/graphs/device/agent.inc.php
 %%WWWDIR%%/html/includes/graphs/device/arubacontroller_numaps.inc.php
 %%WWWDIR%%/html/includes/graphs/device/arubacontroller_numclients.inc.php
@@ -1627,6 +1850,7 @@
 %%WWWDIR%%/html/includes/graphs/device/bluecoat_server.inc.php
 %%WWWDIR%%/html/includes/graphs/device/bluecoat_tcp.inc.php
 %%WWWDIR%%/html/includes/graphs/device/bluecoat_tcp_est.inc.php
+%%WWWDIR%%/html/includes/graphs/device/bng_active_sessions.inc.php
 %%WWWDIR%%/html/includes/graphs/device/cipsec_flow_bits.inc.php
 %%WWWDIR%%/html/includes/graphs/device/cipsec_flow_pkts.inc.php
 %%WWWDIR%%/html/includes/graphs/device/cipsec_flow_stats.inc.php
@@ -1697,6 +1921,13 @@
 %%WWWDIR%%/html/includes/graphs/device/netscalersvc_pkts.inc.php
 %%WWWDIR%%/html/includes/graphs/device/netscalersvc_reqs.inc.php
 %%WWWDIR%%/html/includes/graphs/device/netscalersvc_ttfb.inc.php
+%%WWWDIR%%/html/includes/graphs/device/netscalersvcgrpmem.inc.php
+%%WWWDIR%%/html/includes/graphs/device/netscalersvcgrpmem_bits.inc.php
+%%WWWDIR%%/html/includes/graphs/device/netscalersvcgrpmem_common.inc.php
+%%WWWDIR%%/html/includes/graphs/device/netscalersvcgrpmem_conns.inc.php
+%%WWWDIR%%/html/includes/graphs/device/netscalersvcgrpmem_pkts.inc.php
+%%WWWDIR%%/html/includes/graphs/device/netscalersvcgrpmem_reqs.inc.php
+%%WWWDIR%%/html/includes/graphs/device/netscalersvcgrpmem_ttfb.inc.php
 %%WWWDIR%%/html/includes/graphs/device/netscalervsvr.inc.php
 %%WWWDIR%%/html/includes/graphs/device/netscalervsvr_bits.inc.php
 %%WWWDIR%%/html/includes/graphs/device/netscalervsvr_conns.inc.php
@@ -1729,7 +1960,6 @@
 %%WWWDIR%%/html/includes/graphs/device/processor_stack.inc.php
 %%WWWDIR%%/html/includes/graphs/device/screenos_sessions.inc.php
 %%WWWDIR%%/html/includes/graphs/device/sensor.inc.php
-%%WWWDIR%%/html/includes/graphs/device/sla_jitter.inc.php
 %%WWWDIR%%/html/includes/graphs/device/smokeping_all_common.inc.php
 %%WWWDIR%%/html/includes/graphs/device/smokeping_all_common_avg.inc.php
 %%WWWDIR%%/html/includes/graphs/device/smokeping_common.inc.php
@@ -1744,6 +1974,7 @@
 %%WWWDIR%%/html/includes/graphs/device/ucd_cpu.inc.php
 %%WWWDIR%%/html/includes/graphs/device/ucd_io.inc.php
 %%WWWDIR%%/html/includes/graphs/device/ucd_memory.inc.php
+%%WWWDIR%%/html/includes/graphs/device/ucd_ss_cpu.inc.php
 %%WWWDIR%%/html/includes/graphs/device/ucd_swap_io.inc.php
 %%WWWDIR%%/html/includes/graphs/device/vpdn_sessions_l2tp.inc.php
 %%WWWDIR%%/html/includes/graphs/device/vpdn_tunnels_l2tp.inc.php
@@ -1777,6 +2008,9 @@
 %%WWWDIR%%/html/includes/graphs/ipsectunnel/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/ipsectunnel/bits.inc.php
 %%WWWDIR%%/html/includes/graphs/ipsectunnel/pkts.inc.php
+%%WWWDIR%%/html/includes/graphs/lb-virtual/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/lb-virtual/bits.inc.php
+%%WWWDIR%%/html/includes/graphs/lb-virtual/conns.inc.php
 %%WWWDIR%%/html/includes/graphs/legend.inc.php
 %%WWWDIR%%/html/includes/graphs/location/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/location/bits.inc.php
@@ -1786,12 +2020,28 @@
 %%WWWDIR%%/html/includes/graphs/mempool/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/mempool/usage.inc.php
 %%WWWDIR%%/html/includes/graphs/minute_multi_line.inc.php
-%%WWWDIR%%/html/includes/graphs/multiport/auth.inc.php
-%%WWWDIR%%/html/includes/graphs/multiport/bits.inc.php
-%%WWWDIR%%/html/includes/graphs/multiport/bits_duo.inc.php
-%%WWWDIR%%/html/includes/graphs/multiport/bits_duo_separate.inc.php
-%%WWWDIR%%/html/includes/graphs/multiport/bits_separate.inc.php
-%%WWWDIR%%/html/includes/graphs/multiport/bits_trio.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-mempool/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-mempool/usage.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/bcastpkts.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/bits.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/bits_duo.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/bits_duo_separate.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/bits_old.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/bits_separate.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/bits_trio.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/discards.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/errors.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/mcastpkts.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-port/upkts.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-processor/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-processor/usage.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-sensor/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-sensor/graph.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-status/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-status/graph.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-storage/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-storage/usage.inc.php
 %%WWWDIR%%/html/includes/graphs/munin/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/munin/graph.inc.php
 %%WWWDIR%%/html/includes/graphs/netscalersvc/auth.inc.php
@@ -1800,6 +2050,12 @@
 %%WWWDIR%%/html/includes/graphs/netscalersvc/pkts.inc.php
 %%WWWDIR%%/html/includes/graphs/netscalersvc/reqs.inc.php
 %%WWWDIR%%/html/includes/graphs/netscalersvc/ttfb.inc.php
+%%WWWDIR%%/html/includes/graphs/netscalersvcgrpmem/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/netscalersvcgrpmem/bits.inc.php
+%%WWWDIR%%/html/includes/graphs/netscalersvcgrpmem/conns.inc.php
+%%WWWDIR%%/html/includes/graphs/netscalersvcgrpmem/pkts.inc.php
+%%WWWDIR%%/html/includes/graphs/netscalersvcgrpmem/reqs.inc.php
+%%WWWDIR%%/html/includes/graphs/netscalersvcgrpmem/ttfb.inc.php
 %%WWWDIR%%/html/includes/graphs/netscalervsvr/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/netscalervsvr/bits.inc.php
 %%WWWDIR%%/html/includes/graphs/netscalervsvr/conns.inc.php
@@ -1807,6 +2063,21 @@
 %%WWWDIR%%/html/includes/graphs/netscalervsvr/pkts.inc.php
 %%WWWDIR%%/html/includes/graphs/netscalervsvr/reqs.inc.php
 %%WWWDIR%%/html/includes/graphs/old_generic_simplex.inc.php
+%%WWWDIR%%/html/includes/graphs/p2pradio/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/p2pradio/capacity.inc.php
+%%WWWDIR%%/html/includes/graphs/p2pradio/gain.inc.php
+%%WWWDIR%%/html/includes/graphs/p2pradio/power.inc.php
+%%WWWDIR%%/html/includes/graphs/p2pradio/rmse.inc.php
+%%WWWDIR%%/html/includes/graphs/p2pradio/rxlevel.inc.php
+%%WWWDIR%%/html/includes/graphs/p2pradio/symbol_rates.inc.php
+%%WWWDIR%%/html/includes/graphs/ping/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/ping/smokeping_all_common.inc.php
+%%WWWDIR%%/html/includes/graphs/ping/smokeping_all_common_det.inc.php
+%%WWWDIR%%/html/includes/graphs/ping/smokeping_common.inc.php
+%%WWWDIR%%/html/includes/graphs/ping/smokeping_in_all.inc.php
+%%WWWDIR%%/html/includes/graphs/ping/smokeping_in_all_det.inc.php
+%%WWWDIR%%/html/includes/graphs/ping/smokeping_out_all.inc.php
+%%WWWDIR%%/html/includes/graphs/ping/smokeping_out_all_det.inc.php
 %%WWWDIR%%/html/includes/graphs/poller/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/port/adsl_attainable.inc.php
 %%WWWDIR%%/html/includes/graphs/port/adsl_attenuation.inc.php
@@ -1826,6 +2097,9 @@
 %%WWWDIR%%/html/includes/graphs/port/upkts.inc.php
 %%WWWDIR%%/html/includes/graphs/processor/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/processor/usage.inc.php
+%%WWWDIR%%/html/includes/graphs/pseudowire/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/pseudowire/bits.inc.php
+%%WWWDIR%%/html/includes/graphs/pseudowire/pkts.inc.php
 %%WWWDIR%%/html/includes/graphs/rserver/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/rserver/curr.inc.php
 %%WWWDIR%%/html/includes/graphs/rserver/failed.inc.php
@@ -1833,21 +2107,29 @@
 %%WWWDIR%%/html/includes/graphs/sensor/airflow.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/apower.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/sensor/counter.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/current.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/dbm.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/fanspeed.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/frequency.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/graph.inc.php
+%%WWWDIR%%/html/includes/graphs/sensor/impedence.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/percent.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/power.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/pressure.inc.php
+%%WWWDIR%%/html/includes/graphs/sensor/resistance.inc.php
+%%WWWDIR%%/html/includes/graphs/sensor/rpower.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/runtime.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/snr.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/state.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/temperature.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/voltage.inc.php
+%%WWWDIR%%/html/includes/graphs/sensor/waterflow.inc.php
 %%WWWDIR%%/html/includes/graphs/service/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/service/availability.inc.php
+%%WWWDIR%%/html/includes/graphs/sla/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/sla/graph.inc.php
+%%WWWDIR%%/html/includes/graphs/sla/jitter.inc.php
 %%WWWDIR%%/html/includes/graphs/smokeping/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/smokeping/in.inc.php
 %%WWWDIR%%/html/includes/graphs/smokeping/out.inc.php
@@ -1874,10 +2156,10 @@
 %%WWWDIR%%/html/includes/graphs/wifiradio/clients.inc.php
 %%WWWDIR%%/html/includes/graphs/wifiradio/frames.inc.php
 %%WWWDIR%%/html/includes/graphs/wifiradio/rxerrors.inc.php
-%%WWWDIR%%/html/includes/javascript-interfacepicker.inc.php
 %%WWWDIR%%/html/includes/map/google-mc.inc.php
 %%WWWDIR%%/html/includes/map/google.inc.php
 %%WWWDIR%%/html/includes/navbar.inc.php
+%%WWWDIR%%/html/includes/panels/default.inc.php
 %%WWWDIR%%/html/includes/port-edit.inc.php
 %%WWWDIR%%/html/includes/port-sort-select.inc.php
 %%WWWDIR%%/html/includes/port-sort.inc.php
@@ -1886,29 +2168,34 @@
 %%WWWDIR%%/html/includes/print-device-graph.php
 %%WWWDIR%%/html/includes/print-interface-adsl.inc.php
 %%WWWDIR%%/html/includes/print-interface-graphs.inc.php
-%%WWWDIR%%/html/includes/print-interface.inc.php
 %%WWWDIR%%/html/includes/print-service.inc.php
 %%WWWDIR%%/html/includes/print-vlan.inc.php
-%%WWWDIR%%/html/includes/print-vm.inc.php
 %%WWWDIR%%/html/includes/print-vrf.inc.php
 %%WWWDIR%%/html/includes/print/.htaccess
 %%WWWDIR%%/html/includes/print/addresses.inc.php
+%%WWWDIR%%/html/includes/print/alert.inc.php
+%%WWWDIR%%/html/includes/print/alert_log.inc.php
 %%WWWDIR%%/html/includes/print/arptable.inc.php
 %%WWWDIR%%/html/includes/print/authlog.inc.php
 %%WWWDIR%%/html/includes/print/common.inc.php
-%%WWWDIR%%/html/includes/print/device.inc.php
 %%WWWDIR%%/html/includes/print/dot1xtable.inc.php
 %%WWWDIR%%/html/includes/print/events.inc.php
 %%WWWDIR%%/html/includes/print/fdbtable.inc.php
 %%WWWDIR%%/html/includes/print/inventory.inc.php
 %%WWWDIR%%/html/includes/print/mac_addresses.inc.php
 %%WWWDIR%%/html/includes/print/navbar.inc.php
-%%WWWDIR%%/html/includes/print/pseudowires.inc.php
+%%WWWDIR%%/html/includes/print/neighbours.inc.php
 %%WWWDIR%%/html/includes/print/routing.inc.php
 %%WWWDIR%%/html/includes/print/rows.inc.php

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602031626.u13GQadP006659>