Projet

Général

Profil

Télécharger (62,9 ko) Statistiques
| Branche: | Tag: | Révision:

univnautes / usr / local / www / status_rrd_graph_img.php @ 2d1e985d

# Date Auteur Commentaire
2d1e985d 19 juin 2014 17:23 Renato Botelho

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

aa27de6e 17 juin 2014 15:19 Renato Botelho

Make sure variables are escaped, also replace exec calls to run rm by unlink_if_exists()

592abfa4 17 juin 2014 15:18 Renato Botelho

Remove useless code, variable is set again on next line

edaa41be 27 février 2014 03:13 Phil Davis

Errors in in graph calculations

This is the version for 2.1 branch corresponding to https://github.com/pfsense/pfsense/commit/f9983a874d6acf5fcf08a08606a6d19624af4438

9e906c4d 05 août 2013 18:12 jim-p

Clarify that the graph is for mbuf clusters

f1c252cf 20 juillet 2013 02:15 N0YB

3652 days worth is a too much. Scale it back to more reasonable 1.25 x maximum used data (2284 days).

c2a58cd1 18 juillet 2013 20:31 jim-p

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.

bb236920 17 juillet 2013 17:51 jim-p

This is not a percentage

84962c63 16 juillet 2013 21:56 jim-p

Use some easier to distinguish colors for mbuf graph

ae9cb658 16 juillet 2013 20:14 jim-p

Add an RRD graph for MBUFs under system. Tweaks welcome.

24646d57 02 juillet 2013 00:42 N0YB

Adjust archives array values to match sizes for average calculation.

641f2f3c 02 juillet 2013 00:38 N0YB

Archive start is “now” minus archive length. Not “end” minus archive length. Sometimes "end" is not "now".

1e86f510 23 juin 2013 06:16 N0YB

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.

80feb8e5 14 février 2013 11:25 Renato Botelho

Set global $g to use right theme

401feeb3 10 janvier 2013 13:20 Warren Baker

Stack the queue graphs. Fixes #2692

b13a841b 09 janvier 2013 18:34 Warren Baker

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

5e589685 21 mai 2012 15:31 smos

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

cfbfd941 19 janvier 2012 20:33 smos

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

58005e52 01 juin 2011 15:00 jim-p

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

1a6cb6e7 26 mai 2011 13:41 Warren Baker

Remove decimals from cumulative users graph.

668ce1f9 26 mai 2011 10:14 Seth Mos

Increase the minimum time between generating images from 5 to 15 seconds to prevent DoS the firewall.

d67d99a1 26 mai 2011 10:13 Seth Mos

Fix packet graph label alignment

a63f2b7d 26 mai 2011 10:10 Seth Mos

Fix the graph label alignment

27d0722d 19 mai 2011 14:50 jim-p

Merge remote branch 'upstream/master'

73bf4a46 16 mai 2011 16:26 Warren Baker

Use base 1000 on user graphs and display cumulative of Total users logged in over the 'x' period.

dcb846e3 03 mai 2011 10:09 Seth Mos

Merge remote branch 'upstream/master'

Conflicts:
usr/local/www/status_rrd_graph_img.php

b01adece 02 mai 2011 21:32 jim-p

Set default colors explicity, the theme can then override them. This prevents missing colors in themes from crashing the graphs.

49825b17 02 mai 2011 20:36 jim-p

If the rrd multiplier is negative, use 5% for out instead of 95% for the 95th percentile line.

86966fba 12 avril 2011 10:39 Seth Mos

Merge remote branch 'upstream/master'

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

b4822548 31 mars 2011 19:08 jim-p

Try again to fix the calculation for out bits 95th percentile. (Works for me)

84575284 31 mars 2011 02:48 jim-p

Apparently rrdtool VDEF functions can't take a multiplier, only CDEF. Fixes traffic graphs.

cd2f60c9 30 mars 2011 18:22 smos

Add missing color, add multiplier to calculus for inverting line

92273f24 29 mars 2011 17:06 jim-p

Fix spamd rrd graph command.

126f5314 24 mars 2011 08:42 Seth Mos

Merge remote branch 'upstream/master'

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

7e5f3edb 17 mars 2011 11:21 Warren Baker

Add Total number of CP users graph

6f979763 16 mars 2011 22:05 Scott Ullrich

Fix merge conflict

505483ce 16 mars 2011 12:27 smos

Fix ticket #1354

354796f0 09 mars 2011 14:40 Seth Mos

Unbreak the rrd graph img page

15f2cdc3 09 mars 2011 13:53 Seth Mos

Merge remote branch 'upstream/master'

Conflicts:
usr/local/www/status_rrd_graph_img.php
usr/local/www/themes/pfsense_ng/rrdcolors.inc.php

a6917c65 09 mars 2011 11:58 smos

Add the 95th percentile line to the traffic graphs

7203754c 01 février 2011 15:28 Seth Mos

Merge remote branch 'upstream/master'

cebd086a 01 février 2011 15:23 Seth Mos

Adjust layout

bf7c1674 01 février 2011 15:16 Seth Mos

Add the IPv6 counters to the packets graph, also make all traffic counters stack

9bc8b6b6 31 janvier 2011 20:39 Seth Mos

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....

20413b72 28 janvier 2011 16:16 Warren Baker

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.

1e312328 22 décembre 2010 16:43 Erik Fonnesbeck

Add missing semicolon.

c7cfbbd8 20 décembre 2010 23:30 smos

Reinvent the 8 hour graph period, this one should work properly, needs test

5b9ba75a 27 août 2010 13:46 smos

Change the require() to require_once()

556687cf 26 août 2010 17:34 jim-p

Use www_path here instead of a relative path.

e80c551c 24 août 2010 21:07 Ermal

Use correct name for include

c6f4586c 24 août 2010 16:47 smos

We need to require the globals include for finding our theme specific rrd color includes.

ddc55e12 12 août 2010 06:18 Erik Fonnesbeck

Modify various (s)printf format strings to allow translations to change the order of the inserted strings.

3a3fb8ea 12 août 2010 00:15 Erik Fonnesbeck

Fix printf/sprintf mixups.

d9a0c4b8 26 juillet 2010 21:17 Vinicius Coque

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

6216690b 24 juillet 2010 22:10 smos

Correct my email address, adjust copyright to 2010

3869a323 24 juillet 2010 21:41 smos

Add the openvpn users graph, add the colors to all the themes colors include. Add vpn tab
on the settings page, it didn't show although it should.

002bc4ab 23 juillet 2010 09:59 smos

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.

51d4cad7 22 juillet 2010 15:10 Rafael Lucas

Implement gettext() calls on status_rrd_graph_img.php

0423bf2c 15 juillet 2010 20:43 smos

round the date calculation result so that it results in 1 month instead
of 4 weeks which looks strange.

161cd05c 15 juillet 2010 20:02 smos

Remove debugging line
Improve the scale so that it matches up the length of the period.
Style fixes

7d906758 15 juillet 2010 17:21 smos

Improve the RRD graph display

bb641bf8 15 février 2010 16:00 jim-p

Missing counter variable initialization.

eb1f8f8e 31 décembre 2009 21:23 Chris Buechler

fix RRD graphs for queues

ec51a222 26 décembre 2009 23:36 thompsa

Add graphing for 3G cellular modems.

5208e648 07 décembre 2009 13:33 Ermal Lu?i

Include needed files. Ticket #209.

8512951f 27 novembre 2009 23:28 Seth Mos

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.

127b93cf 24 novembre 2009 12:35 Ermal Lu?i

Include necessary shaper.inc for read_altq_config.

483e6de8 21 novembre 2009 22:08 Scott Ullrich

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

1d333258 15 septembre 2009 03:49 Scott Ullrich

Add pfSense_BUILDER_BINARIES: and pfSense_MODULE:. Adjust Copyright to include 2009 on files that I have asserted (C) on

d9acea75 12 mars 2009 02:40 Scott Ullrich

Use nice -n20 for common launched items

a927edff 12 mars 2009 00:36 Seth Mos

Fixed the outbound macro for displaying the outbound interfaces with the Quality Graphs
Make sure we show either the gateway name or interface name on the graph top header

07e8a013 11 mars 2009 19:55 Seth Mos

Correct the label name for the out pass traffic

7c6fe5c5 09 mars 2009 02:59 seth

Add block stats to the graphs
Fix stay '

b03494e4 30 décembre 2008 21:35 Seth Mos

Remove stray '

5fce73d3 24 décembre 2008 20:58 Seth Mos

add, don't multiply

99eab909 24 décembre 2008 09:50 Seth Mos

Always return text string

91ae2914 24 décembre 2008 09:42 Seth Mos

Restore humantime algorithm

9aa18b77 22 décembre 2008 22:08 Seth Mos

fix layout and stray '

fbe5d663 22 décembre 2008 21:02 Seth Mos

+ 0

95919c39 16 décembre 2008 14:35 Seth Mos

reformat the the entire rrd graph generation page.

96ae3e86 23 novembre 2008 20:02 Seth Mos

Multiply delay value from rrd by 1000 to get milliseconds

c444db24 22 novembre 2008 23:15 Seth Mos

Switch over to apinger rrd files.

9835307e 01 avril 2008 23:13 Seth Mos

Fix graph totals calculus

90c58761 27 mars 2008 17:56 Ermal Luçi

Revert this to allow graphs to work.

f8e70893 26 mars 2008 18:05 Seth Mos

Add detailed memory usage RRD graph.
Modifications by Nathan Moinvaziri () to add

96b777d6 19 mars 2008 01:00 Ermal Luçi

Remove rrd files every time the wizard changes(for now).

bdf383ad 25 février 2008 19:12 Ermal Luçi

Show the graph upside since we only show agraph for a interface now.

21a0464c 23 février 2008 03:22 Ermal Luçi
  • Unbreak rrd graphs for queues and make them multiinterface aware
  • Add a new tab for queuedrops with multiinterface there is no way to have them in the same tab
  • Remove $GLOBAL where used and use proper accessor functions
  • Remove Manuel from copyright this file has been rewritten...
fe93b17b 21 février 2008 20:23 Ermal Luçi
  • First attempt at fixing queues rrd graph
e42c78a7 28 décembre 2007 12:52 Seth Mos

Use correct var

c9a4b3f2 18 novembre 2007 00:35 Seth Mos

Fix math on throughput graph

28949e85 18 novembre 2007 00:16 Seth Mos

Fix Spacing for wireless graph

c546ca5c 18 novembre 2007 00:11 Seth Mos

Fix Spelling

cd933fbb 16 novembre 2007 02:54 Scott Ullrich

Add correctly.

d293a500 16 novembre 2007 02:54 Scott Ullrich

Add page title.

b295e815 21 octobre 2007 18:18 Seth Mos

Remove size headers since they seem to screw up IE

063b934c 21 octobre 2007 08:41 Seth Mos

Fix layout and units

2f80d451 21 octobre 2007 08:24 Seth Mos

Commit wireless frontend code

4a505523 24 juillet 2007 23:27 Seth Mos

Quality graph alignment

69487053 21 juillet 2007 23:47 Seth Mos

Add rrd graph settings page.
Bump config out of line with 1.2
Add rrd config upgrade code.