mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add rrd graph settings page.

Browse Source 
Bump config out of line with 1.2
Add rrd config upgrade code.
This commit is contained in:
Seth Mos 2007-07-21 21:47:37 +00:00
parent e1cb5d69a9
commit 694870530c
5 changed files with 193 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etc/inc/config.inc
View File

@ -997,8 +997,8 @@ function convert_config() {
$config['version'] = "2.9";
}
/* Convert 2.9 -> 3.0 */
if ($config['version'] <= 2.9) {
/* Convert 2.9 -> 4.0 */
if ($config['version'] <= 3.9) {
$config['system']['webgui']['auth_method'] = "session";
$config['system']['webgui']['backing_method'] = "htpasswd";
@ -1043,13 +1043,13 @@ function convert_config() {
unset ($config['system']['username']);
unset ($config['system']['password']);
$config['version'] = "3.0";
$config['version'] = "4.0";
}
}
/* Convert 3.0 -> 3.1 */
if ($config['version'] <= 3.0) {
/* Convert 4.0 -> 4.1 */
if ($config['version'] <= 4.0) {
if(!$config['sysctl']) {
$config['sysctl']['item'] = array();
@ -1122,11 +1122,18 @@ function convert_config() {
$config['sysctl']['item'][16]['desc'] = "The system will attempt to calculate the bandwidth delay product for each connection and limit the amount of data queued to the network to just the amount required to maintain optimum throughput. ";
$config['sysctl']['item'][16]['value'] = "3";
$config['version'] = "3.1";
$config['version'] = "4.1";
}
}
/* Convert 4.1 -> 4.2 */
if ($config['version'] <= 4.1) {
/* enable the rrd config setting by default */
$config['rrd']['enable'] = true;
$config['version'] = "4.2";
}
if ($prev_version != $config['version'])
write_config("Upgraded config version level from {$prev_version} to {$config['version']}");
}

4
etc/inc/pfsense-utils.inc
View File

@ -8,7 +8,7 @@
* $Id$
******
*
* Copyright (C) 2004-2006 Scott Ullrich (sullrich@gmail.com)
* Copyright (C) 2004-2007 Scott Ullrich (sullrich@gmail.com)
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@ -2914,8 +2914,6 @@ function enable_rrd_graphing() {
$rrdrestore = "";
$rrdreturn = "";
$config['rrd']['enable'] = true;
if (isset ($config['rrd']['enable'])) {
/* create directory if needed */

16
usr/local/www/status_rrd_graph.php
View File

@ -3,7 +3,7 @@
/*
status_rrd_graph.php
Part of pfSense
Copyright (C) 2006 Seth Mos <seth.mos@xs4all.nl>
Copyright (C) 2007 Seth Mos <seth.mos@xs4all.nl>
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -33,7 +33,11 @@ require("guiconfig.inc");
if ($_GET['cat']) {
$curcat = $_GET['cat'];
} else {
$curcat = "system";
if(! empty($config['rrd']['category'])) {
$curcat = $config['rrd']['category'];
} else {
$curcat = "system";
}
}
if ($_GET['option']) {
@ -51,7 +55,11 @@ if ($_GET['option']) {
if ($_GET['style']) {
$curstyle = $_GET['style'];
} else {
$curstyle = "inverse";
if(! empty($config['rrd']['style'])) {
$curstyle = $config['rrd']['style'];
} else {
$curstyle = "inverse";
}
}
$rrddbpath = "/var/db/rrd/";
@ -103,6 +111,8 @@ include("head.inc");
$tab_array[] = array("Quality", $tabactive, "status_rrd_graph.php?cat=quality");
if($curcat == "queues") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array("Queues", $tabactive, "status_rrd_graph.php?cat=queues");
if($curcat == "settings") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array("Settings", $tabactive, "status_rrd_graph_settings.php");
display_top_tabs($tab_array);
?>
</td>

2
usr/local/www/status_rrd_graph_img.php
View File

@ -3,7 +3,7 @@
/*
status_rrd_graph_img.php
Part of pfSense
Copyright (C) 2006 Seth Mos <seth.mos@xs4all.nl>
Copyright (C) 2007 Seth Mos <seth.mos@xs4all.nl>
All rights reserved.
Redistribution and use in source and binary forms, with or without

165
usr/local/www/status_rrd_graph_settings.php Executable file
View File

@ -0,0 +1,165 @@
<?php
/* $Id$ */
/*
status_rrd_graph.php
Part of pfSense
Copyright (C) 2007 Seth Mos <seth.mos@xs4all.nl>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require("guiconfig.inc");
$pconfig['enable'] = isset($config['rrd']['enable']);
$pconfig['category'] = isset($config['rrd']['category']);
$pconfig['style'] = isset($config['rrd']['style']);
$curcat = "settings";
$categories = array('system' => 'System',
'traffic' => 'Traffic',
'packets' => 'Packets',
'quality' => 'Quality',
'queues' => 'Queues');
$styles = array('inverse' => 'Inverse',
'absolute' => 'Absolute');
if ($_POST) {
unset($input_errors);
$pconfig = $_POST;
/* input validation */
/* none */
if (!$input_errors) {
$config['rrd']['enable'] = $_POST['enable'] ? true : false;
$config['rrd']['category'] = $_POST['category'];
$config['rrd']['style'] = $_POST['style'];
write_config();
$retval = 0;
config_lock();
$retval = enable_rrd_graphing();
config_unlock();
$savemsg = get_std_save_message($retval);
}
}
$pgtitle = gettext("Status: RRD Graphs");
include("head.inc");
?>
<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle"><?=$pgtitle?></p>
<?php if ($input_errors) print_input_errors($input_errors); ?>
<?php if ($savemsg) print_info_box($savemsg); ?>
<form action="status_rrd_graph_settings.php" method="post" name="iform" id="iform">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
<?php
$tab_array = array();
if($curcat == "system") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array("System", $tabactive, "status_rrd_graph.php?cat=system");
if($curcat == "traffic") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array("Traffic", $tabactive, "status_rrd_graph.php?cat=traffic");
if($curcat == "packets") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array("Packets", $tabactive, "status_rrd_graph.php?cat=packets");
if($curcat == "quality") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array("Quality", $tabactive, "status_rrd_graph.php?cat=quality");
if($curcat == "queues") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array("Queues", $tabactive, "status_rrd_graph.php?cat=queues");
if($curcat == "settings") { $tabactive = True; } else { $tabactive = False; }
$tab_array[] = array("Settings", $tabactive, "status_rrd_graph_settings.php?cat=settings");
display_top_tabs($tab_array);
?>
</td>
</tr>
<tr>
<td>
<div id="mainarea">
<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="6">
<tr>
<td width="22%" valign="top" class="vtable">RRD Graphs</td>
<td width="78%" class="vtable">
<input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)">
<b><?=gettext("Enables the RRD graphing backend.");?></b>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vtable">Default category</td>
<td width="78%" class="vtable">
<select name="category" id="category" class="formselect" style="z-index: -10;" >
<?php
foreach ($categories as $category => $categoryd) {
echo "<option value=\"$category\"";
if ($category == $pconfig['category']) echo " selected";
echo ">" . htmlspecialchars($categoryd) . "</option>\n";
}
?>
</select>
<b><?=gettext("This selects default category.");?></b>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vtable">Default style</td>
<td width="78%" class="vtable">
<select name="style" class="formselect" style="z-index: -10;" >
<?php
foreach ($styles as $style => $styled) {
echo "<option value=\"$style\"";
if ($style == $pconfig['style']) echo " selected";
echo ">" . htmlspecialchars($styled) . "</option>\n";
}
?>
</select>
<b><?=gettext("This selects the default style.");?></b>
</td>
</tr>
<tr>
<td width="22%" valign="top">&nbsp;</td>
<td width="78%">
<input name="Submit" type="submit" class="formbtn" value="Save" onclick="enable_change(true)">
</td>
</tr>
<tr>
<td width="22%" height="53" valign="top">&nbsp;</td>
<td width="78%"><strong><span class="red">Note:</span></strong><br>
<?=gettext("Graphs will not be allowed to be recreated within a 1 minute interval, please
take this into account after changing the style.");?>
</td>
</tr>
</table>
</div>
</td>
</tr>
</table>
</form>
<?php include("fend.inc"); ?>
</body>
</html>