Fix status_rrd_graph_img.php and also improve it:
- Remove escapeshellarg that broke command line- Only remove dangerous chars to avoid command injection- Replace all `hostname` calls by php_uname('n')- Replace all `date` calls by strftime()- Add $_gb to collect possibly garbage from exec return
Make sure variables are escaped, also replace exec calls to run rm by unlink_if_exists()
Remove useless code, variable is set again on next line
Errors in in graph calculations
This is the version for 2.1 branch corresponding to https://github.com/pfsense/pfsense/commit/f9983a874d6acf5fcf08a08606a6d19624af4438
Clarify that the graph is for mbuf clusters
3652 days worth is a too much. Scale it back to more reasonable 1.25 x maximum used data (2284 days).
Use default RRD colors that are a little more visually distinct. Add some better comments/labels to make it easier for people to help customize and tweak the colors. Suggestions welcome.
This is not a percentage
Use some easier to distinguish colors for mbuf graph
Add an RRD graph for MBUFs under system. Tweaks welcome.
Adjust archives array values to match sizes for average calculation.
Archive start is “now” minus archive length. Not “end” minus archive length. Sometimes "end" is not "now".
RRD Specify RRA and Resolution
Don't leave it up to RRD Tool to select the RRA and resolution to use.Specify the RRA and resolution to use per the graph havg value.
Set global $g to use right theme
Stack the queue graphs. Fixes #2692
In the case that no bandwidth limits are configured for queues but PRIQ is been used then rather set a default otherwise a value of 0 is used in the CDEFs for RRD
Add 3G statistics for Huawei modems, split the Cellular stats out to per interface instead of global.
The function split() is replaced by the function explode(). Starting with PHP 5.3 this is deprecated and with version 6 gone.Replacing it surpresses all the warnings
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
Remove decimals from cumulative users graph.
Increase the minimum time between generating images from 5 to 15 seconds to prevent DoS the firewall.
Fix packet graph label alignment
Fix the graph label alignment
Use base 1000 on user graphs and display cumulative of Total users logged in over the 'x' period.
Conflicts: usr/local/www/status_rrd_graph_img.php
Set default colors explicity, the theme can then override them. This prevents missing colors in themes from crashing the graphs.
If the rrd multiplier is negative, use 5% for out instead of 95% for the 95th percentile line.
Conflicts: etc/inc/filter.inc usr/local/www/themes/the_wall/rrdcolors.inc.php
Try again to fix the calculation for out bits 95th percentile. (Works for me)
Apparently rrdtool VDEF functions can't take a multiplier, only CDEF. Fixes traffic graphs.
Add missing color, add multiplier to calculus for inverting line
Fix spamd rrd graph command.
Conflicts: etc/inc/rrd.inc usr/local/www/interfaces.php
Add Total number of CP users graph
Fix merge conflict
Fix ticket #1354
Unbreak the rrd graph img page
Conflicts: usr/local/www/status_rrd_graph_img.php usr/local/www/themes/pfsense_ng/rrdcolors.inc.php
Add the 95th percentile line to the traffic graphs
Adjust layout
Add the IPv6 counters to the packets graph, also make all traffic counters stack
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 usefulOther themes still need adjustingPackets graph isn't done, that needs the same modification as the traffic counters....
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.
Add missing semicolon.
Reinvent the 8 hour graph period, this one should work properly, needs test
Change the require() to require_once()
Use www_path here instead of a relative path.
Use correct name for include
We need to require the globals include for finding our theme specific rrd color includes.
Modify various (s)printf format strings to allow translations to change the order of the inserted strings.
Fix printf/sprintf mixups.
Merge remote branch 'mainline/master'
Conflicts: usr/local/www/services_rfc2136.php usr/local/www/services_snmp.php usr/local/www/status_rrd_graph.php usr/local/www/status_rrd_graph_settings.php
Correct my email address, adjust copyright to 2010
Add the openvpn users graph, add the colors to all the themes colors include. Add vpn tabon the settings page, it didn't show although it should.
Fix the glob() to return only the files, not the pathnames, use chdir()before.Fix a possible injection of ../ in the database path by using basename()Fix the week graph math so it is correct.
Implement gettext() calls on status_rrd_graph_img.php
round the date calculation result so that it results in 1 month insteadof 4 weeks which looks strange.
Remove debugging lineImprove the scale so that it matches up the length of the period.Style fixes
Improve the RRD graph display
Missing counter variable initialization.
fix RRD graphs for queues
Add graphing for 3G cellular modems.
Include needed files. Ticket #209.
Fixup the wireless graph, not sure if many people ever saw it, considering it was included in 1.2 and up but did not look very pretty.Greatly enhanced the readability by setting up the default colors better and increasing the line thickness to 2.
Include necessary shaper.inc for read_altq_config.
Rework includes/require. This saves about 4 megabytes.Simplify get_memory(). Tested on mips/i386
Add pfSense_BUILDER_BINARIES: and pfSense_MODULE:. Adjust Copyright to include 2009 on files that I have asserted (C) on
Use nice -n20 for common launched items
Fixed the outbound macro for displaying the outbound interfaces with the Quality GraphsMake sure we show either the gateway name or interface name on the graph top header
Correct the label name for the out pass traffic
Add block stats to the graphsFix stay '
Remove stray '
add, don't multiply
Always return text string
Restore humantime algorithm
fix layout and stray '
+ 0
reformat the the entire rrd graph generation page.
Multiply delay value from rrd by 1000 to get milliseconds
Switch over to apinger rrd files.
Fix graph totals calculus
Revert this to allow graphs to work.
Add detailed memory usage RRD graph.Modifications by Nathan Moinvaziri (nathan@nathanm.com) to add
Remove rrd files every time the wizard changes(for now).
Show the graph upside since we only show agraph for a interface now.
Use correct var
Fix math on throughput graph
Fix Spacing for wireless graph
Fix Spelling
Add correctly.
Add page title.
Remove size headers since they seem to screw up IE
Fix layout and units
Commit wireless frontend code
Quality graph alignment
Add rrd graph settings page.Bump config out of line with 1.2Add rrd config upgrade code.