From owner-svn-ports-head@freebsd.org  Sun Dec 17 15:13:38 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2DA7BE8C345;
 Sun, 17 Dec 2017 15:13:38 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AC4D4733B8;
 Sun, 17 Dec 2017 15:13:37 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBHFDakY049323;
 Sun, 17 Dec 2017 15:13:36 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBHFDaXF049317;
 Sun, 17 Dec 2017 15:13:36 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201712171513.vBHFDaXF049317@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Sun, 17 Dec 2017 15:13:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r456535 - in head/net-mgmt/observium: . files
X-SVN-Group: ports-head
X-SVN-Commit-Author: feld
X-SVN-Commit-Paths: in head/net-mgmt/observium: . files
X-SVN-Commit-Revision: 456535
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Dec 2017 15:13:38 -0000

Author: feld
Date: Sun Dec 17 15:13:36 2017
New Revision: 456535
URL: https://svnweb.freebsd.org/changeset/ports/456535

Log:
  net-mgmt/observium: Update to 0.17.9.8859
  
  - Fixes fetching as upstream always replaces/re-rolls distfile
  - Now reportedly works with PHP 7.1
  
  PR:		224223
  MFH:		2017Q4

Deleted:
  head/net-mgmt/observium/files/patch-poller.php
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/patch-poller-wrapper.py
  head/net-mgmt/observium/pkg-plist

Modified: head/net-mgmt/observium/Makefile
==============================================================================
--- head/net-mgmt/observium/Makefile	Sun Dec 17 14:58:28 2017	(r456534)
+++ head/net-mgmt/observium/Makefile	Sun Dec 17 15:13:36 2017	(r456535)
@@ -1,9 +1,10 @@
 # Created by: rflynn@acsalaska.net
 # $FreeBSD$
+# Observium version can be found by looking at ${WRKSRC}/includes/definitions/version.inc.php
 
 PORTNAME=	observium
-PORTVERSION=	0.16.10.8128
-PORTREVISION=	5
+PORTVERSION=	0.17.9.8859
+PORTREVISION=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.observium.org/
 DISTNAME=	${PORTNAME}-community-latest
@@ -23,48 +24,12 @@ USES=		php:cli python shebangfix
 SHEBANG_FILES=	\
 		mibs/process.pl \
 		poller-wrapper.py \
-		scripts/add_ds_to_rrd.pl \
-		scripts/add_ds.pl \
-		scripts/agent-local/areca-hw \
-		scripts/agent-local/asterisk \
-		scripts/agent-local/bind \
-		scripts/agent-local/crashplan \
-		scripts/agent-local/edac \
-		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/lvs_stats \
-		scripts/agent-local/memcached \
-		scripts/agent-local/nginx \
-		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/get-geshi.sh \
-		scripts/get-jpgraph.sh \
-		scripts/glue.py \
-		scripts/ifAlias \
-		scripts/ifAlias_persist \
-		scripts/logparser \
-		scripts/makecss.sh \
-		scripts/observium_agent \
-		scripts/removespikes.php \
-		scripts/removespikes.pl \
-		scripts/rename-mibs.pl \
-		scripts/rrdtoolx.py
+		poller.php \
+		scripts/
 
 USE_PHP=	ctype filter gd iconv json mcrypt mysqli openssl posix session snmp tokenizer xml zlib
-IGNORE_WITH_PHP=	71
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 
 RUN_DEPENDS+=	rrdtool:databases/rrdtool \

Modified: head/net-mgmt/observium/distinfo
==============================================================================
--- head/net-mgmt/observium/distinfo	Sun Dec 17 14:58:28 2017	(r456534)
+++ head/net-mgmt/observium/distinfo	Sun Dec 17 15:13:36 2017	(r456535)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477762625
-SHA256 (observium-0.16.10.8128/observium-community-latest.tar.gz) = 1f974c4c0d7329465ecdc4b30396710957121ecccd812d8c5250b492dd447877
-SIZE (observium-0.16.10.8128/observium-community-latest.tar.gz) = 61246341
+TIMESTAMP = 1513523116
+SHA256 (observium-0.17.9.8859/observium-community-latest.tar.gz) = dcf2f72b1a1389d523f44bba31bccf72598bb5014c2850f8f3f70a30f0cc05ac
+SIZE (observium-0.17.9.8859/observium-community-latest.tar.gz) = 71030546

Modified: head/net-mgmt/observium/files/patch-includes_defaults.inc.php
==============================================================================
--- head/net-mgmt/observium/files/patch-includes_defaults.inc.php	Sun Dec 17 14:58:28 2017	(r456534)
+++ head/net-mgmt/observium/files/patch-includes_defaults.inc.php	Sun Dec 17 15:13:36 2017	(r456535)
@@ -1,4 +1,4 @@
---- includes/defaults.inc.php.orig	2016-01-27 16:07:55 UTC
+--- includes/defaults.inc.php.orig	2017-09-07 22:26:04 UTC
 +++ includes/defaults.inc.php
 @@ -36,7 +36,7 @@ $config['db']['debug']      = TRUE;     
  
@@ -9,7 +9,7 @@
  #$config['html_dir']      = $config['install_dir'] . "/html";
  #$config['rrd_dir']       = $config['install_dir'] . "/rrd";
  #$config['template_dir']  = $config['install_dir'] . "/templates";
-@@ -49,27 +49,27 @@ $config['db']['debug']      = TRUE;     
+@@ -50,29 +50,29 @@ $config['db']['debug']      = TRUE;     
  
  // Location of executables
  
@@ -32,7 +32,6 @@
  $config['whois']          = "/usr/bin/whois";
 -$config['mtr']            = "/usr/bin/mtr";
 -$config['nmap']           = "/usr/bin/nmap";
--$config['nagios_plugins'] = "/usr/lib/nagios/plugins";
 -$config['ipmitool']       = "/usr/bin/ipmitool";
 -$config['virsh']          = "/usr/bin/virsh";
 -$config['dot']            = "/usr/bin/dot";
@@ -44,7 +43,6 @@
 -$config['wmic']           = "/bin/wmic";
 +$config['mtr']            = "/usr/local/sbin/mtr";
 +$config['nmap']           = "/usr/local/bin/nmap";
-+$config['nagios_plugins'] = "/usr/local/libexec/nagios";
 +$config['ipmitool']       = "/usr/local/bin/ipmitool";
 +$config['virsh']          = "/usr/local/bin/virsh";
 +$config['dot']            = "/usr/local/bin/dot";
@@ -55,5 +53,9 @@
 +$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";
- 
- // RRD Format Settings
+ $config['wc']             = "/usr/bin/wc";
+-$config['sudo']           = "/usr/bin/sudo";
++$config['sudo']           = "/usr/local/bin/sudo";
+ $config['tail']           = "/usr/bin/tail";
+ $config['cut']            = "/usr/bin/cut";
+ $config['tr']             = "/usr/bin/tr";

Modified: head/net-mgmt/observium/files/patch-poller-wrapper.py
==============================================================================
--- head/net-mgmt/observium/files/patch-poller-wrapper.py	Sun Dec 17 14:58:28 2017	(r456534)
+++ head/net-mgmt/observium/files/patch-poller-wrapper.py	Sun Dec 17 15:13:36 2017	(r456535)
@@ -1,18 +1,11 @@
---- poller-wrapper.py.orig	2016-12-05 00:19:29 UTC
+--- poller-wrapper.py.orig	2017-12-02 14:04:45 UTC
 +++ poller-wrapper.py
-@@ -45,6 +45,8 @@ except:
-     print("threading, sys, subprocess, time, os, json")
+@@ -72,6 +72,8 @@ except:
+     print("threading, sys, subprocess, os, json")
      sys.exit(2)
  
 +os.environ['PATH'] += ':%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin'
 +
- # start time
- s_time = time.time()
- 
-@@ -608,4 +610,4 @@ db.close()
- # Return exit code
- sys.exit(exit_code)
- 
--# EOF
-\ No newline at end of file
-+# EOF
+ """
+     Register global exepthook for ability stop execute wrapper by Ctrl+C
+     See: https://stackoverflow.com/questions/6598053/python-global-exception-handling

Modified: head/net-mgmt/observium/pkg-plist
==============================================================================
--- head/net-mgmt/observium/pkg-plist	Sun Dec 17 14:58:28 2017	(r456534)
+++ head/net-mgmt/observium/pkg-plist	Sun Dec 17 15:13:36 2017	(r456535)
@@ -13,6 +13,8 @@
 %%WWWDIR%%/html/ajax/input.php
 %%WWWDIR%%/html/ajax/search.php
 %%WWWDIR%%/html/bandwidth-graph.php
+%%WWWDIR%%/html/billing-bandwidth-data.php
+%%WWWDIR%%/html/billing-data.php
 %%WWWDIR%%/html/css/bootstrap-hacks.css
 %%WWWDIR%%/html/css/bootstrap-select.css
 %%WWWDIR%%/html/css/bootstrap-switch.css
@@ -39,9 +41,19 @@
 %%WWWDIR%%/html/css/jquery.qtip.min.css
 %%WWWDIR%%/html/css/leaflet.css
 %%WWWDIR%%/html/css/mktree.css
+%%WWWDIR%%/html/css/observium.css
 %%WWWDIR%%/html/css/ref.css
 %%WWWDIR%%/html/css/sprite.css
+%%WWWDIR%%/html/css/sprites-loader-fragment.html
+%%WWWDIR%%/html/css/sprites-png-data.css
+%%WWWDIR%%/html/css/sprites-png-sprite.css
+%%WWWDIR%%/html/css/sprites-svg-data.css
+%%WWWDIR%%/html/css/sprites-svg-sprite.css
 %%WWWDIR%%/html/css/styles-wide.css
+%%WWWDIR%%/html/css/svg/svg.png
+%%WWWDIR%%/html/css/svg/svg.svg
+%%WWWDIR%%/html/css/svg_png.css
+%%WWWDIR%%/html/css/tinytoggle.min.css
 %%WWWDIR%%/html/css/typeaheadjs.css
 %%WWWDIR%%/html/data.php
 %%WWWDIR%%/html/feed.php
@@ -64,10 +76,13 @@
 %%WWWDIR%%/html/fonts/glyphicons-halflings-regular.ttf
 %%WWWDIR%%/html/fonts/glyphicons-halflings-regular.woff
 %%WWWDIR%%/html/fonts/glyphicons-halflings-regular.woff2
+%%WWWDIR%%/html/fonts/tinytoggle.eot
+%%WWWDIR%%/html/fonts/tinytoggle.svg
+%%WWWDIR%%/html/fonts/tinytoggle.ttf
+%%WWWDIR%%/html/fonts/tinytoggle.woff
 %%WWWDIR%%/html/geo.php
 %%WWWDIR%%/html/graph-realtime.php
 %%WWWDIR%%/html/graph.php
-%%WWWDIR%%/html/icons.php
 %%WWWDIR%%/html/images/16/Thumbs.db
 %%WWWDIR%%/html/images/16/accept.png
 %%WWWDIR%%/html/images/16/add.png
@@ -1231,6 +1246,8 @@
 %%WWWDIR%%/html/images/icons/voltage.png
 %%WWWDIR%%/html/images/icons/wifi.png
 %%WWWDIR%%/html/images/icons/wireless.png
+%%WWWDIR%%/html/images/layers-2x.png
+%%WWWDIR%%/html/images/layers.png
 %%WWWDIR%%/html/images/lightbg.png
 %%WWWDIR%%/html/images/lightbg2.png
 %%WWWDIR%%/html/images/loading.gif
@@ -1242,21 +1259,32 @@
 %%WWWDIR%%/html/images/mapclusterer/1.png
 %%WWWDIR%%/html/images/mapclusterer/2.png
 %%WWWDIR%%/html/images/mapclusterer/3.png
+%%WWWDIR%%/html/images/marker-icon-2x.png
+%%WWWDIR%%/html/images/marker-icon.png
+%%WWWDIR%%/html/images/marker-shadow.png
 %%WWWDIR%%/html/images/minus.gif
 %%WWWDIR%%/html/images/no-graph.png
 %%WWWDIR%%/html/images/observium-icon.png
 %%WWWDIR%%/html/images/observium-logo.png
 %%WWWDIR%%/html/images/observium-mini-logo.png
 %%WWWDIR%%/html/images/os/3com.png
+%%WWWDIR%%/html/images/os/3com_2x.png
 %%WWWDIR%%/html/images/os/a10.png
+%%WWWDIR%%/html/images/os/a10_2x.png
 %%WWWDIR%%/html/images/os/accedian.png
 %%WWWDIR%%/html/images/os/accedian_2x.png
-%%WWWDIR%%/html/images/os/acme.png
+%%WWWDIR%%/html/images/os/accuenergy.png
+%%WWWDIR%%/html/images/os/accuenergy_2x.png
+%%WWWDIR%%/html/images/os/acmepacket.png
+%%WWWDIR%%/html/images/os/acmepacket_2x.png
 %%WWWDIR%%/html/images/os/actelis.png
+%%WWWDIR%%/html/images/os/actelis_2x.png
 %%WWWDIR%%/html/images/os/adtran.png
 %%WWWDIR%%/html/images/os/adtran_2x.png
 %%WWWDIR%%/html/images/os/adva.png
+%%WWWDIR%%/html/images/os/adva_2x.png
 %%WWWDIR%%/html/images/os/aerohive.png
+%%WWWDIR%%/html/images/os/aerohive_2x.png
 %%WWWDIR%%/html/images/os/aethra.png
 %%WWWDIR%%/html/images/os/aethra_2x.png
 %%WWWDIR%%/html/images/os/airconsole.png
@@ -1264,12 +1292,17 @@
 %%WWWDIR%%/html/images/os/aix.png
 %%WWWDIR%%/html/images/os/aix_2x.png
 %%WWWDIR%%/html/images/os/akcp.png
+%%WWWDIR%%/html/images/os/akcp_2x.png
 %%WWWDIR%%/html/images/os/alcatellucent.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/alpha.png
+%%WWWDIR%%/html/images/os/alpha_2x.png
 %%WWWDIR%%/html/images/os/alvarion.png
 %%WWWDIR%%/html/images/os/alvarion_2x.png
+%%WWWDIR%%/html/images/os/angstrem.png
+%%WWWDIR%%/html/images/os/angstrem_2x.png
 %%WWWDIR%%/html/images/os/apc.png
 %%WWWDIR%%/html/images/os/apc_2x.png
 %%WWWDIR%%/html/images/os/apple.png
@@ -1279,13 +1312,19 @@
 %%WWWDIR%%/html/images/os/archlinux.png
 %%WWWDIR%%/html/images/os/archlinux_2x.png
 %%WWWDIR%%/html/images/os/areca.png
+%%WWWDIR%%/html/images/os/areca_2x.png
 %%WWWDIR%%/html/images/os/arista.png
 %%WWWDIR%%/html/images/os/arista_2x.png
+%%WWWDIR%%/html/images/os/array.png
+%%WWWDIR%%/html/images/os/array_2x.png
 %%WWWDIR%%/html/images/os/arris.png
+%%WWWDIR%%/html/images/os/arris_2x.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/atmedia.png
+%%WWWDIR%%/html/images/os/atmedia_2x.png
 %%WWWDIR%%/html/images/os/atto.png
 %%WWWDIR%%/html/images/os/atto_2x.png
 %%WWWDIR%%/html/images/os/audiocodes.png
@@ -1293,10 +1332,13 @@
 %%WWWDIR%%/html/images/os/avaya.png
 %%WWWDIR%%/html/images/os/avaya_2x.png
 %%WWWDIR%%/html/images/os/avocent.png
+%%WWWDIR%%/html/images/os/avocent_2x.png
 %%WWWDIR%%/html/images/os/avtech.png
+%%WWWDIR%%/html/images/os/avtech_2x.png
 %%WWWDIR%%/html/images/os/axis.png
 %%WWWDIR%%/html/images/os/axis_2x.png
 %%WWWDIR%%/html/images/os/barracuda.png
+%%WWWDIR%%/html/images/os/barracuda_2x.png
 %%WWWDIR%%/html/images/os/baytech.png
 %%WWWDIR%%/html/images/os/baytech_2x.png
 %%WWWDIR%%/html/images/os/bdcom.png
@@ -1311,8 +1353,8 @@
 %%WWWDIR%%/html/images/os/bluecat_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/bridgewave_2x.png
 %%WWWDIR%%/html/images/os/broadcom.png
 %%WWWDIR%%/html/images/os/broadcom_2x.png
 %%WWWDIR%%/html/images/os/brocade.png
@@ -1320,6 +1362,7 @@
 %%WWWDIR%%/html/images/os/brother.png
 %%WWWDIR%%/html/images/os/brother_2x.png
 %%WWWDIR%%/html/images/os/bti.png
+%%WWWDIR%%/html/images/os/bti_2x.png
 %%WWWDIR%%/html/images/os/buffalo.png
 %%WWWDIR%%/html/images/os/buffalo_2x.png
 %%WWWDIR%%/html/images/os/calix.png
@@ -1332,6 +1375,8 @@
 %%WWWDIR%%/html/images/os/casa.png
 %%WWWDIR%%/html/images/os/casa_2x.png
 %%WWWDIR%%/html/images/os/ccpower.png
+%%WWWDIR%%/html/images/os/cdata.png
+%%WWWDIR%%/html/images/os/cdata_2x.png
 %%WWWDIR%%/html/images/os/centos.png
 %%WWWDIR%%/html/images/os/centos_2x.png
 %%WWWDIR%%/html/images/os/ceragon.png
@@ -1366,38 +1411,55 @@
 %%WWWDIR%%/html/images/os/darwin.png
 %%WWWDIR%%/html/images/os/darwin_2x.png
 %%WWWDIR%%/html/images/os/dasan.png
+%%WWWDIR%%/html/images/os/dasan_2x.png
 %%WWWDIR%%/html/images/os/datadomain.png
 %%WWWDIR%%/html/images/os/datadomain_2x.png
+%%WWWDIR%%/html/images/os/dcn.png
+%%WWWDIR%%/html/images/os/dcn_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/ddwrt_2x.png
 %%WWWDIR%%/html/images/os/debian.png
 %%WWWDIR%%/html/images/os/debian_2x.png
+%%WWWDIR%%/html/images/os/deliberant.png
+%%WWWDIR%%/html/images/os/deliberant_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/develop.png
 %%WWWDIR%%/html/images/os/develop_2x.png
 %%WWWDIR%%/html/images/os/digi.png
+%%WWWDIR%%/html/images/os/digipower.png
+%%WWWDIR%%/html/images/os/digipower_2x.png
+%%WWWDIR%%/html/images/os/dps.png
+%%WWWDIR%%/html/images/os/dps_2x.png
 %%WWWDIR%%/html/images/os/dragonfly.png
 %%WWWDIR%%/html/images/os/dragonfly_2x.png
 %%WWWDIR%%/html/images/os/draytek.png
 %%WWWDIR%%/html/images/os/draytek_2x.png
 %%WWWDIR%%/html/images/os/eaton.png
 %%WWWDIR%%/html/images/os/eaton_2x.png
+%%WWWDIR%%/html/images/os/ecos.png
+%%WWWDIR%%/html/images/os/ecos_2x.png
 %%WWWDIR%%/html/images/os/edgecore.png
 %%WWWDIR%%/html/images/os/edgecore_2x.png
 %%WWWDIR%%/html/images/os/efi.png
 %%WWWDIR%%/html/images/os/efi_2x.png
+%%WWWDIR%%/html/images/os/ekinops.png
+%%WWWDIR%%/html/images/os/ekinops_2x.png
 %%WWWDIR%%/html/images/os/eltek.png
 %%WWWDIR%%/html/images/os/eltek_2x.png
 %%WWWDIR%%/html/images/os/eltex.png
 %%WWWDIR%%/html/images/os/eltex_2x.png
+%%WWWDIR%%/html/images/os/emc.png
+%%WWWDIR%%/html/images/os/emc_2x.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/enlogic.png
+%%WWWDIR%%/html/images/os/enlogic_2x.png
 %%WWWDIR%%/html/images/os/enterasys.png
 %%WWWDIR%%/html/images/os/epson.png
 %%WWWDIR%%/html/images/os/epson_2x.png
@@ -1405,6 +1467,8 @@
 %%WWWDIR%%/html/images/os/ericsson_2x.png
 %%WWWDIR%%/html/images/os/exalt.png
 %%WWWDIR%%/html/images/os/exalt_2x.png
+%%WWWDIR%%/html/images/os/exinda.png
+%%WWWDIR%%/html/images/os/exinda_2x.png
 %%WWWDIR%%/html/images/os/extreme.png
 %%WWWDIR%%/html/images/os/extreme_2x.png
 %%WWWDIR%%/html/images/os/f5.png
@@ -1426,6 +1490,7 @@
 %%WWWDIR%%/html/images/os/freenas.png
 %%WWWDIR%%/html/images/os/freenas_2x.png
 %%WWWDIR%%/html/images/os/gamatronicups.png
+%%WWWDIR%%/html/images/os/gamatronicups_2x.png
 %%WWWDIR%%/html/images/os/gcom.png
 %%WWWDIR%%/html/images/os/ge.png
 %%WWWDIR%%/html/images/os/ge_2x.png
@@ -1443,8 +1508,12 @@
 %%WWWDIR%%/html/images/os/h3c_2x.png
 %%WWWDIR%%/html/images/os/hikvision.png
 %%WWWDIR%%/html/images/os/hikvision_2x.png
+%%WWWDIR%%/html/images/os/hirschmann.png
+%%WWWDIR%%/html/images/os/hirschmann_2x.png
 %%WWWDIR%%/html/images/os/hp.png
 %%WWWDIR%%/html/images/os/hp_2x.png
+%%WWWDIR%%/html/images/os/hpe.png
+%%WWWDIR%%/html/images/os/hpe_2x.png
 %%WWWDIR%%/html/images/os/huawei.png
 %%WWWDIR%%/html/images/os/huawei_2x.png
 %%WWWDIR%%/html/images/os/hwg-ste.png
@@ -1454,12 +1523,18 @@
 %%WWWDIR%%/html/images/os/ibm.png
 %%WWWDIR%%/html/images/os/ibm_2x.png
 %%WWWDIR%%/html/images/os/ibmi.png
+%%WWWDIR%%/html/images/os/ict.png
+%%WWWDIR%%/html/images/os/ict_2x.png
+%%WWWDIR%%/html/images/os/ignitenet.png
+%%WWWDIR%%/html/images/os/ignitenet_2x.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/irz.png
+%%WWWDIR%%/html/images/os/irz_2x.png
 %%WWWDIR%%/html/images/os/isilon.png
 %%WWWDIR%%/html/images/os/isilon_2x.png
 %%WWWDIR%%/html/images/os/iskratel.png
@@ -1473,6 +1548,10 @@
 %%WWWDIR%%/html/images/os/juniper-old_2x.png
 %%WWWDIR%%/html/images/os/juniper.png
 %%WWWDIR%%/html/images/os/juniper_2x.png
+%%WWWDIR%%/html/images/os/kemp.png
+%%WWWDIR%%/html/images/os/kemp_2x.png
+%%WWWDIR%%/html/images/os/knuerr.png
+%%WWWDIR%%/html/images/os/knuerr_2x.png
 %%WWWDIR%%/html/images/os/konica.png
 %%WWWDIR%%/html/images/os/konica_2x.png
 %%WWWDIR%%/html/images/os/korenix.png
@@ -1486,6 +1565,8 @@
 %%WWWDIR%%/html/images/os/lexmark_2x.png
 %%WWWDIR%%/html/images/os/lg.png
 %%WWWDIR%%/html/images/os/lg_2x.png
+%%WWWDIR%%/html/images/os/ligowave.png
+%%WWWDIR%%/html/images/os/ligowave_2x.png
 %%WWWDIR%%/html/images/os/linksys.png
 %%WWWDIR%%/html/images/os/linksys_2x.png
 %%WWWDIR%%/html/images/os/linux.png
@@ -1502,10 +1583,18 @@
 %%WWWDIR%%/html/images/os/mandriva_2x.png
 %%WWWDIR%%/html/images/os/mcafee.png
 %%WWWDIR%%/html/images/os/mcafee_2x.png
+%%WWWDIR%%/html/images/os/megatec.png
+%%WWWDIR%%/html/images/os/megatec_2x.png
+%%WWWDIR%%/html/images/os/meinberg.png
+%%WWWDIR%%/html/images/os/meinberg_2x.png
 %%WWWDIR%%/html/images/os/mellanox.png
+%%WWWDIR%%/html/images/os/mellanox_2x.png
 %%WWWDIR%%/html/images/os/meraki.png
 %%WWWDIR%%/html/images/os/meraki_2x.png
+%%WWWDIR%%/html/images/os/messpc.png
+%%WWWDIR%%/html/images/os/messpc_2x.png
 %%WWWDIR%%/html/images/os/mge.png
+%%WWWDIR%%/html/images/os/mge_2x.png
 %%WWWDIR%%/html/images/os/microsens.png
 %%WWWDIR%%/html/images/os/mikrotik.png
 %%WWWDIR%%/html/images/os/mikrotik_2x.png
@@ -1514,6 +1603,8 @@
 %%WWWDIR%%/html/images/os/minkelsrms.png
 %%WWWDIR%%/html/images/os/mitel.png
 %%WWWDIR%%/html/images/os/mitel_2x.png
+%%WWWDIR%%/html/images/os/mitsubishi.png
+%%WWWDIR%%/html/images/os/mitsubishi_2x.png
 %%WWWDIR%%/html/images/os/monowall.png
 %%WWWDIR%%/html/images/os/monowall_2x.png
 %%WWWDIR%%/html/images/os/motorola.png
@@ -1544,6 +1635,7 @@
 %%WWWDIR%%/html/images/os/nimble.png
 %%WWWDIR%%/html/images/os/nimble_2x.png
 %%WWWDIR%%/html/images/os/nortel.png
+%%WWWDIR%%/html/images/os/nortel_2x.png
 %%WWWDIR%%/html/images/os/novell.png
 %%WWWDIR%%/html/images/os/novell_2x.png
 %%WWWDIR%%/html/images/os/nrg.png
@@ -1554,6 +1646,8 @@
 %%WWWDIR%%/html/images/os/oki_2x.png
 %%WWWDIR%%/html/images/os/olivetti.png
 %%WWWDIR%%/html/images/os/olivetti_2x.png
+%%WWWDIR%%/html/images/os/omnitron.png
+%%WWWDIR%%/html/images/os/omnitron_2x.png
 %%WWWDIR%%/html/images/os/oneaccess.png
 %%WWWDIR%%/html/images/os/oneaccess_2x.png
 %%WWWDIR%%/html/images/os/open-e.png
@@ -1568,9 +1662,16 @@
 %%WWWDIR%%/html/images/os/opensolaris_2x.png
 %%WWWDIR%%/html/images/os/openwrt.png
 %%WWWDIR%%/html/images/os/openwrt_2x.png
+%%WWWDIR%%/html/images/os/opnsense.png
+%%WWWDIR%%/html/images/os/opnsense_2x.png
+%%WWWDIR%%/html/images/os/oracle.png
+%%WWWDIR%%/html/images/os/oracle_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/paloalto_2x.png
+%%WWWDIR%%/html/images/os/panasas.png
+%%WWWDIR%%/html/images/os/panasas_2x.png
 %%WWWDIR%%/html/images/os/panasonic.png
 %%WWWDIR%%/html/images/os/panasonic_2x.png
 %%WWWDIR%%/html/images/os/papouch.png
@@ -1578,6 +1679,10 @@
 %%WWWDIR%%/html/images/os/patton_2x.png
 %%WWWDIR%%/html/images/os/pc-bsd.png
 %%WWWDIR%%/html/images/os/pc-bsd_2x.png
+%%WWWDIR%%/html/images/os/peplink.png
+%%WWWDIR%%/html/images/os/peplink_2x.png
+%%WWWDIR%%/html/images/os/perle.png
+%%WWWDIR%%/html/images/os/perle_2x.png
 %%WWWDIR%%/html/images/os/pfsense.png
 %%WWWDIR%%/html/images/os/pfsense_2x.png
 %%WWWDIR%%/html/images/os/pica8.png
@@ -1591,11 +1696,14 @@
 %%WWWDIR%%/html/images/os/procera.png
 %%WWWDIR%%/html/images/os/proxim.png
 %%WWWDIR%%/html/images/os/proxyav.png
+%%WWWDIR%%/html/images/os/pulse_secure.png
+%%WWWDIR%%/html/images/os/pulse_secure_2x.png
 %%WWWDIR%%/html/images/os/qnap.png
 %%WWWDIR%%/html/images/os/quanta.png
 %%WWWDIR%%/html/images/os/quanta_2x.png
 %%WWWDIR%%/html/images/os/racktivity.png
 %%WWWDIR%%/html/images/os/radlan.png
+%%WWWDIR%%/html/images/os/radlan_2x.png
 %%WWWDIR%%/html/images/os/radware.png
 %%WWWDIR%%/html/images/os/radware_2x.png
 %%WWWDIR%%/html/images/os/raisecom.png
@@ -1621,18 +1729,25 @@
 %%WWWDIR%%/html/images/os/samsung.png
 %%WWWDIR%%/html/images/os/samsung_2x.png
 %%WWWDIR%%/html/images/os/screenos.png
+%%WWWDIR%%/html/images/os/serverscheck.png
+%%WWWDIR%%/html/images/os/serverscheck_2x.png
 %%WWWDIR%%/html/images/os/servertech.png
 %%WWWDIR%%/html/images/os/servertech_2x.png
 %%WWWDIR%%/html/images/os/sharp.png
+%%WWWDIR%%/html/images/os/sharp_2x.png
 %%WWWDIR%%/html/images/os/shoretel.png
 %%WWWDIR%%/html/images/os/shoretel_2x.png
 %%WWWDIR%%/html/images/os/shoretelos.png
+%%WWWDIR%%/html/images/os/siklu.png
+%%WWWDIR%%/html/images/os/siklu_2x.png
 %%WWWDIR%%/html/images/os/sindoh.png
 %%WWWDIR%%/html/images/os/sindoh_2x.png
 %%WWWDIR%%/html/images/os/slackware.png
 %%WWWDIR%%/html/images/os/slackware_2x.png
 %%WWWDIR%%/html/images/os/smartoptics.png
 %%WWWDIR%%/html/images/os/snom.png
+%%WWWDIR%%/html/images/os/snr.png
+%%WWWDIR%%/html/images/os/snr_2x.png
 %%WWWDIR%%/html/images/os/solaris.png
 %%WWWDIR%%/html/images/os/solaris_2x.png
 %%WWWDIR%%/html/images/os/sonicwall.png
@@ -1641,6 +1756,8 @@
 %%WWWDIR%%/html/images/os/sophos_2x.png
 %%WWWDIR%%/html/images/os/speedtouch.png
 %%WWWDIR%%/html/images/os/speedtouch_2x.png
+%%WWWDIR%%/html/images/os/summitd.png
+%%WWWDIR%%/html/images/os/summitd_2x.png
 %%WWWDIR%%/html/images/os/sun_oracle.png
 %%WWWDIR%%/html/images/os/sun_oracle_2x.png
 %%WWWDIR%%/html/images/os/supermicro.png
@@ -1649,6 +1766,9 @@
 %%WWWDIR%%/html/images/os/suse_2x.png
 %%WWWDIR%%/html/images/os/symbol.png
 %%WWWDIR%%/html/images/os/synology.png
+%%WWWDIR%%/html/images/os/synology_2x.png
+%%WWWDIR%%/html/images/os/teltonika.png
+%%WWWDIR%%/html/images/os/teltonika_2x.png
 %%WWWDIR%%/html/images/os/teracom.png
 %%WWWDIR%%/html/images/os/teradici.png
 %%WWWDIR%%/html/images/os/toshiba.png
@@ -1657,17 +1777,27 @@
 %%WWWDIR%%/html/images/os/tp-link_2x.png
 %%WWWDIR%%/html/images/os/trango.png
 %%WWWDIR%%/html/images/os/tranzeo.png
+%%WWWDIR%%/html/images/os/trendmicro.png
+%%WWWDIR%%/html/images/os/trendmicro_2x.png
 %%WWWDIR%%/html/images/os/tripplite.png
 %%WWWDIR%%/html/images/os/tripplite_2x.png
+%%WWWDIR%%/html/images/os/truen.png
+%%WWWDIR%%/html/images/os/truen_2x.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/vertiv.png
+%%WWWDIR%%/html/images/os/vertiv_2x.png
+%%WWWDIR%%/html/images/os/vivotek.png
+%%WWWDIR%%/html/images/os/vivotek_2x.png
 %%WWWDIR%%/html/images/os/vmware.png
 %%WWWDIR%%/html/images/os/vmware_2x.png
 %%WWWDIR%%/html/images/os/voswall.png
+%%WWWDIR%%/html/images/os/vubiq.png
+%%WWWDIR%%/html/images/os/vubiq_2x.png
 %%WWWDIR%%/html/images/os/vyatta.png
 %%WWWDIR%%/html/images/os/vyatta_2x.png
 %%WWWDIR%%/html/images/os/vyos.png
@@ -1684,6 +1814,10 @@
 %%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/wowza.png
+%%WWWDIR%%/html/images/os/wowza_2x.png
+%%WWWDIR%%/html/images/os/wti.png
+%%WWWDIR%%/html/images/os/wti_2x.png
 %%WWWDIR%%/html/images/os/wut.png
 %%WWWDIR%%/html/images/os/wut_2x.png
 %%WWWDIR%%/html/images/os/wxgoos.png
@@ -1709,8 +1843,17 @@
 %%WWWDIR%%/html/img/glyphicons-halflings-white.png
 %%WWWDIR%%/html/img/glyphicons-halflings.png
 %%WWWDIR%%/html/img/sprite.png
+%%WWWDIR%%/html/img/svg_png.png
+%%WWWDIR%%/html/img/svg_png_36.png
 %%WWWDIR%%/html/includes/.htaccess
+%%WWWDIR%%/html/includes/actions/alert_entry_ignore_until_ok.inc.php
 %%WWWDIR%%/html/includes/alerting-navbar.inc.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/authenticate-functions.inc.php
 %%WWWDIR%%/html/includes/authenticate.inc.php
 %%WWWDIR%%/html/includes/authentication/cas.inc.php
@@ -1725,9 +1868,15 @@
 %%WWWDIR%%/html/includes/collectd/definitions.php
 %%WWWDIR%%/html/includes/collectd/functions.php
 %%WWWDIR%%/html/includes/contacts-navbar.inc.php
+%%WWWDIR%%/html/includes/customoids-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/netscaler.inc.php
+%%WWWDIR%%/html/includes/entities/netscalersvc.inc.php
+%%WWWDIR%%/html/includes/entities/netscalersvcgrpmem.inc.php
+%%WWWDIR%%/html/includes/entities/netscalervsvr.inc.php
+%%WWWDIR%%/html/includes/entities/oid_entry.inc.php
 %%WWWDIR%%/html/includes/entities/p2pradio.inc.php
 %%WWWDIR%%/html/includes/entities/port.inc.php
 %%WWWDIR%%/html/includes/entities/printersupply.inc.php
@@ -1773,6 +1922,16 @@
 %%WWWDIR%%/html/includes/graphs/application/bind_zone_maint.inc.php
 %%WWWDIR%%/html/includes/graphs/application/dhcpkit_msgtypes.inc.php
 %%WWWDIR%%/html/includes/graphs/application/dhcpkit_packets.inc.php
+%%WWWDIR%%/html/includes/graphs/application/dovecot_auth.inc.php
+%%WWWDIR%%/html/includes/graphs/application/dovecot_auth_cache.inc.php
+%%WWWDIR%%/html/includes/graphs/application/dovecot_cache.inc.php
+%%WWWDIR%%/html/includes/graphs/application/dovecot_commands.inc.php
+%%WWWDIR%%/html/includes/graphs/application/dovecot_connected.inc.php
+%%WWWDIR%%/html/includes/graphs/application/dovecot_cpu.inc.php
+%%WWWDIR%%/html/includes/graphs/application/dovecot_io.inc.php
+%%WWWDIR%%/html/includes/graphs/application/dovecot_pages.inc.php
+%%WWWDIR%%/html/includes/graphs/application/dovecot_storage.inc.php
+%%WWWDIR%%/html/includes/graphs/application/dovecot_usage.inc.php
 %%WWWDIR%%/html/includes/graphs/application/drbd_disk_bits.inc.php
 %%WWWDIR%%/html/includes/graphs/application/drbd_network_bits.inc.php
 %%WWWDIR%%/html/includes/graphs/application/drbd_queue.inc.php
@@ -1799,8 +1958,14 @@
 %%WWWDIR%%/html/includes/graphs/application/exchange_trans_smtp.inc.php
 %%WWWDIR%%/html/includes/graphs/application/exchange_trans_subque.inc.php
 %%WWWDIR%%/html/includes/graphs/application/exim-mailqueue_total.inc.php
+%%WWWDIR%%/html/includes/graphs/application/exim_reject.inc.php
+%%WWWDIR%%/html/includes/graphs/application/exim_sent.inc.php
+%%WWWDIR%%/html/includes/graphs/application/exim_spam.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/ioping_iops.inc.php
+%%WWWDIR%%/html/includes/graphs/application/ioping_speed.inc.php
+%%WWWDIR%%/html/includes/graphs/application/ioping_timing.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
@@ -1983,6 +2148,8 @@
 %%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/customoid/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/customoid/graph.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
@@ -2066,6 +2233,7 @@
 %%WWWDIR%%/html/includes/graphs/device/netscalersvc_conns.inc.php
 %%WWWDIR%%/html/includes/graphs/device/netscalersvc_pkts.inc.php
 %%WWWDIR%%/html/includes/graphs/device/netscalersvc_reqs.inc.php
+%%WWWDIR%%/html/includes/graphs/device/netscalersvc_surge.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
@@ -2100,7 +2268,9 @@
 %%WWWDIR%%/html/includes/graphs/device/nfsen_packets.inc.php
 %%WWWDIR%%/html/includes/graphs/device/nfsen_traffic.inc.php
 %%WWWDIR%%/html/includes/graphs/device/pagecount.inc.php
+%%WWWDIR%%/html/includes/graphs/device/panos_gptunnels.inc.php
 %%WWWDIR%%/html/includes/graphs/device/panos_sessions.inc.php
+%%WWWDIR%%/html/includes/graphs/device/poller_perfperc.inc.php
 %%WWWDIR%%/html/includes/graphs/device/printersupplies.inc.php
 %%WWWDIR%%/html/includes/graphs/device/printersupplies_cleanerunit.inc.php
 %%WWWDIR%%/html/includes/graphs/device/printersupplies_developer.inc.php
@@ -2151,20 +2321,37 @@
 %%WWWDIR%%/html/includes/graphs/generic_multi_bits_separated.inc.php
 %%WWWDIR%%/html/includes/graphs/generic_multi_data.inc.php
 %%WWWDIR%%/html/includes/graphs/generic_multi_data_separated.inc.php
+%%WWWDIR%%/html/includes/graphs/generic_multi_group_bits.inc.php
+%%WWWDIR%%/html/includes/graphs/generic_multi_group_simplex_separated.inc.php
 %%WWWDIR%%/html/includes/graphs/generic_multi_line.inc.php
 %%WWWDIR%%/html/includes/graphs/generic_multi_separated.inc.php
 %%WWWDIR%%/html/includes/graphs/generic_multi_simplex_separated.inc.php
 %%WWWDIR%%/html/includes/graphs/generic_simplex.inc.php
 %%WWWDIR%%/html/includes/graphs/global/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/global/bits.inc.php
+%%WWWDIR%%/html/includes/graphs/global/jnx_cos_queues.inc.php
+%%WWWDIR%%/html/includes/graphs/global/poller.inc.php
 %%WWWDIR%%/html/includes/graphs/global/poller_time.inc.php
 %%WWWDIR%%/html/includes/graphs/global/poller_time_separate.inc.php
+%%WWWDIR%%/html/includes/graphs/global/pollermod.inc.php
+%%WWWDIR%%/html/includes/graphs/global/pollermods.inc.php
 %%WWWDIR%%/html/includes/graphs/global/processor_separate.inc.php
 %%WWWDIR%%/html/includes/graphs/global/processor_stack.inc.php
+%%WWWDIR%%/html/includes/graphs/global/sros_queues.inc.php
 %%WWWDIR%%/html/includes/graphs/graph.inc.php
 %%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-pool-member/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/lb-pool-member/bits.inc.php
+%%WWWDIR%%/html/includes/graphs/lb-pool-member/conns.inc.php
+%%WWWDIR%%/html/includes/graphs/lb-snatpool/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/lb-snatpool/bits.inc.php
+%%WWWDIR%%/html/includes/graphs/lb-snatpool/conns.inc.php
+%%WWWDIR%%/html/includes/graphs/lb-snatpool/cur_conns.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
@@ -2174,6 +2361,9 @@
 %%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/multi-customoid/auth.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-customoid/line.inc.php
+%%WWWDIR%%/html/includes/graphs/multi-customoid/stacked.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
@@ -2184,8 +2374,10 @@
 %%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/bits_trio_compare.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/groups_bits.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
@@ -2242,9 +2434,15 @@
 %%WWWDIR%%/html/includes/graphs/port/adsl_speed.inc.php
 %%WWWDIR%%/html/includes/graphs/port/auth.inc.php
 %%WWWDIR%%/html/includes/graphs/port/bits.inc.php
+%%WWWDIR%%/html/includes/graphs/port/discards.inc.php
 %%WWWDIR%%/html/includes/graphs/port/errors.inc.php
 %%WWWDIR%%/html/includes/graphs/port/etherlike.inc.php
 %%WWWDIR%%/html/includes/graphs/port/fdb_count.inc.php
+%%WWWDIR%%/html/includes/graphs/port/jnx_QedBytes.inc.php
+%%WWWDIR%%/html/includes/graphs/port/jnx_QedPkts.inc.php
+%%WWWDIR%%/html/includes/graphs/port/jnx_TailDropPkts.inc.php
+%%WWWDIR%%/html/includes/graphs/port/jnx_TotalRedDropBytes.inc.php
+%%WWWDIR%%/html/includes/graphs/port/jnx_TotalRedDropPkts.inc.php
 %%WWWDIR%%/html/includes/graphs/port/mac_acc_total.inc.php
 %%WWWDIR%%/html/includes/graphs/port/nupkts.inc.php
 %%WWWDIR%%/html/includes/graphs/port/pagp_bits.inc.php
@@ -2269,6 +2467,8 @@
 %%WWWDIR%%/html/includes/graphs/sensor/crestfactor.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/current.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/dbm.inc.php
+%%WWWDIR%%/html/includes/graphs/sensor/dewpoint.inc.php
+%%WWWDIR%%/html/includes/graphs/sensor/dust.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
@@ -2282,6 +2482,7 @@
 %%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/sound.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/state.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/temperature.inc.php
 %%WWWDIR%%/html/includes/graphs/sensor/velocity.inc.php
@@ -2317,6 +2518,7 @@
 %%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/maintenance-navbar.inc.php
 %%WWWDIR%%/html/includes/map/google-mc.inc.php
 %%WWWDIR%%/html/includes/map/google.inc.php
 %%WWWDIR%%/html/includes/map/leaflet.inc.php
@@ -2338,6 +2540,7 @@
 %%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/billing.inc.php
 %%WWWDIR%%/html/includes/print/common.inc.php
 %%WWWDIR%%/html/includes/print/dot1xtable.inc.php
 %%WWWDIR%%/html/includes/print/events.inc.php
@@ -2354,6 +2557,7 @@
 %%WWWDIR%%/html/includes/print/syslogs.inc.php
 %%WWWDIR%%/html/includes/search/accesspoints.inc.php
 %%WWWDIR%%/html/includes/search/devices.inc.php
+%%WWWDIR%%/html/includes/search/inventory.inc.php
 %%WWWDIR%%/html/includes/search/ip-addresses.inc.php
 %%WWWDIR%%/html/includes/search/ports.inc.php
 %%WWWDIR%%/html/includes/search/sensors.inc.php
@@ -2389,6 +2593,7 @@
 %%WWWDIR%%/html/js/google-code-prettify.js
 %%WWWDIR%%/html/js/google/markerclusterer.js
 %%WWWDIR%%/html/js/html5shiv.min.js
+%%WWWDIR%%/html/js/iconizr.min.js
 %%WWWDIR%%/html/js/jqplot/copyright.txt
 %%WWWDIR%%/html/js/jqplot/excanvas.js
 %%WWWDIR%%/html/js/jqplot/excanvas.min.js
@@ -2428,7 +2633,9 @@
 %%WWWDIR%%/html/js/jquery-ui.min.js
 %%WWWDIR%%/html/js/jquery.bootstrap-growl.js
 %%WWWDIR%%/html/js/jquery.min.js
+%%WWWDIR%%/html/js/jquery.popconfirm.js
 %%WWWDIR%%/html/js/jquery.qtip.min.js
+%%WWWDIR%%/html/js/jquery.tinytoggle.min.js
 %%WWWDIR%%/html/js/leaflet.js
 %%WWWDIR%%/html/js/mktree.js
 %%WWWDIR%%/html/js/observium-entities.js
@@ -2462,8 +2669,17 @@
 %%WWWDIR%%/html/pages/alert_check.inc.php
 %%WWWDIR%%/html/pages/alert_checks.inc.php
 %%WWWDIR%%/html/pages/alert_log.inc.php
+%%WWWDIR%%/html/pages/alert_maintenance.inc.php
+%%WWWDIR%%/html/pages/alert_maintenance_add.inc.php
 %%WWWDIR%%/html/pages/alert_regenerate.inc.php
 %%WWWDIR%%/html/pages/alerts.inc.php
+%%WWWDIR%%/html/pages/api/errorcodes.inc.php
+%%WWWDIR%%/html/pages/api/manual.billing.inc.php
+%%WWWDIR%%/html/pages/api/manual.encryption.inc.php
+%%WWWDIR%%/html/pages/api/manual.general.inc.php
+%%WWWDIR%%/html/pages/api/manual.inc.php
+%%WWWDIR%%/html/pages/api/manual.inventory.inc.php
+%%WWWDIR%%/html/pages/api/manual.packages.inc.php
 %%WWWDIR%%/html/pages/apps.inc.php
 %%WWWDIR%%/html/pages/apps/default.inc.php
 %%WWWDIR%%/html/pages/apps/overview.inc.php
@@ -2471,6 +2687,8 @@
 %%WWWDIR%%/html/pages/contact.inc.php
 %%WWWDIR%%/html/pages/contacts.inc.php
 %%WWWDIR%%/html/pages/customers.inc.php
+%%WWWDIR%%/html/pages/customoid.inc.php
+%%WWWDIR%%/html/pages/customoids.inc.php
 %%WWWDIR%%/html/pages/deleted-ports.inc.php
 %%WWWDIR%%/html/pages/delhost.inc.php
 %%WWWDIR%%/html/pages/delsrv.inc.php
@@ -2485,10 +2703,13 @@
 %%WWWDIR%%/html/pages/device/apps/asterisk.inc.php
 %%WWWDIR%%/html/pages/device/apps/bind.inc.php
 %%WWWDIR%%/html/pages/device/apps/dhcpkit.inc.php
+%%WWWDIR%%/html/pages/device/apps/dovecot.inc.php
 %%WWWDIR%%/html/pages/device/apps/drbd.inc.php
 %%WWWDIR%%/html/pages/device/apps/exchange.inc.php
 %%WWWDIR%%/html/pages/device/apps/exim-mailqueue.inc.php
+%%WWWDIR%%/html/pages/device/apps/exim.inc.php
 %%WWWDIR%%/html/pages/device/apps/freeradius.inc.php
+%%WWWDIR%%/html/pages/device/apps/ioping.inc.php
 %%WWWDIR%%/html/pages/device/apps/jvmoverjmx.inc.php
 %%WWWDIR%%/html/pages/device/apps/kamailio.inc.php
 %%WWWDIR%%/html/pages/device/apps/lighttpd.inc.php
@@ -2551,6 +2772,15 @@
 %%WWWDIR%%/html/pages/device/health/storage.inc.php
 %%WWWDIR%%/html/pages/device/hrdevice.inc.php
 %%WWWDIR%%/html/pages/device/latency.inc.php
+%%WWWDIR%%/html/pages/device/loadbalancer.inc.php
+%%WWWDIR%%/html/pages/device/loadbalancer/lb_pools.inc.php
+%%WWWDIR%%/html/pages/device/loadbalancer/lb_snatpools.inc.php
+%%WWWDIR%%/html/pages/device/loadbalancer/lb_virtuals.inc.php
+%%WWWDIR%%/html/pages/device/loadbalancer/loadbalancer_rservers.inc.php
+%%WWWDIR%%/html/pages/device/loadbalancer/loadbalancer_vservers.inc.php
+%%WWWDIR%%/html/pages/device/loadbalancer/netscaler_servicegroupmembers.inc.php
+%%WWWDIR%%/html/pages/device/loadbalancer/netscaler_services.inc.php
+%%WWWDIR%%/html/pages/device/loadbalancer/netscaler_vsvr.inc.php
 %%WWWDIR%%/html/pages/device/logs.inc.php
 %%WWWDIR%%/html/pages/device/logs/alertlog.inc.php
 %%WWWDIR%%/html/pages/device/logs/eventlog.inc.php
@@ -2591,12 +2821,14 @@
 %%WWWDIR%%/html/pages/device/port/events.inc.php
 %%WWWDIR%%/html/pages/device/port/fdb.inc.php
 %%WWWDIR%%/html/pages/device/port/graphs.inc.php
+%%WWWDIR%%/html/pages/device/port/jnx_cos_queues.inc.php
 %%WWWDIR%%/html/pages/device/port/junose-atm-vp.inc.php
 %%WWWDIR%%/html/pages/device/port/macaccounting.inc.php
 %%WWWDIR%%/html/pages/device/port/macaccounting_top10.inc.php
 %%WWWDIR%%/html/pages/device/port/pagp.inc.php
 %%WWWDIR%%/html/pages/device/port/realtime.inc.php
 %%WWWDIR%%/html/pages/device/port/sensors.inc.php
+%%WWWDIR%%/html/pages/device/port/sros_queues.inc.php
 %%WWWDIR%%/html/pages/device/port/vlans.inc.php
 %%WWWDIR%%/html/pages/device/ports.inc.php
 %%WWWDIR%%/html/pages/device/ports/adsl.inc.php
@@ -2606,6 +2838,7 @@
 %%WWWDIR%%/html/pages/device/ports/ipv6.inc.php
 %%WWWDIR%%/html/pages/device/ports/map.inc.php
 %%WWWDIR%%/html/pages/device/ports/neighbours.inc.php
+%%WWWDIR%%/html/pages/device/ports/sensors.inc.php
 %%WWWDIR%%/html/pages/device/printing.inc.php
 %%WWWDIR%%/html/pages/device/pseudowires.inc.php
 %%WWWDIR%%/html/pages/device/routing.inc.php
@@ -2638,6 +2871,7 @@
 %%WWWDIR%%/html/pages/edituser/deleteuser.inc.php
 %%WWWDIR%%/html/pages/eventlog.inc.php
 %%WWWDIR%%/html/pages/front/default.php
+%%WWWDIR%%/html/pages/front/test.php
 %%WWWDIR%%/html/pages/graphs.inc.php
 %%WWWDIR%%/html/pages/health.inc.php
 %%WWWDIR%%/html/pages/health/mempool.inc.php
@@ -2651,7 +2885,9 @@
 %%WWWDIR%%/html/pages/locations.inc.php
 %%WWWDIR%%/html/pages/logon.inc.php
 %%WWWDIR%%/html/pages/mibs.inc.php
+%%WWWDIR%%/html/pages/modules.inc.php
 %%WWWDIR%%/html/pages/neighbours.inc.php
+%%WWWDIR%%/html/pages/os.inc.php
 %%WWWDIR%%/html/pages/p2pradios.inc.php
 %%WWWDIR%%/html/pages/packages.inc.php
 %%WWWDIR%%/html/pages/pollerlog.inc.php
@@ -2662,6 +2898,7 @@
 %%WWWDIR%%/html/pages/preferences/authentication.inc.php
 %%WWWDIR%%/html/pages/preferences/authlog.inc.php
 %%WWWDIR%%/html/pages/preferences/general.inc.php
+%%WWWDIR%%/html/pages/processes.inc.php
 %%WWWDIR%%/html/pages/pseudowires.inc.php
 %%WWWDIR%%/html/pages/routing.inc.php
 %%WWWDIR%%/html/pages/routing/bgp.inc.php
@@ -2689,10 +2926,12 @@
 %%WWWDIR%%/html/pages/vms.inc.php
 %%WWWDIR%%/html/pdf.php
 %%WWWDIR%%/html/robots.txt
+%%WWWDIR%%/includes/alerting/alertops.inc.php
 %%WWWDIR%%/includes/alerting/clickatell.inc.php
 %%WWWDIR%%/includes/alerting/email.inc.php
 %%WWWDIR%%/includes/alerting/hipchat.inc.php
 %%WWWDIR%%/includes/alerting/messagebird.inc.php
+%%WWWDIR%%/includes/alerting/opsgenie.inc.php
 %%WWWDIR%%/includes/alerting/pagerduty.inc.php
 %%WWWDIR%%/includes/alerting/pushover.inc.php
 %%WWWDIR%%/includes/alerting/redoxygen.inc.php
@@ -2700,10 +2939,13 @@
 %%WWWDIR%%/includes/alerting/slack.inc.php
 %%WWWDIR%%/includes/alerting/smsbox.inc.php
 %%WWWDIR%%/includes/alerting/telegram.inc.php
+%%WWWDIR%%/includes/alerting/textlocal.inc.php
 %%WWWDIR%%/includes/alerting/victorops.inc.php
 %%WWWDIR%%/includes/alerting/webhook-old.inc.php
+%%WWWDIR%%/includes/alerting/webhook.inc.php
 %%WWWDIR%%/includes/alerting/xmpp.inc.php
 %%WWWDIR%%/includes/alerts.inc.php
+%%WWWDIR%%/includes/cache.inc.php
 %%WWWDIR%%/includes/common.inc.php
 %%WWWDIR%%/includes/community.inc.php
 %%WWWDIR%%/includes/config-variables.inc.php
@@ -2711,10 +2953,21 @@
 %%WWWDIR%%/includes/db/mysql.inc.php
 %%WWWDIR%%/includes/db/mysqli.inc.php
 %%WWWDIR%%/includes/defaults.inc.php
-%%WWWDIR%%/includes/defaults.inc.php.orig
 %%WWWDIR%%/includes/definitions.inc.php
-%%WWWDIR%%/includes/definitions/definitions.dat
+%%WWWDIR%%/includes/definitions/apps.inc.php
+%%WWWDIR%%/includes/definitions/entities.inc.php
+%%WWWDIR%%/includes/definitions/geo.inc.php
+%%WWWDIR%%/includes/definitions/graphtypes.inc.php
+%%WWWDIR%%/includes/definitions/mibs.inc.php
+%%WWWDIR%%/includes/definitions/models.inc.php
+%%WWWDIR%%/includes/definitions/os.inc.php
+%%WWWDIR%%/includes/definitions/rewrites.inc.php
+%%WWWDIR%%/includes/definitions/rrdtypes.inc.php
+%%WWWDIR%%/includes/definitions/sensors.inc.php
+%%WWWDIR%%/includes/definitions/status.inc.php
+%%WWWDIR%%/includes/definitions/transports.inc.php
 %%WWWDIR%%/includes/definitions/version.inc.php
+%%WWWDIR%%/includes/definitions/vm.inc.php
 %%WWWDIR%%/includes/definitions/wui.inc.php
 %%WWWDIR%%/includes/discovery/arp-table.inc.php
 %%WWWDIR%%/includes/discovery/bgp-peers.inc.php
@@ -2724,6 +2977,7 @@
 %%WWWDIR%%/includes/discovery/functions.inc.php
 %%WWWDIR%%/includes/discovery/graphs.inc.php

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