Commit Graph

87 Commits

Author SHA1 Message Date
Leo-Andres Hofmann
fd7a022630 rrd graphs: Switch to SVG output format
The vector graphics can be scaled without becoming blurred.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
Tested-by: Bernhard Bitsch <bbitsch@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2021-09-05 17:52:16 +00:00
Jonatan Schlag
8186b37230 Hardcode theme to ipfire
This disables the theme support and makes it impossible to use any other
themes than the ipfire default theme.

The only intention of this patch is to hardcode the theme to ipfire.
To change any cgi we have is an ugly way, but the only way to do this
fast. The colour handling needs certainly to be improved as well, but
this will and should be done in other patches.

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-08 10:11:34 +00:00
Leo-Andres Hofmann
9c6a0ce12d rrdimage: Switch graphs.pl to the new graph scripts
"makegraphbox" is modified to remove the old iframe method and output
a modern div container instead.
Graph errors are now returned, to be displayed by getrrdimage.cgi.

entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.

Add cache control HTTP header to image output.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-06 10:05:28 +00:00
Leo-Andres Hofmann
910f1e8494 rrdimage: Add scripts for new graph display method
This patch adds two scripts which will later be used to display graphs:

-> getrrdimage.cgi: Generates PNG images for graphs.
Until now, each CGI with embedded graphs had to be able to output
images. These functions are now gathered in this new script.
The additional parameter handling can be removed and the CGIs can
be simplified. This makes it easier to use and output the graphs.

-> rrdimage.js: Interactive Javascript functions
This allows the user to select time ranges without reloading the page.
In addition, the graphs are now periodically updated, allowing users
to live monitor the data.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-04-06 10:01:15 +00:00
Leo-Andres Hofmann
00db2d8343 QoS graphs: Add color mapping table
Use the traffic class description field to identify similar classes.
This ensures that a class used in both the up- and down-link is
printed with matching colors in both graphs.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2021-03-08 10:55:07 +00:00
Michael Tremer
79131c6e47 firewall hits graph: Fix order of values
The fields were mixed up and therefore graph showed incorrect
values.

Fixes: #12496
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2020-10-12 10:27:15 +00:00
Matthias Fischer
2bba650947 graphs.pl: Standardize localization strings for entropy graphs
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-09-19 19:21:53 +00:00
Matthias Fischer
03dd66d616 graphs.pl: Standardize localization strings for disk access graphs
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-09-19 19:21:27 +00:00
Matthias Fischer
cc573a98d1 graphs.pl: Standardize temperature displays
Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-09-19 19:15:15 +00:00
Michael Tremer
8ffdc78c49 web UI: Add graph for connection tracking
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-09-19 19:13:10 +00:00
Matthias Fischer
fa088214bc graphs.pl: Added translation for 'ACPI Thermal Zone'
This patchset is based on https://git.ipfire.org/?p=people/ms/ipfire-2.x.git;a=commitdiff;h=4bf0d000ffe961cdc5d9dbd27b3a11f900b3daed

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-09-19 19:10:29 +00:00
Michael Tremer
6fc3625512 graphs: Fix rendering CPU graphs after number of cores decreased
Fixes: #12193 - cpu graphs cannot created if smt is disabled
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-09-19 19:05:46 +00:00
Peter Müller
33954320f9 graph.pl: fix intendation of user CPU load
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-05-09 12:17:35 +00:00
Peter Müller
a0774e3cc8 system.cgi: properly translate load average graph
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-05-09 12:17:23 +00:00
Peter Müller
e01c49b466 graphs.pl: use brackets instead of hypens
This simply makes more sense in most languages, as INPUT, OUTPUT and
FORWARD are special cases of firewall hits in general.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-05-09 12:14:01 +00:00
Peter Müller
992f944b3b graphs.pl: fix spelling of "SYN"
This merely is a cosmetic change, but since we are dealing with network
packets here, the SYN flag must be capitalised.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2020-05-09 12:12:35 +00:00
Michael Tremer
7cbdd31d6e graphs.pl: Fix HTML syntax error
The missing ' caused that a different URL was called

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-04-11 14:26:57 +01:00
Michael Tremer
a249ccd2e4 Improve graphs
The graphs are using an iframe and PNG images where the resolution
did often not fit and the browser had to resize the image. That
led to blurred fonts and hard to read graphs.

This patch increases the size of the box and the image. With that
higher resolution resizing should not be too much of an issue, but
since the sizes of the iframe and image have been aligned should
not even be necessary.

Reported-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2017-03-15 13:45:05 +00:00
Matthias Fischer
b6adeb235d graphs.pl: bugfixes regarding rrdtool
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
2015-06-18 13:14:14 +02:00
Alexander Marx
5c3b3bd8e1 vpn-statistic: fix alignment of graph legend for n2n graphs 2015-04-10 17:20:43 +02:00
Alexander Marx
c9ac8b8052 vpn-statistics: change graphs and datatypes of rrd 2014-10-21 07:29:06 +02:00
Alexander Marx
5795fc1b55 vpn-statistic: added new statistic page for OpenVPN Roadwarrior 2014-09-18 16:29:10 +02:00
Arne Fitzenreiter
af433268e0 graphs.pl: fix links position in chrome for android. 2014-03-23 17:39:47 +01:00
Michael Tremer
9d870c49eb entropy graph: Remove trend line. 2014-03-13 15:29:53 +01:00
Alexander Marx
e55334753d graphs.pl : fixed layout on Nexus 7 devices "hour-Day-week-month-year" now on top of graph 2014-03-10 12:54:06 +01:00
Alf Høgemark
e06986e853 qos and process graphs: avoid random colors
For the graphs for qos classes, and for process
count and memory usage, the colors change on
each page reload, since the colors are currently
totally random.

This change uses defined color indexes, 15 different
ones, that should be enough for qos at least, and is
enough for processes on my setup. This makes
the colors consistent between page loads, so it makes
it easier to monitor changes.

Perhaps one should define 30 different colors meant
to be used for graphing, then one could avoid random
colors also for the sensor graphs, and make it less
likely to get color collision for the process graphs
as well. Defining 30 such colors is not part of this
change.
2014-02-26 18:48:05 +01:00
Alf Høgemark
491957ac2d qos.cgi: Use Language string for legend in graph 2014-02-15 15:43:56 +01:00
Michael Tremer
15b023b979 Add an entropy graph. 2014-02-02 14:32:15 +01:00
Alexander Marx
cb61489891 Forward Firewall: restored old settings in graphs.pl. With new Monofont the columnsize is ok now 2013-08-09 14:13:11 +02:00
Alexander Marx
9468a6f713 Forward Firewall: Firewall Hits graph now with stacked values 2013-08-09 14:13:10 +02:00
Alexander Marx
94ea1f0346 Forward Firewall: fixed firewall hits statistik and extended it to show input,output,forward,newnotsyn and portscan seperately. 2013-08-09 14:13:10 +02:00
Arne Fitzenreiter
527a5a7756 graphs/langs: fix graphs with russian language.
rrd-graph cannot use UTF-8 chars so the strings are duplicated.
2011-09-05 20:32:02 +02:00
Christian Schmidt
7fdcea4ef6 graphs.pl remove lower bound for frequencies 2011-07-12 07:45:00 +02:00
Arne Fitzenreiter
1abbf741cc load graph: fix unlocalized "minutes". 2011-06-28 00:46:48 +02:00
Christian Schmidt
0d08de33a6 Some Fixes for the CGIs not spamming apache logfile. 2010-12-12 20:40:56 +01:00
Christian Schmidt
460abc6bca Little cosmetic fix for temp graph. 2010-12-07 18:12:46 +01:00
Christian Schmidt
03baaf780e Fixed some file does not exists output 2010-06-21 21:02:43 +02:00
Christian Schmidt
2a0a67412b This fixes Bug #0000638 - Load Graph naming 2010-06-10 15:44:31 +02:00
Christian Schmidt
8999c8842c Cosmetic change for the swap graph. 2010-05-13 11:54:40 +02:00
Arne Fitzennreiter
3e96605483 Fix ACPI Tempgraph autoscaling 2008-10-22 19:19:10 +02:00
Arne Fitzennreiter
4be3afa089 Removed ACPI-Cooling device graph because always 0 collected
Disabled collecting of ACPI-Cooling device data
Change linewith of ACPI Temp graph
2008-10-22 07:39:54 +02:00
Arne Fitzennreiter
30189c5045 Add ACPI Thermal Zone support 2008-10-21 13:34:23 +02:00
Arne Fitzenreiter
5dcc7ad754 Fix cpu frequency graph 2008-10-04 15:20:30 +02:00
Maniacikarus
2d0adb746e Fixed some minor errors 2008-09-30 09:18:22 +02:00
Maniacikarus
0ed623d0ad Fixed CPU Graph should now work fine 2008-09-28 12:48:26 +02:00
Maniacikarus
1c163c0441 Last step in migration 2.3, now testing and debugging 2008-09-28 12:25:54 +02:00
Maniacikarus
bcad0fd0d2 3 step in tuning 2.3 2008-09-28 11:10:30 +02:00
Maniacikarus
2d281532a6 2nd step for 2.3 tuning 2008-09-27 18:32:54 +02:00
Maniacikarus
4e481c3a51 Started optimising 2.3 for less disk io
Moving rrd files permanently to a ramdisk (backup next step)
Remove creation of temp png files for graphs (create at access)
Deleted some old cgi
2008-09-26 23:22:32 +02:00
Arne Fitzenreiter
a962a9231e Removed "-r" at wireless graph (this cause a segfault if all collected values are the same) 2008-08-13 06:02:08 +02:00