Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Escape the shell variable | smos | 2012-06-02 | 1 | -1/+1 |
| | |||||
* | Correct the rrd update command | smos | 2012-05-21 | 1 | -2/+2 |
| | |||||
* | Add 3G statistics for Huawei modems, split the Cellular stats out to per ↵ | smos | 2012-05-21 | 1 | -28/+26 |
| | | | | interface instead of global. | ||||
* | log_error if rrdtool restore calls fail | Darren Embry | 2012-05-17 | 1 | -1/+7 |
| | |||||
* | add -f to 'rrdtool restore' call | Darren Embry | 2012-05-17 | 1 | -1/+1 |
| | |||||
* | Delete any existing /var/db/rrd/*.rrd files before restoring from the XML | Phil Davis | 2012-04-23 | 1 | -0/+3 |
| | |||||
* | Feature #2123 Backup RRD files using the xml dump and restore from RRD tools | Darren Embry | 2012-04-12 | 1 | -11/+28 |
| | | | | http://redmine.pfsense.org/issues/2123 | ||||
* | Merge remote-tracking branch 'upstream/master' | jim-p | 2011-07-12 | 1 | -8/+8 |
|\ | | | | | | | | | | | | | | | | | | | | | 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-tracking branch 'mainline/master' into inc | Vinicius Coque | 2011-05-25 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'mainline/master' into inc | Vinicius Coque | 2011-05-23 | 1 | -35/+0 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'mainline/master' into inc | Vinicius Coque | 2011-04-04 | 1 | -2/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/shaper.inc | ||||
| * \ \ \ | Merge remote-tracking branch 'mainline/master' into inc | Vinicius Coque | 2011-03-31 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'mainline/master' into inc | Vinicius Coque | 2011-03-25 | 1 | -20/+57 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | Vinicius Coque | 2011-03-25 | 1 | -6/+13 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 etc/inc/shaper.inc etc/inc/voucher.inc etc/inc/vpn.inc usr/local/www/fbegin.inc | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into inc | Vinicius Coque | 2011-01-28 | 1 | -1/+78 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 etc/inc/system.inc etc/inc/voucher.inc | ||||
| * | | | | | | | | Fix quotes to use %N$X on gettext calls | Renato Botelho | 2010-10-01 | 1 | -5/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix gettext calls with printf to permit change strings order | Renato Botelho | 2010-08-30 | 1 | -5/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge remote branch 'mainline/master' into inc | Renato Botelho | 2010-08-30 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/interfaces.inc | ||||
| * | | | | | | | | | Implement gettext() calls on rrd.inc | Carlos Eduardo Ramos | 2010-08-17 | 1 | -8/+8 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge remote branch 'upstream/master' | jim-p | 2011-06-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 syntax error/typo. Fixes #1372 | jim-p | 2011-05-24 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Fix my traffic graphs | Seth Mos | 2011-05-26 | 1 | -17/+11 |
| | | | | | | | | | |||||
* | | | | | | | | | Unset the correct variables | Seth Mos | 2011-05-25 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Make it so that we use the correct fields in the right order | Seth Mos | 2011-05-24 | 1 | -4/+16 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge remote branch 'upstream/master' | jim-p | 2011-05-19 | 1 | -35/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Remove Total users graph this has become redundant and replaced with a ↵ | Warren Baker | 2011-05-16 | 1 | -35/+0 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | cumulative result. | ||||
* | | | | | | | | Merge remote branch 'upstream/master' | Seth Mos | 2011-04-12 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Add -a to include all updaterrd.sh scripts running and also remove top ↵ | Ermal | 2011-04-04 | 1 | -2/+1 |
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | killing since its not used anymore in stat gathering. | ||||
* | | | | | | | Merge remote branch 'upstream/master' | Seth Mos | 2011-04-12 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/filter.inc usr/local/www/themes/the_wall/rrdcolors.inc.php | ||||
| * | | | | | | Use a different loop counter variable to avoid a name collision | jim-p | 2011-03-30 | 1 | -3/+3 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge remote branch 'upstream/master' | Seth Mos | 2011-03-24 | 1 | -21/+57 |
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etc/inc/rrd.inc usr/local/www/interfaces.php | ||||
| * | | | | | Read data into variables before passing to rrdtool, so it's easier to extend ↵ | jim-p | 2011-03-18 | 1 | -19/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | Warren Baker | 2011-03-17 | 1 | -3/+40 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Possible double RRD process fix. | smos | 2011-03-09 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | unbreak the broken merge | Seth Mos | 2011-03-09 | 1 | -8/+0 |
| | | | | | |||||
* | | | | | Merge remote branch 'upstream/master' | Seth Mos | 2011-03-08 | 1 | -0/+8 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: etc/inc/rrd.inc | ||||
| * | | | | Keep the output in a variable before passing it to rrdtool in case we also ↵ | jim-p | 2011-03-08 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | want to pass it to something else. | ||||
| * | | | | Only run pfctl once per interface for stats, rather than four times. | jim-p | 2011-03-08 | 1 | -4/+7 |
| | |_|/ | |/| | | |||||
* | | | | Alter the traffic collector kill function, alter the output of top from a ↵ | Seth Mos | 2011-02-02 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | 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 ↵ | Seth Mos | 2011-02-02 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | top outpuT | ||||
* | | | | Add a newline to this command | Seth Mos | 2011-02-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge remote branch 'upstream/master' | Seth Mos | 2011-02-01 | 1 | -0/+77 |
|\ \ \ \ | |/ / / | |||||
| * | | | Added Captive Portal RRD graphs, there are two graphs one for the number of ↵ | Warren Baker | 2011-01-28 | 1 | -0/+77 |
| | | | | | | | | | | | | | | | | logged in users since last rrd poll, and concurrent number of users logged in. | ||||
* | | | | kill rrdtool before killing shellscripts | Seth Mos | 2011-02-01 | 1 | -0/+2 |
| | | | | |||||
* | | | | Simplify the updaterrd.sh to reduce the amount of pfctl calls | Seth Mos | 2011-02-01 | 1 | -8/+2 |
| | | | | |||||
* | | | | Add support for IPv6 counters to the RRD graphs. This adds 4 more data ↵ | Seth Mos | 2011-01-31 | 1 | -6/+18 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 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. updaterrd.sh shell script needs simplyfying and using variables instead of huge amounts of pfctl commands | ||||
* | | | Fix case for disabling RRD graphing for spamd package. | Erik Fonnesbeck | 2011-01-25 | 1 | -1/+1 |
| | | | |||||
* | | | Remove trailing carriage return | Scott Ullrich | 2010-11-10 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Revert the top field change shift as these break a lot of other installs. | smos | 2010-08-27 | 1 | -1/+1 |
| | | |||||
* | | Shift the fields from "top" once more to get our processor statistics back | smos | 2010-08-24 | 1 | -1/+1 |
| | |