mirrors
/
Monitorix
mirror of https://github.com/mikaku/Monitorix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added the new 'url_prefix_proxy' option to bypass the URL building in the CGI. Closes #58

This commit is contained in:
Jordi Sanfeliu 2014-08-20 09:27:10 +02:00
parent 0d501f99a5
commit b9f9eefd30
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changes
View File

@ -1,4 +1,4 @@
3.N.N - DD-MMM-2014 3.N.N - DD-Aug-2014
==================== ====================
- Added a complete statistical Libvirt (libvirt) graph. - Added a complete statistical Libvirt (libvirt) graph.
- Added a complete processes statistics (process) graph. - Added a complete processes statistics (process) graph.
@ -17,6 +17,8 @@
(suggested by Russell Morris, rmorris AT rkmorris.us) (suggested by Russell Morris, rmorris AT rkmorris.us)
- Added SPF statistics in the 'mail' graph. - Added SPF statistics in the 'mail' graph.
- Added support for newest NVidia driver 340.24. [#54] - Added support for newest NVidia driver 340.24. [#54]
- Added the new 'url_prefix_proxy' option to bypass the URL building in the CGI.
Usefull when Monitorix is used behind a reverse proxy. [#58]
- Improved in all graphs the 'limit' and 'rigid' functionality and reduced a lot - Improved in all graphs the 'limit' and 'rigid' functionality and reduced a lot
of redundant code. of redundant code.
- Changed all DST from COUNTER to GAUGE in 'net' module to avoid unexpected huge - Changed all DST from COUNTER to GAUGE in 'net' module to avoid unexpected huge

9
man/man5/monitorix.conf.5
View File

@ -156,6 +156,15 @@ Although this is a global option, only the graphs \fIport\fP, \fInginx\fP and \f
Default value: \fIfilter\fP Default value: \fIfilter\fP
.RE .RE
.P .P
.BI url_prefix_proxy
.RS
This option forces \fImonitorix.cgi\fP to bypass the URL building. This is specially usefull when Monitorix is used behind a reverse proxy.
.P
An example would be: \fIhttp://myexternalwebsite.com/\fP
.P
Default value:
.RE
.P
.BI base_dir .BI base_dir
.RS .RS
This is the absolute path to the directory where all the web elements are located: This is the absolute path to the directory where all the web elements are located:

9
monitorix.cgi
View File

@ -257,11 +257,14 @@ if($config{include_dir} && opendir(DIR, $config{include_dir})) {
} }
} }
$config{url} = ($ENV{HTTPS} || ($config{httpd_builtin}->{https_url} || "n") eq "y") ? "https://" . $ENV{HTTP_HOST} : "http://" . $ENV{HTTP_HOST}; $config{url} = ($config{url_prefix_proxy} || "");
$config{hostname} = $config{hostname} || $ENV{SERVER_NAME}; if(!$config{url}) {
if(!($config{hostname})) { # called from the command line $config{url} = ($ENV{HTTPS} || ($config{httpd_builtin}->{https_url} || "n") eq "y") ? "https://" . $ENV{HTTP_HOST} : "http://" . $ENV{HTTP_HOST};
$config{hostname} = $config{hostname} || $ENV{SERVER_NAME};
if(!($config{hostname})) { # called from the command line
$config{hostname} = "127.0.0.1"; $config{hostname} = "127.0.0.1";
$config{url} = "http://127.0.0.1"; $config{url} = "http://127.0.0.1";
}
} }
$config{url} .= $config{base_url}; $config{url} .= $config{base_url};