Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Nov 2016 10:37:52 +0100
From:      Adrian Murphy <amurphy@gsoft.com.au>
To:        Mark Felder <feld@freebsd.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   Re: svn commit: r425979 - in head/net-mgmt/observium: . files
Message-ID:  <b8e9e916-5db7-6ba7-17d6-5a7608a0dace@gsoft.com.au>
In-Reply-To: <201611121828.uACISUEr053890@repo.freebsd.org>
References:  <201611121828.uACISUEr053890@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
On 12/11/2016 7:28 PM, Mark Felder wrote:
> Author: feld
> Date: Sat Nov 12 18:28:30 2016
> New Revision: 425979
> URL: https://svnweb.freebsd.org/changeset/ports/425979
>
> Log:
>   net-mgmt/observium: Update to 0.16.10.8128
>
>   PR:		213895
>
> Deleted:
>   head/net-mgmt/observium/files/patch-html_includes_graphs_generic__multi__bits__separated.inc.php
> Modified:
>   head/net-mgmt/observium/Makefile
>   head/net-mgmt/observium/distinfo
>   head/net-mgmt/observium/pkg-plist
>

I use poller-wrapper.py rather than poller.php in /etc/crontab and I found the following patch 
necessary to make observium work:

--- poller-wrapper.py.orig      2014-11-04 16:14:27 UTC
+++ poller-wrapper.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! %%LOCALBASE%%/bin/python
  """
   Observium

@@ -45,6 +45,8 @@
      print("threading, sys, subprocess, time, os, json")
      sys.exit(2)

+os.environ['PATH'] += ':%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin'
+
  # start time
  s_time = time.time()



Or am I doing something wrong?

Cheers, Adrian


> Modified: head/net-mgmt/observium/Makefile
> ==============================================================================
> --- head/net-mgmt/observium/Makefile	Sat Nov 12 18:14:04 2016	(r425978)
> +++ head/net-mgmt/observium/Makefile	Sat Nov 12 18:28:30 2016	(r425979)
> @@ -2,8 +2,8 @@
>  # $FreeBSD$
>
>  PORTNAME=	observium
> -PORTVERSION=	0.16.1.7533
> -PORTREVISION=	2
> +PORTVERSION=	0.16.10.8128
> +PORTREVISION= 0
>  CATEGORIES=	net-mgmt
>  MASTER_SITES=	http://www.observium.org/
>  DISTNAME=	${PORTNAME}-community-latest
> @@ -30,6 +30,7 @@ SHEBANG_FILES=	mibs/process.pl \
>  	scripts/agent-local/ksm \
>  	scripts/agent-local/lighttpd \
>  	scripts/agent-local/lmsensors \
> +	scripts/agent-local/lvs_stats \
>  	scripts/agent-local/postfix_mailgraph \
>  	scripts/agent-local/postfix_qshape \
>  	scripts/agent-local/postgresql.pl \
> @@ -40,6 +41,7 @@ SHEBANG_FILES=	mibs/process.pl \
>  	scripts/agent-local/vmwaretools \
>  	scripts/agent-local/zimbra \
>  	scripts/add_ds.pl \
> +	scripts/add_ds_to_rrd.pl \
>  	scripts/get-geshi.sh \
>  	scripts/get-jpgraph.sh \
>  	scripts/ifAlias \
> @@ -49,8 +51,7 @@ SHEBANG_FILES=	mibs/process.pl \
>  	scripts/removespikes.php \
>  	scripts/removespikes.pl \
>  	scripts/rename-mibs.pl \
> -	scripts/rrdtoolx.py \
> -	scripts/watchmaillog/watchmaillog.pl
> +	scripts/rrdtoolx.py
>
>  USE_PHP=	ctype filter gd iconv json mcrypt mysql mysqli posix session snmp tokenizer xml zlib
>  WANT_PHP_CLI=	yes
>
> Modified: head/net-mgmt/observium/distinfo
> ==============================================================================
> --- head/net-mgmt/observium/distinfo	Sat Nov 12 18:14:04 2016	(r425978)
> +++ head/net-mgmt/observium/distinfo	Sat Nov 12 18:28:30 2016	(r425979)
> @@ -1,2 +1,3 @@
> -SHA256 (observium-0.16.1.7533/observium-community-latest.tar.gz) = 55f0feddf0595289c09304d0cf5a26625a057dfb314b22b9fe5726977d1c2b29
> -SIZE (observium-0.16.1.7533/observium-community-latest.tar.gz) = 50107191
> +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
>
> Modified: head/net-mgmt/observium/pkg-plist
> ==============================================================================
> --- head/net-mgmt/observium/pkg-plist	Sat Nov 12 18:14:04 2016	(r425978)
> +++ head/net-mgmt/observium/pkg-plist	Sat Nov 12 18:28:30 2016	(r425979)
> @@ -16,7 +16,9 @@
>  %%WWWDIR%%/html/css/bootstrap-hacks.css
>  %%WWWDIR%%/html/css/bootstrap-select.css
>  %%WWWDIR%%/html/css/bootstrap-switch.css
> +%%WWWDIR%%/html/css/bootstrap-tagsinput.css
>  %%WWWDIR%%/html/css/bootstrap.css
> +%%WWWDIR%%/html/css/c3.min.css
>  %%WWWDIR%%/html/css/flags.css
>  %%WWWDIR%%/html/css/font-awesome/README.md
>  %%WWWDIR%%/html/css/font-awesome/font/FontAwesome.otf
> @@ -35,10 +37,12 @@
>  %%WWWDIR%%/html/css/font-awesome/less/variables.less
>  %%WWWDIR%%/html/css/google-code-prettify.css
>  %%WWWDIR%%/html/css/jquery.qtip.min.css
> +%%WWWDIR%%/html/css/leaflet.css
>  %%WWWDIR%%/html/css/mktree.css
>  %%WWWDIR%%/html/css/ref.css
>  %%WWWDIR%%/html/css/sprite.css
>  %%WWWDIR%%/html/css/styles-wide.css
> +%%WWWDIR%%/html/css/typeaheadjs.css
>  %%WWWDIR%%/html/data.php
>  %%WWWDIR%%/html/feed.php
>  %%WWWDIR%%/html/fonts/SourceSansPro-Light.ttf
> @@ -60,6 +64,7 @@
>  %%WWWDIR%%/html/fonts/glyphicons-halflings-regular.ttf
>  %%WWWDIR%%/html/fonts/glyphicons-halflings-regular.woff
>  %%WWWDIR%%/html/fonts/glyphicons-halflings-regular.woff2
> +%%WWWDIR%%/html/geo.php
>  %%WWWDIR%%/html/graph-realtime.php
>  %%WWWDIR%%/html/graph.php
>  %%WWWDIR%%/html/icons.php
> @@ -1073,6 +1078,55 @@
>  %%WWWDIR%%/html/images/16/zoom.png
>  %%WWWDIR%%/html/images/16/zoom_in.png
>  %%WWWDIR%%/html/images/16/zoom_out.png
> +%%WWWDIR%%/html/images/apps/apache.png
> +%%WWWDIR%%/html/images/apps/apache_2x.png
> +%%WWWDIR%%/html/images/apps/apps.png
> +%%WWWDIR%%/html/images/apps/asterisk.png
> +%%WWWDIR%%/html/images/apps/asterisk_2x.png
> +%%WWWDIR%%/html/images/apps/bind.png
> +%%WWWDIR%%/html/images/apps/bind_2x.png
> +%%WWWDIR%%/html/images/apps/crashplan.png
> +%%WWWDIR%%/html/images/apps/crashplan_2x.png
> +%%WWWDIR%%/html/images/apps/drbd.png
> +%%WWWDIR%%/html/images/apps/drbd_2x.png
> +%%WWWDIR%%/html/images/apps/exim.png
> +%%WWWDIR%%/html/images/apps/exim_2x.png
> +%%WWWDIR%%/html/images/apps/freeradius.png
> +%%WWWDIR%%/html/images/apps/freeradius_2x.png
> +%%WWWDIR%%/html/images/apps/kamailio.png
> +%%WWWDIR%%/html/images/apps/kamailio_2x.png
> +%%WWWDIR%%/html/images/apps/lighttpd.png
> +%%WWWDIR%%/html/images/apps/lighttpd_2x.png
> +%%WWWDIR%%/html/images/apps/memcached.png
> +%%WWWDIR%%/html/images/apps/memcached_2x.png
> +%%WWWDIR%%/html/images/apps/mssql.png
> +%%WWWDIR%%/html/images/apps/mssql_2x.png
> +%%WWWDIR%%/html/images/apps/mysql.png
> +%%WWWDIR%%/html/images/apps/mysql_2x.png
> +%%WWWDIR%%/html/images/apps/nfs.png
> +%%WWWDIR%%/html/images/apps/nfs_2x.png
> +%%WWWDIR%%/html/images/apps/nfsd.png
> +%%WWWDIR%%/html/images/apps/nfsd_2x.png
> +%%WWWDIR%%/html/images/apps/nginx.png
> +%%WWWDIR%%/html/images/apps/nginx_2x.png
> +%%WWWDIR%%/html/images/apps/nsd.png
> +%%WWWDIR%%/html/images/apps/nsd_2x.png
> +%%WWWDIR%%/html/images/apps/ntpd.png
> +%%WWWDIR%%/html/images/apps/ntpd_2x.png
> +%%WWWDIR%%/html/images/apps/openvpn.png
> +%%WWWDIR%%/html/images/apps/openvpn_2x.png
> +%%WWWDIR%%/html/images/apps/postfix.png
> +%%WWWDIR%%/html/images/apps/postfix_2x.png
> +%%WWWDIR%%/html/images/apps/postgresql.png
> +%%WWWDIR%%/html/images/apps/postgresql_2x.png
> +%%WWWDIR%%/html/images/apps/powerdns.png
> +%%WWWDIR%%/html/images/apps/powerdns_2x.png
> +%%WWWDIR%%/html/images/apps/shoutcast.png
> +%%WWWDIR%%/html/images/apps/shoutcast_2x.png
> +%%WWWDIR%%/html/images/apps/unbound.png
> +%%WWWDIR%%/html/images/apps/unbound_2x.png
> +%%WWWDIR%%/html/images/apps/zimbra.png
> +%%WWWDIR%%/html/images/apps/zimbra_2x.png
>  %%WWWDIR%%/html/images/arrows.gif
>  %%WWWDIR%%/html/images/brand-observium-x2.png
>  %%WWWDIR%%/html/images/brand-observium.png
> @@ -1086,28 +1140,20 @@
>  %%WWWDIR%%/html/images/glyphicons-halflings.png
>  %%WWWDIR%%/html/images/header_bg.gif
>  %%WWWDIR%%/html/images/icons/alerts.png
> -%%WWWDIR%%/html/images/icons/apache.png
>  %%WWWDIR%%/html/images/icons/apps.png
>  %%WWWDIR%%/html/images/icons/arrow_pps_in.png
>  %%WWWDIR%%/html/images/icons/arrow_pps_out.png
>  %%WWWDIR%%/html/images/icons/arrow_updown.png
> -%%WWWDIR%%/html/images/icons/asterisk.png
> -%%WWWDIR%%/html/images/icons/bind.png
> -%%WWWDIR%%/html/images/icons/crashplan.png
>  %%WWWDIR%%/html/images/icons/current.png
>  %%WWWDIR%%/html/images/icons/dbm.png
>  %%WWWDIR%%/html/images/icons/deb.png
>  %%WWWDIR%%/html/images/icons/device.png
>  %%WWWDIR%%/html/images/icons/diskio.png
> -%%WWWDIR%%/html/images/icons/drbd.png
>  %%WWWDIR%%/html/images/icons/environment.png
>  %%WWWDIR%%/html/images/icons/eventlog.png
>  %%WWWDIR%%/html/images/icons/exchange.png
> -%%WWWDIR%%/html/images/icons/exim-mailqueue.png
> -%%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
> @@ -1151,19 +1197,12 @@
>  %%WWWDIR%%/html/images/icons/ipmi.png
>  %%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
>  %%WWWDIR%%/html/images/icons/mempools.png
> -%%WWWDIR%%/html/images/icons/mssql.png
> -%%WWWDIR%%/html/images/icons/mysql.png
>  %%WWWDIR%%/html/images/icons/netstats.png
>  %%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
> @@ -1175,11 +1214,7 @@
>  %%WWWDIR%%/html/images/icons/port-up.png
>  %%WWWDIR%%/html/images/icons/port.png
>  %%WWWDIR%%/html/images/icons/ports.png
> -%%WWWDIR%%/html/images/icons/postfix.png
> -%%WWWDIR%%/html/images/icons/postgresql.png
>  %%WWWDIR%%/html/images/icons/power.png
> -%%WWWDIR%%/html/images/icons/powerdns-recursor.png
> -%%WWWDIR%%/html/images/icons/powerdns.png
>  %%WWWDIR%%/html/images/icons/printer.png
>  %%WWWDIR%%/html/images/icons/processor.png
>  %%WWWDIR%%/html/images/icons/rpm.png
> @@ -1196,7 +1231,6 @@
>  %%WWWDIR%%/html/images/icons/voltage.png
>  %%WWWDIR%%/html/images/icons/wifi.png
>  %%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
> @@ -1215,12 +1249,18 @@
>  %%WWWDIR%%/html/images/observium-mini-logo.png
>  %%WWWDIR%%/html/images/os/3com.png
>  %%WWWDIR%%/html/images/os/a10.png
> +%%WWWDIR%%/html/images/os/accedian.png
> +%%WWWDIR%%/html/images/os/accedian_2x.png
>  %%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/aethra.png
> +%%WWWDIR%%/html/images/os/aethra_2x.png
> +%%WWWDIR%%/html/images/os/airconsole.png
> +%%WWWDIR%%/html/images/os/airconsole_2x.png
>  %%WWWDIR%%/html/images/os/aix.png
>  %%WWWDIR%%/html/images/os/aix_2x.png
>  %%WWWDIR%%/html/images/os/akcp.png
> @@ -1233,9 +1273,11 @@
>  %%WWWDIR%%/html/images/os/apc.png
>  %%WWWDIR%%/html/images/os/apc_2x.png
>  %%WWWDIR%%/html/images/os/apple.png
> +%%WWWDIR%%/html/images/os/apple_2x.png
>  %%WWWDIR%%/html/images/os/arbor.png
>  %%WWWDIR%%/html/images/os/arbor_2x.png
>  %%WWWDIR%%/html/images/os/archlinux.png
> +%%WWWDIR%%/html/images/os/archlinux_2x.png
>  %%WWWDIR%%/html/images/os/areca.png
>  %%WWWDIR%%/html/images/os/arista.png
>  %%WWWDIR%%/html/images/os/arista_2x.png
> @@ -1253,50 +1295,69 @@
>  %%WWWDIR%%/html/images/os/avocent.png
>  %%WWWDIR%%/html/images/os/avtech.png
>  %%WWWDIR%%/html/images/os/axis.png
> +%%WWWDIR%%/html/images/os/axis_2x.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/bdcom_2x.png
>  %%WWWDIR%%/html/images/os/billion.png
>  %%WWWDIR%%/html/images/os/billion_2x.png
> +%%WWWDIR%%/html/images/os/bintec.png
> +%%WWWDIR%%/html/images/os/bintec_2x.png
>  %%WWWDIR%%/html/images/os/blackbox.png
>  %%WWWDIR%%/html/images/os/blackbox_2x.png
> +%%WWWDIR%%/html/images/os/bluecat.png
> +%%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/broadcom.png
> +%%WWWDIR%%/html/images/os/broadcom_2x.png
>  %%WWWDIR%%/html/images/os/brocade.png
>  %%WWWDIR%%/html/images/os/brocade_2x.png
>  %%WWWDIR%%/html/images/os/brother.png
> +%%WWWDIR%%/html/images/os/brother_2x.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/cambium_2x.png
>  %%WWWDIR%%/html/images/os/canon.png
> +%%WWWDIR%%/html/images/os/canon_2x.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/ceragon.png
> +%%WWWDIR%%/html/images/os/ceragon_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-old_2x.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/citrix_2x.png
>  %%WWWDIR%%/html/images/os/clavister.png
>  %%WWWDIR%%/html/images/os/clavister_2x.png
>  %%WWWDIR%%/html/images/os/cloudlinux.png
> +%%WWWDIR%%/html/images/os/cloudlinux_2x.png
>  %%WWWDIR%%/html/images/os/comet.png
>  %%WWWDIR%%/html/images/os/conexant.png
> +%%WWWDIR%%/html/images/os/cts.png
> +%%WWWDIR%%/html/images/os/cts_2x.png
> +%%WWWDIR%%/html/images/os/cumulus.png
> +%%WWWDIR%%/html/images/os/cumulus_2x.png
>  %%WWWDIR%%/html/images/os/cyan.png
>  %%WWWDIR%%/html/images/os/d-link.png
>  %%WWWDIR%%/html/images/os/d-link_2x.png
> @@ -1310,31 +1371,48 @@
>  %%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/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/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/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/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/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/epson_2x.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/extreme_2x.png
>  %%WWWDIR%%/html/images/os/f5.png
>  %%WWWDIR%%/html/images/os/f5_2x.png
> +%%WWWDIR%%/html/images/os/fastback.png
> +%%WWWDIR%%/html/images/os/fastback_2x.png
>  %%WWWDIR%%/html/images/os/fedora.png
> +%%WWWDIR%%/html/images/os/fedora_2x.png
>  %%WWWDIR%%/html/images/os/fiberroad.png
>  %%WWWDIR%%/html/images/os/fiberroad_2x.png
>  %%WWWDIR%%/html/images/os/firebrick.png
> @@ -1358,17 +1436,21 @@
>  %%WWWDIR%%/html/images/os/generic.png
>  %%WWWDIR%%/html/images/os/generic_2x.png
>  %%WWWDIR%%/html/images/os/gentoo.png
> +%%WWWDIR%%/html/images/os/gentoo_2x.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/hikvision_2x.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/hwg.png
> +%%WWWDIR%%/html/images/os/hwg_2x.png
>  %%WWWDIR%%/html/images/os/ibm.png
>  %%WWWDIR%%/html/images/os/ibm_2x.png
>  %%WWWDIR%%/html/images/os/ibmi.png
> @@ -1378,31 +1460,48 @@
>  %%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/isilon.png
> +%%WWWDIR%%/html/images/os/isilon_2x.png
> +%%WWWDIR%%/html/images/os/iskratel.png
> +%%WWWDIR%%/html/images/os/iskratel_2x.png
>  %%WWWDIR%%/html/images/os/jacarta.png
>  %%WWWDIR%%/html/images/os/janitza.png
>  %%WWWDIR%%/html/images/os/janitza_2x.png
> +%%WWWDIR%%/html/images/os/jetnexus.png
> +%%WWWDIR%%/html/images/os/jetnexus_2x.png
> +%%WWWDIR%%/html/images/os/juniper-old.png
> +%%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/junos.png
>  %%WWWDIR%%/html/images/os/konica.png
> +%%WWWDIR%%/html/images/os/konica_2x.png
>  %%WWWDIR%%/html/images/os/korenix.png
>  %%WWWDIR%%/html/images/os/kyocera.png
> +%%WWWDIR%%/html/images/os/kyocera_2x.png
>  %%WWWDIR%%/html/images/os/lancom.png
>  %%WWWDIR%%/html/images/os/lancom_2x.png
> +%%WWWDIR%%/html/images/os/lenovo.png
> +%%WWWDIR%%/html/images/os/lenovo_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/linksys_2x.png
>  %%WWWDIR%%/html/images/os/linux.png
>  %%WWWDIR%%/html/images/os/linux_2x.png
> +%%WWWDIR%%/html/images/os/mageia.png
> +%%WWWDIR%%/html/images/os/mageia_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/mandrake_2x.png
>  %%WWWDIR%%/html/images/os/mandriva.png
> +%%WWWDIR%%/html/images/os/mandriva_2x.png
> +%%WWWDIR%%/html/images/os/mcafee.png
> +%%WWWDIR%%/html/images/os/mcafee_2x.png
>  %%WWWDIR%%/html/images/os/mellanox.png
>  %%WWWDIR%%/html/images/os/meraki.png
>  %%WWWDIR%%/html/images/os/meraki_2x.png
> @@ -1410,20 +1509,27 @@
>  %%WWWDIR%%/html/images/os/microsens.png
>  %%WWWDIR%%/html/images/os/mikrotik.png
>  %%WWWDIR%%/html/images/os/mikrotik_2x.png
> +%%WWWDIR%%/html/images/os/mimosa.png
> +%%WWWDIR%%/html/images/os/mimosa_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/monowall_2x.png
>  %%WWWDIR%%/html/images/os/motorola.png
>  %%WWWDIR%%/html/images/os/motorola_2x.png
>  %%WWWDIR%%/html/images/os/moxa.png
> +%%WWWDIR%%/html/images/os/moxa_2x.png
>  %%WWWDIR%%/html/images/os/mrv.png
> +%%WWWDIR%%/html/images/os/mrv_2x.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/netbotz_2x.png
>  %%WWWDIR%%/html/images/os/netbsd.png
> +%%WWWDIR%%/html/images/os/netbsd_2x.png
>  %%WWWDIR%%/html/images/os/netgear.png
>  %%WWWDIR%%/html/images/os/netgear_2x.png
>  %%WWWDIR%%/html/images/os/netinsight.png
> @@ -1435,6 +1541,8 @@
>  %%WWWDIR%%/html/images/os/nexenta.png
>  %%WWWDIR%%/html/images/os/nexsan.png
>  %%WWWDIR%%/html/images/os/nexsan_2x.png
> +%%WWWDIR%%/html/images/os/nimble.png
> +%%WWWDIR%%/html/images/os/nimble_2x.png
>  %%WWWDIR%%/html/images/os/nortel.png
>  %%WWWDIR%%/html/images/os/novell.png
>  %%WWWDIR%%/html/images/os/novell_2x.png
> @@ -1443,6 +1551,7 @@
>  %%WWWDIR%%/html/images/os/oec.png
>  %%WWWDIR%%/html/images/os/oec_2x.png
>  %%WWWDIR%%/html/images/os/oki.png
> +%%WWWDIR%%/html/images/os/oki_2x.png
>  %%WWWDIR%%/html/images/os/olivetti.png
>  %%WWWDIR%%/html/images/os/olivetti_2x.png
>  %%WWWDIR%%/html/images/os/oneaccess.png
> @@ -1453,7 +1562,10 @@
>  %%WWWDIR%%/html/images/os/opengear.png
>  %%WWWDIR%%/html/images/os/openindiana.png
>  %%WWWDIR%%/html/images/os/openindiana_2x.png
> +%%WWWDIR%%/html/images/os/openmandriva.png
> +%%WWWDIR%%/html/images/os/openmandriva_2x.png
>  %%WWWDIR%%/html/images/os/opensolaris.png
> +%%WWWDIR%%/html/images/os/opensolaris_2x.png
>  %%WWWDIR%%/html/images/os/openwrt.png
>  %%WWWDIR%%/html/images/os/openwrt_2x.png
>  %%WWWDIR%%/html/images/os/packetflux.png
> @@ -1465,26 +1577,38 @@
>  %%WWWDIR%%/html/images/os/patton.png
>  %%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/pfsense.png
> +%%WWWDIR%%/html/images/os/pfsense_2x.png
>  %%WWWDIR%%/html/images/os/pica8.png
>  %%WWWDIR%%/html/images/os/pica8_2x.png
> +%%WWWDIR%%/html/images/os/plugandtrack.png
> +%%WWWDIR%%/html/images/os/plugandtrack_2x.png
>  %%WWWDIR%%/html/images/os/poseidon.png
>  %%WWWDIR%%/html/images/os/poseidon_2x.png
> +%%WWWDIR%%/html/images/os/powerwalker.png
> +%%WWWDIR%%/html/images/os/powerwalker_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/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/radware.png
>  %%WWWDIR%%/html/images/os/radware_2x.png
>  %%WWWDIR%%/html/images/os/raisecom.png
> +%%WWWDIR%%/html/images/os/raritan-old.png
> +%%WWWDIR%%/html/images/os/raritan-old_2x.png
>  %%WWWDIR%%/html/images/os/raritan.png
> +%%WWWDIR%%/html/images/os/raritan_2x.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/ricoh_2x.png
>  %%WWWDIR%%/html/images/os/rittal.png
>  %%WWWDIR%%/html/images/os/rittal_2x.png
>  %%WWWDIR%%/html/images/os/riverbed.png
> @@ -1495,6 +1619,7 @@
>  %%WWWDIR%%/html/images/os/ruckus_2x.png
>  %%WWWDIR%%/html/images/os/saf.png
>  %%WWWDIR%%/html/images/os/samsung.png
> +%%WWWDIR%%/html/images/os/samsung_2x.png
>  %%WWWDIR%%/html/images/os/screenos.png
>  %%WWWDIR%%/html/images/os/servertech.png
>  %%WWWDIR%%/html/images/os/servertech_2x.png
> @@ -1505,27 +1630,35 @@
>  %%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/solaris.png
> +%%WWWDIR%%/html/images/os/solaris_2x.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/sun_oracle.png
> +%%WWWDIR%%/html/images/os/sun_oracle_2x.png
>  %%WWWDIR%%/html/images/os/supermicro.png
> +%%WWWDIR%%/html/images/os/supermicro_2x.png
>  %%WWWDIR%%/html/images/os/suse.png
> +%%WWWDIR%%/html/images/os/suse_2x.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/toshiba_2x.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/tripplite_2x.png
>  %%WWWDIR%%/html/images/os/tsl.png
>  %%WWWDIR%%/html/images/os/ubiquiti.png
>  %%WWWDIR%%/html/images/os/ubiquiti_2x.png
> @@ -1536,7 +1669,9 @@
>  %%WWWDIR%%/html/images/os/vmware_2x.png
>  %%WWWDIR%%/html/images/os/voswall.png
>  %%WWWDIR%%/html/images/os/vyatta.png
> +%%WWWDIR%%/html/images/os/vyatta_2x.png
>  %%WWWDIR%%/html/images/os/vyos.png
> +%%WWWDIR%%/html/images/os/vyos_2x.png
>  %%WWWDIR%%/html/images/os/watchguard.png
>  %%WWWDIR%%/html/images/os/watchguard_2x.png
>  %%WWWDIR%%/html/images/os/wepresent.png
> @@ -1553,10 +1688,13 @@
>  %%WWWDIR%%/html/images/os/wut_2x.png
>  %%WWWDIR%%/html/images/os/wxgoos.png
>  %%WWWDIR%%/html/images/os/xerox.png
> +%%WWWDIR%%/html/images/os/xerox_2x.png
>  %%WWWDIR%%/html/images/os/zhone.png
> +%%WWWDIR%%/html/images/os/zhone_2x.png
>  %%WWWDIR%%/html/images/os/zte.png
>  %%WWWDIR%%/html/images/os/zte_2x.png
>  %%WWWDIR%%/html/images/os/zyxel.png
> +%%WWWDIR%%/html/images/os/zyxel_2x.png
>  %%WWWDIR%%/html/images/password-blue.png
>  %%WWWDIR%%/html/images/password.png
>  %%WWWDIR%%/html/images/plus.gif
> @@ -1564,6 +1702,8 @@
>  %%WWWDIR%%/html/images/readme.txt
>  %%WWWDIR%%/html/images/subtle_grunge.png
>  %%WWWDIR%%/html/images/subtle_grunge_x2.png
> +%%WWWDIR%%/html/images/svg/high_priority.svg
> +%%WWWDIR%%/html/images/svg/ok.svg
>  %%WWWDIR%%/html/images/tiny_grid.png
>  %%WWWDIR%%/html/img/flags.png
>  %%WWWDIR%%/html/img/glyphicons-halflings-white.png
> @@ -1590,13 +1730,14 @@
>  %%WWWDIR%%/html/includes/entities/mempool.inc.php
>  %%WWWDIR%%/html/includes/entities/p2pradio.inc.php
>  %%WWWDIR%%/html/includes/entities/port.inc.php
> +%%WWWDIR%%/html/includes/entities/printersupply.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/entities/virtualmachine.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
> @@ -1630,6 +1771,8 @@
>  %%WWWDIR%%/html/includes/graphs/application/bind_resolv_rtt.inc.php
>  %%WWWDIR%%/html/includes/graphs/application/bind_updates.inc.php
>  %%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/drbd_disk_bits.inc.php
>  %%WWWDIR%%/html/includes/graphs/application/drbd_network_bits.inc.php
>  %%WWWDIR%%/html/includes/graphs/application/drbd_queue.inc.php
> @@ -1686,6 +1829,10 @@
>  %%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/lvs_stats_bytes.inc.php
> +%%WWWDIR%%/html/includes/graphs/application/lvs_stats_common.inc.php
> +%%WWWDIR%%/html/includes/graphs/application/lvs_stats_connections.inc.php
> +%%WWWDIR%%/html/includes/graphs/application/lvs_stats_packets.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
> @@ -1759,9 +1906,10 @@
>  %%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
> +%%WWWDIR%%/html/includes/graphs/application/postfix_mailgraph_reject.inc.php
> +%%WWWDIR%%/html/includes/graphs/application/postfix_mailgraph_sent.inc.php
> +%%WWWDIR%%/html/includes/graphs/application/postfix_mailgraph_spam.inc.php
> +%%WWWDIR%%/html/includes/graphs/application/postfix_qshape_stats.inc.php
>  %%WWWDIR%%/html/includes/graphs/application/postgresql_blks.inc.php
>  %%WWWDIR%%/html/includes/graphs/application/postgresql_connects.inc.php
>  %%WWWDIR%%/html/includes/graphs/application/postgresql_queries.inc.php
> @@ -1838,7 +1986,6 @@
>  %%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
>  %%WWWDIR%%/html/includes/graphs/device/asyncos_workq.inc.php
> @@ -1863,7 +2010,6 @@
>  %%WWWDIR%%/html/includes/graphs/device/diskio_common.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/diskio_ops.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/edac_errors.inc.php
> -%%WWWDIR%%/html/includes/graphs/device/fdb_count.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/firewall_sessions_ipv4.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/fortigate_cpu.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/fortigate_sessions.inc.php
> @@ -1955,6 +2101,17 @@
>  %%WWWDIR%%/html/includes/graphs/device/nfsen_traffic.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/pagecount.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/panos_sessions.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
> +%%WWWDIR%%/html/includes/graphs/device/printersupplies_drum.inc.php
> +%%WWWDIR%%/html/includes/graphs/device/printersupplies_fuser.inc.php
> +%%WWWDIR%%/html/includes/graphs/device/printersupplies_ink.inc.php
> +%%WWWDIR%%/html/includes/graphs/device/printersupplies_other.inc.php
> +%%WWWDIR%%/html/includes/graphs/device/printersupplies_toner.inc.php
> +%%WWWDIR%%/html/includes/graphs/device/printersupplies_transferunit.inc.php
> +%%WWWDIR%%/html/includes/graphs/device/printersupplies_wasteink.inc.php
> +%%WWWDIR%%/html/includes/graphs/device/printersupplies_wastetoner.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/processor.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/processor_separate.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/processor_stack.inc.php
> @@ -1969,7 +2126,6 @@
>  %%WWWDIR%%/html/includes/graphs/device/smokeping_out_all_avg.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/status.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/storage.inc.php
> -%%WWWDIR%%/html/includes/graphs/device/toner.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/transferroller.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/ucd_cpu.inc.php
>  %%WWWDIR%%/html/includes/graphs/device/ucd_io.inc.php
> @@ -1983,6 +2139,7 @@
>  %%WWWDIR%%/html/includes/graphs/diskio/auth.inc.php
>  %%WWWDIR%%/html/includes/graphs/diskio/bits.inc.php
>  %%WWWDIR%%/html/includes/graphs/diskio/ops.inc.php
> +%%WWWDIR%%/html/includes/graphs/diskio/stat.inc.php
>  %%WWWDIR%%/html/includes/graphs/eigrpport/auth.inc.php
>  %%WWWDIR%%/html/includes/graphs/eigrpport/packets.inc.php
>  %%WWWDIR%%/html/includes/graphs/functions.inc.php
> @@ -2008,9 +2165,6 @@
>  %%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
> @@ -2038,6 +2192,7 @@
>  %%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-sensor/stacked.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
> @@ -2049,6 +2204,7 @@
>  %%WWWDIR%%/html/includes/graphs/netscalersvc/conns.inc.php
>  %%WWWDIR%%/html/includes/graphs/netscalersvc/pkts.inc.php
>  %%WWWDIR%%/html/includes/graphs/netscalersvc/reqs.inc.php
> +%%WWWDIR%%/html/includes/graphs/netscalersvc/surge.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
> @@ -2095,6 +2251,8 @@
>  %%WWWDIR%%/html/includes/graphs/port/percent.inc.php
>  %%WWWDIR%%/html/includes/graphs/port/pktsize.inc.php
>  %%WWWDIR%%/html/includes/graphs/port/upkts.inc.php
> +%%WWWDIR%%/html/includes/graphs/printersupply/auth.inc.php
> +%%WWWDIR%%/html/includes/graphs/printersupply/usage.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
> @@ -2108,14 +2266,17 @@
>  %%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/crestfactor.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/illuminance.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/powerfactor.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
> @@ -2123,7 +2284,9 @@
>  %%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/velocity.inc.php
>  %%WWWDIR%%/html/includes/graphs/sensor/voltage.inc.php
> +%%WWWDIR%%/html/includes/graphs/sensor/volume.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
> @@ -2137,8 +2300,6 @@
>  %%WWWDIR%%/html/includes/graphs/status/graph.inc.php
>  %%WWWDIR%%/html/includes/graphs/storage/auth.inc.php
>  %%WWWDIR%%/html/includes/graphs/storage/usage.inc.php
> -%%WWWDIR%%/html/includes/graphs/toner/auth.inc.php
> -%%WWWDIR%%/html/includes/graphs/toner/usage.inc.php
>  %%WWWDIR%%/html/includes/graphs/vserver/auth.inc.php
>  %%WWWDIR%%/html/includes/graphs/vserver/bits.inc.php
>  %%WWWDIR%%/html/includes/graphs/vserver/conns.inc.php
> @@ -2158,6 +2319,7 @@
>  %%WWWDIR%%/html/includes/graphs/wifiradio/rxerrors.inc.php
>  %%WWWDIR%%/html/includes/map/google-mc.inc.php
>  %%WWWDIR%%/html/includes/map/google.inc.php
> +%%WWWDIR%%/html/includes/map/leaflet.inc.php
>  %%WWWDIR%%/html/includes/navbar.inc.php
>  %%WWWDIR%%/html/includes/panels/default.inc.php
>  %%WWWDIR%%/html/includes/port-edit.inc.php
> @@ -2167,7 +2329,6 @@
>  %%WWWDIR%%/html/includes/print-accesspoint.inc.php
>  %%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-service.inc.php
>  %%WWWDIR%%/html/includes/print-vlan.inc.php
>  %%WWWDIR%%/html/includes/print-vrf.inc.php
> @@ -2182,6 +2343,7 @@
>  %%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/logalert.inc.php
>  %%WWWDIR%%/html/includes/print/mac_addresses.inc.php
>  %%WWWDIR%%/html/includes/print/navbar.inc.php
>  %%WWWDIR%%/html/includes/print/neighbours.inc.php
> @@ -2197,6 +2359,8 @@
>  %%WWWDIR%%/html/includes/search/sensors.inc.php
>  %%WWWDIR%%/html/includes/search/status.inc.php
>  %%WWWDIR%%/html/includes/service-delete.inc.php
> +%%WWWDIR%%/html/includes/status-donuts.inc.php
> +%%WWWDIR%%/html/includes/status-portpercent.inc.php
>  %%WWWDIR%%/html/includes/status-summary.inc.php
>  %%WWWDIR%%/html/index.php
>  %%WWWDIR%%/html/js/Bs_Button.class.js
> @@ -2207,12 +2371,21 @@
>  %%WWWDIR%%/html/js/bootstrap-button.js
>  %%WWWDIR%%/html/js/bootstrap-datetimepicker.min.js
>  %%WWWDIR%%/html/js/bootstrap-modal.js
> +%%WWWDIR%%/html/js/bootstrap-select.js
>  %%WWWDIR%%/html/js/bootstrap-select.min.js
>  %%WWWDIR%%/html/js/bootstrap-show-password.min.js
>  %%WWWDIR%%/html/js/bootstrap-switch.min.js
>  %%WWWDIR%%/html/js/bootstrap-tab.js
> +%%WWWDIR%%/html/js/bootstrap-tagsinput.js
> +%%WWWDIR%%/html/js/bootstrap-tagsinput.min.js
>  %%WWWDIR%%/html/js/bootstrap-tooltip.js
>  %%WWWDIR%%/html/js/bootstrap.min.js
> +%%WWWDIR%%/html/js/c3.min.js
> +%%WWWDIR%%/html/js/clipboard.min.js
> +%%WWWDIR%%/html/js/d3.min.js
> +%%WWWDIR%%/html/js/d3.v3.min.js
> +%%WWWDIR%%/html/js/donut-chart.js
> +%%WWWDIR%%/html/js/dygraph-combined.js
>  %%WWWDIR%%/html/js/google-code-prettify.js
>  %%WWWDIR%%/html/js/google/markerclusterer.js
>  %%WWWDIR%%/html/js/html5shiv.min.js
> @@ -2256,6 +2429,7 @@
>  %%WWWDIR%%/html/js/jquery.bootstrap-growl.js
>  %%WWWDIR%%/html/js/jquery.min.js
>  %%WWWDIR%%/html/js/jquery.qtip.min.js
> +%%WWWDIR%%/html/js/leaflet.js
>  %%WWWDIR%%/html/js/mktree.js
>  %%WWWDIR%%/html/js/observium-entities.js
>  %%WWWDIR%%/html/js/observium-screen.js
> @@ -2275,11 +2449,13 @@
>  %%WWWDIR%%/html/js/sorttable.js
>  %%WWWDIR%%/html/js/tw-sack.js
>  %%WWWDIR%%/html/js/twitter-bootstrap-hover-dropdown.min.js
> +%%WWWDIR%%/html/js/typeahead.bundle.js
> +%%WWWDIR%%/html/js/typeahead.bundle.min.js
>  %%WWWDIR%%/html/map.php
> -%%WWWDIR%%/html/netcmd.php
>  %%WWWDIR%%/html/pages/.htaccess
>  %%WWWDIR%%/html/pages/about.inc.php
>  %%WWWDIR%%/html/pages/add_alert_check.inc.php
> +%%WWWDIR%%/html/pages/add_syslog_rule.inc.php
>  %%WWWDIR%%/html/pages/addhost.inc.php
>  %%WWWDIR%%/html/pages/addsrv.inc.php
>  %%WWWDIR%%/html/pages/adduser.inc.php
> @@ -2292,8 +2468,6 @@
>  %%WWWDIR%%/html/pages/apps/default.inc.php
>  %%WWWDIR%%/html/pages/apps/overview.inc.php
>  %%WWWDIR%%/html/pages/authlog.inc.php
> -%%WWWDIR%%/html/pages/blank.inc.php
> -%%WWWDIR%%/html/pages/configuration.inc.php
>  %%WWWDIR%%/html/pages/contact.inc.php
>  %%WWWDIR%%/html/pages/contacts.inc.php
>  %%WWWDIR%%/html/pages/customers.inc.php
> @@ -2310,6 +2484,7 @@
>  %%WWWDIR%%/html/pages/device/apps/app_navbar.inc.php
>  %%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/drbd.inc.php
>  %%WWWDIR%%/html/pages/device/apps/exchange.inc.php
>  %%WWWDIR%%/html/pages/device/apps/exim-mailqueue.inc.php
> @@ -2317,6 +2492,7 @@
>  %%WWWDIR%%/html/pages/device/apps/jvmoverjmx.inc.php
>  %%WWWDIR%%/html/pages/device/apps/kamailio.inc.php
>  %%WWWDIR%%/html/pages/device/apps/lighttpd.inc.php
> +%%WWWDIR%%/html/pages/device/apps/lvs_stats.inc.php
>  %%WWWDIR%%/html/pages/device/apps/mailscanner.inc.php
>  %%WWWDIR%%/html/pages/device/apps/memcached.inc.php
>  %%WWWDIR%%/html/pages/device/apps/mssql.inc.php
> @@ -2332,6 +2508,7 @@
>  %%WWWDIR%%/html/pages/device/apps/ntpd.inc.php
>  %%WWWDIR%%/html/pages/device/apps/openvpn.inc.php
>  %%WWWDIR%%/html/pages/device/apps/postfix_mailgraph.inc.php
> +%%WWWDIR%%/html/pages/device/apps/postfix_qshape.inc.php
>  %%WWWDIR%%/html/pages/device/apps/postgresql.inc.php
>  %%WWWDIR%%/html/pages/device/apps/powerdns-recursor.inc.php
>  %%WWWDIR%%/html/pages/device/apps/powerdns.inc.php
> @@ -2364,24 +2541,6 @@
>  %%WWWDIR%%/html/pages/device/edit/wmi.inc.php
>  %%WWWDIR%%/html/pages/device/entphysical.inc.php
>  %%WWWDIR%%/html/pages/device/graphs.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/cpu.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/fortigate-sessions.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/hrprocesses.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/hrusers.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/ipSytemStats.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/memory.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/netstats.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/netstats_icmp_info.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/netstats_icmp_stat.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/netstats_ip.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/netstats_snmp.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/netstats_tcp.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/netstats_udp.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/screenos-sessions.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/screenos.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/sonicwall-sessions.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/uptime.inc.php
> -%%WWWDIR%%/html/pages/device/graphs/wireless.inc.php
>  %%WWWDIR%%/html/pages/device/health.inc.php
>  %%WWWDIR%%/html/pages/device/health/dbm.inc.php
>  %%WWWDIR%%/html/pages/device/health/diskio.inc.php
> @@ -2395,6 +2554,7 @@
>  %%WWWDIR%%/html/pages/device/logs.inc.php
>  %%WWWDIR%%/html/pages/device/logs/alertlog.inc.php
>  %%WWWDIR%%/html/pages/device/logs/eventlog.inc.php
> +%%WWWDIR%%/html/pages/device/logs/logalert.inc.php
>  %%WWWDIR%%/html/pages/device/logs/syslog.inc.php
>  %%WWWDIR%%/html/pages/device/munin.inc.php
>  %%WWWDIR%%/html/pages/device/nfsen.inc.php
> @@ -2409,6 +2569,7 @@
>  %%WWWDIR%%/html/pages/device/overview/information_extended.inc.php
>  %%WWWDIR%%/html/pages/device/overview/mempools.inc.php
>  %%WWWDIR%%/html/pages/device/overview/ports.inc.php
> +%%WWWDIR%%/html/pages/device/overview/printersupplies.inc.php
>  %%WWWDIR%%/html/pages/device/overview/processors-unix.inc.php
>  %%WWWDIR%%/html/pages/device/overview/processors.inc.php
>  %%WWWDIR%%/html/pages/device/overview/sensors.inc.php
> @@ -2416,7 +2577,6 @@
>  %%WWWDIR%%/html/pages/device/overview/status.inc.php
>  %%WWWDIR%%/html/pages/device/overview/storage.inc.php
>  %%WWWDIR%%/html/pages/device/overview/syslog.inc.php
> -%%WWWDIR%%/html/pages/device/overview/toner.inc.php
>  %%WWWDIR%%/html/pages/device/overview/ucd_mem.inc.php
>  %%WWWDIR%%/html/pages/device/p2pradios.inc.php
>  %%WWWDIR%%/html/pages/device/packages.inc.php
> @@ -2442,6 +2602,8 @@
>  %%WWWDIR%%/html/pages/device/ports/adsl.inc.php
>  %%WWWDIR%%/html/pages/device/ports/arp.inc.php
>  %%WWWDIR%%/html/pages/device/ports/fdb.inc.php
> +%%WWWDIR%%/html/pages/device/ports/ipv4.inc.php
> +%%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/printing.inc.php
> @@ -2479,11 +2641,11 @@
>  %%WWWDIR%%/html/pages/graphs.inc.php
>  %%WWWDIR%%/html/pages/health.inc.php
>  %%WWWDIR%%/html/pages/health/mempool.inc.php
> +%%WWWDIR%%/html/pages/health/printersupplies.inc.php
>  %%WWWDIR%%/html/pages/health/processor.inc.php
>  %%WWWDIR%%/html/pages/health/sensors.inc.php
>  %%WWWDIR%%/html/pages/health/status.inc.php
>  %%WWWDIR%%/html/pages/health/storage.inc.php
> -%%WWWDIR%%/html/pages/health/toner.inc.php
>  %%WWWDIR%%/html/pages/iftype.inc.php
>  %%WWWDIR%%/html/pages/inventory.inc.php
>  %%WWWDIR%%/html/pages/locations.inc.php
> @@ -2521,7 +2683,10 @@
>  %%WWWDIR%%/html/pages/settings/default.inc.php
>  %%WWWDIR%%/html/pages/slas.inc.php
>  %%WWWDIR%%/html/pages/syslog.inc.php
> +%%WWWDIR%%/html/pages/syslog_alerts.inc.php
> +%%WWWDIR%%/html/pages/syslog_rules.inc.php
>  %%WWWDIR%%/html/pages/usermenu.inc.php
> +%%WWWDIR%%/html/pages/vms.inc.php
>  %%WWWDIR%%/html/pdf.php
>  %%WWWDIR%%/html/robots.txt
>  %%WWWDIR%%/includes/alerting/clickatell.inc.php
> @@ -2535,7 +2700,8 @@
>  %%WWWDIR%%/includes/alerting/slack.inc.php
>  %%WWWDIR%%/includes/alerting/smsbox.inc.php
>  %%WWWDIR%%/includes/alerting/telegram.inc.php
> -%%WWWDIR%%/includes/alerting/webhook.inc.php
> +%%WWWDIR%%/includes/alerting/victorops.inc.php
> +%%WWWDIR%%/includes/alerting/webhook-old.inc.php
>  %%WWWDIR%%/includes/alerting/xmpp.inc.php
>  %%WWWDIR%%/includes/alerts.inc.php
>  %%WWWDIR%%/includes/common.inc.php
> @@ -2545,6 +2711,7 @@
>  %%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/version.inc.php
> @@ -2557,8 +2724,10 @@
>  %%WWWDIR%%/includes/discovery/functions.inc.php
>  %%WWWDIR%%/includes/discovery/graphs.inc.php
>  %%WWWDIR%%/includes/discovery/inventory.inc.php
> +%%WWWDIR%%/includes/discovery/inventory/dell-rac-mib.inc.php
>  %%WWWDIR%%/includes/discovery/inventory/e7-calix-mib.inc.php
>  %%WWWDIR%%/includes/discovery/inventory/entity-mib.inc.php
> +%%WWWDIR%%/includes/discovery/inventory/f5-bigip-system-mib.inc.php
>  %%WWWDIR%%/includes/discovery/inventory/foundry-sn-agent-mib.inc.php
>  %%WWWDIR%%/includes/discovery/inventory/geist-mib-v3.inc.php
>  %%WWWDIR%%/includes/discovery/inventory/host-resources-mib.inc.php
> @@ -2566,17 +2735,23 @@
>  %%WWWDIR%%/includes/discovery/inventory/mikrotik-mib.inc.php
>  %%WWWDIR%%/includes/discovery/inventory/oneaccess-sys-mib.inc.php
>  %%WWWDIR%%/includes/discovery/inventory/timetra-chassis-mib.inc.php
> -%%WWWDIR%%/includes/discovery/ipv4-addresses.inc.php
> -%%WWWDIR%%/includes/discovery/ipv6-addresses.inc.php
>
> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
> _______________________________________________
> svn-ports-all@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-ports-all
> To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
>




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b8e9e916-5db7-6ba7-17d6-5a7608a0dace>