pfSense

Escape the shell variable

Correct the rrd update command

Add 3G statistics for Huawei modems, split the Cellular stats out to per interface instead of global.

log_error if rrdtool restore calls fail

add -f to 'rrdtool restore' call

Delete any existing /var/db/rrd/*.rrd files before restoring from the XML

Feature #2123 Backup RRD files using the xml dump and restore from RRD tools

http://redmine.pfsense.org/issues/2123

Merge remote-tracking branch 'upstream/master'

Conflicts:
etc/inc/easyrule.inc
etc/inc/filter.inc
etc/inc/interfaces.inc
etc/inc/services.inc
etc/inc/xmlrpc_client.inc
usr/local/www/fbegin.inc
usr/local/www/services_dhcp.php

Merge remote branch 'upstream/master'

Conflicts:
conf.default/config.xml
etc/inc/filter.inc
etc/inc/globals.inc
etc/inc/pfsense-utils.inc
etc/inc/upgrade_config.inc
usr/local/www/interfaces.php

Fix my traffic graphs

Merge remote-tracking branch 'mainline/master' into inc

Unset the correct variables

Make it so that we use the correct fields in the right order

Fix syntax error/typo. Fixes #1372

Merge remote-tracking branch 'mainline/master' into inc

Merge remote branch 'upstream/master'

Remove Total users graph this has become redundant and replaced with a cumulative result.

Merge remote branch 'upstream/master'

Merge remote branch 'upstream/master'

Conflicts:
etc/inc/filter.inc
usr/local/www/themes/the_wall/rrdcolors.inc.php

Merge remote-tracking branch 'mainline/master' into inc

Conflicts:
etc/inc/shaper.inc

Add -a to include all updaterrd.sh scripts running and also remove top killing since its not used anymore in stat gathering.

Merge remote-tracking branch 'mainline/master' into inc

Use a different loop counter variable to avoid a name collision

Merge remote-tracking branch 'mainline/master' into inc

Conflicts:
etc/inc/interfaces.inc
etc/inc/priv.defs.inc
etc/inc/shaper.inc
etc/inc/system.inc

Merge remote-tracking branch 'mainline/master' into inc

Conflicts:
etc/inc/auth.inc
etc/inc/config.lib.inc
etc/inc/filter.inc
etc/inc/pfsense-utils.inc
etc/inc/pkg-utils.inc
etc/inc/priv.defs.inc
etc/inc/services.inc...

Merge remote branch 'upstream/master'

Conflicts:
etc/inc/rrd.inc
usr/local/www/interfaces.php

Read data into variables before passing to rrdtool, so it's easier to extend this to store data elsewhere in addition to (or instead of) rrdtool. Also, switch to using cpustats for CPU statistics instead of top.

Add Total number of CP users graph

unbreak the broken merge

Possible double RRD process fix.

Merge remote branch 'upstream/master'

Conflicts:
etc/inc/rrd.inc

Keep the output in a variable before passing it to rrdtool in case we also want to pass it to something else.

Only run pfctl once per interface for stats, rather than four times.

Alter the traffic collector kill function, alter the output of top from a pipe to a file. We can now have /tmp/top_output.txt for status

Fix the TERM setting in the updaterrd script. Only get the last part of the top outpuT

Add a newline to this command

Merge remote branch 'upstream/master'

kill rrdtool before killing shellscripts

Simplify the updaterrd.sh to reduce the amount of pfctl calls

Add support for IPv6 counters to the RRD graphs. This adds 4 more data sources in the rrd file.
The graphing code colors are currently a mismatch and sorts waiting for someone with eyes to adjust to something useful
Other themes still need adjusting
Packets graph isn't done, that needs the same modification as the traffic counters....

Merge branch 'master' into inc

Conflicts:
etc/inc/captiveportal.inc
etc/inc/config.console.inc
etc/inc/config.lib.inc
etc/inc/easyrule.inc
etc/inc/filter.inc
etc/inc/ipsec.inc
etc/inc/pkg-utils.inc
etc/inc/shaper.inc...

Added Captive Portal RRD graphs, there are two graphs one for the number of logged in users since last rrd poll, and concurrent number of users logged in.

Fix case for disabling RRD graphing for spamd package.

Remove trailing carriage return

Fix quotes to use %N$X on gettext calls

Fix gettext calls with printf to permit change strings order

Merge remote branch 'mainline/master' into inc

Conflicts:
etc/inc/interfaces.inc

Revert the top field change shift as these break a lot of other installs.

Shift the fields from "top" once more to get our processor statistics back

Apparently we use domain sockets now for collecting user statistics. This was causing the nc command to wait very long for a timeout and essentially destroy the graphing backend and the openvpn user statistics in the process

Implement gettext() calls on rrd.inc

chown the RRD path on every call, not just when initially creating the RRD directory. Also, chown the resulting rrd files.

When creating /var/db/rrd, make sure it's writable by wheel, and owned by nobody, or apinger can't create the quality graphs.

Shift all the top fields by one, seems like top output has changed.

Correct my email address, adjust copyright to 2010

Add OpenVPN users database, sync the tabs on the settings page.
Graphing page doesn't know about openvpn users yet. But that's ok.

Add OpenVPN traffic statistics for all configured OpenVPN server
instances, this adds traffic and packets.

Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp

Conflicts:
etc/inc/interfaces.inc
etc/inc/pfsense-utils.inc

Silence is better for this command.

First steps for 3g serviceproviders support

o Move xml2array from rrd.inc to pfsense-utils.inc because it'll be used
on non-rrd related places
o Add necessary require_once() calls to pfsense-utils.inc on places that
are calling xml2array()
o Add serviceproviders.xml, obtained from [1]...

Change the exec() calls to mwexec, this supresses the rrdtool messages during boot if the rrd files have a newer timestamp then the attempt to update

must use -f with pkill to find updaterrd.sh

Ticket #435. Correct command.

Use pgrep/pkill to save a bit of cpu.

Make get_real_interface return real interface enc0 for "ipsec". Refactor enable_rrd_graphing() to
use get_configured_interface_with_descr()

Also match umodem for the UM175 unit.

Add graphing for 3G cellular modems.

Make sure to surpress stderr

Make sure that do not set the interface to a empty value, this affects the ipsec counters.

Use the list sta output instead of list ap which we used before.
Still need to check if this also results in the right values being graphed, takes some time to confirm.

Make sure the right wireless interface is polled for the graphs

Rework includes/require. This saves about 4 megabytes.
Simplify get_memory(). Tested on mips/i386

Add pfSense_BUILDER_BINARIES: and pfSense_MODULE: additions

Only blast rrd upgrade notice to wall once

Move upgrade wall message to the correct function (migrate_rrd_format())

Oops, add needed echo ''

Broadcast to all ttys that a RRD upgrade is in progress.

• Move functions that output html to guiconfig.inc
• Remove some recursive dependency on some includes
• Remove ^M or \r from files
• Remove some entries from functions.inc to avoid including them twice
• Remove some unneccessary includes from some files
  ...

Rewrite the rrd upgrade code to use the newly added xml2array function specifically for the rrd upgrade code.
This is about 4 times faster then our builtin parser. Hoping this can solve part of the the 45 minute upgrade cycles on
embedded builds

Use nice -n20 for common launched items

Add missing brace

Final attempt at making rows merger work before I throw in the towel.
Empty rows need to proceed the old data when growing the RRA archive

Set more default values

Change RRA 12 hour archive to 3000, drop the 1 day archive for new databases

Add kill_traffic_collector()

Add enable_rrd_graphing();

Surpress rm output

Add 0 values when the original also had values on that row so the graph math works.

Add logging

set rrdtool variable

Add some rrd realted functions in a seperate file