Project

General

Profile

« Previous | Next » 

Revision 7828fd5b

Added by Seth Mos almost 18 years ago

Keep longer archives, allow for a 4 year span

View differences:

etc/inc/pfsense-utils.inc
2978 2978
				$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
2979 2979
				$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
2980 2980
				$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
2981
				$rrdcreate .= "RRA:AVERAGE:0.5:1440:1500 ";
2981 2982

  
2982 2983
				$rrdcreateoutput = array();
2983 2984
				$rrdcreatereturn = "";
......
3014 3015
				$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
3015 3016
				$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
3016 3017
				$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
3018
				$rrdcreate .= "RRA:AVERAGE:0.5:1440:1500 ";
3017 3019

  
3018 3020
				$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
3019 3021
				if ($rrdcreatereturn != 0) {
......
3057 3059
					$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
3058 3060
					$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
3059 3061
					$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
3060
					$rrdcreate .= "RRA:AVERAGE:0.5:720:1000";
3062
					$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
3063
					$rrdcreate .= "RRA:AVERAGE:0.5:1440:1500 ";
3061 3064

  
3062 3065
					$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
3063 3066
					if ($rrdcreatereturn != 0) {
......
3110 3113
						$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
3111 3114
						$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
3112 3115
						$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
3113
						$rrdcreate .= "RRA:AVERAGE:0.5:720:1000";
3116
						$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
3117
						$rrdcreate .= "RRA:AVERAGE:0.5:1440:1500 ";
3114 3118

  
3115 3119
						$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
3116 3120
						if ($rrdcreatereturn != 0) {
......
3133 3137
						$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
3134 3138
						$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
3135 3139
						$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
3136
						$rrdcreate .= "RRA:AVERAGE:0.5:720:1000";
3140
						$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
3141
						$rrdcreate .= "RRA:AVERAGE:0.5:1440:1500 ";
3137 3142

  
3138 3143
						$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
3139 3144
						if ($rrdcreatereturn != 0) {
......
3213 3218
				$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
3214 3219
				$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
3215 3220
				$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
3221
				$rrdcreate .= "RRA:AVERAGE:0.5:1440:1500 ";
3216 3222

  
3217 3223
				$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
3218 3224
				if($rrdcreatereturn != 0) {
......
3251 3257
				$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
3252 3258
				$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
3253 3259
				$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
3260
				$rrdcreate .= "RRA:AVERAGE:0.5:1440:1500 ";
3254 3261

  
3255 3262
				$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
3256 3263
				if($rrdcreatereturn != 0) {
......
3296 3303
						$rrdcreate .= "RRA:MIN:0.5:5:1000 ";
3297 3304
						$rrdcreate .= "RRA:MIN:0.5:60:1000 ";
3298 3305
						$rrdcreate .= "RRA:MIN:0.5:720:1000 ";
3306
						$rrdcreate .= "RRA:MIN:0.5:1440:1500 ";
3299 3307
						$rrdcreate .= "RRA:AVERAGE:0.5:1:1000 ";
3300 3308
						$rrdcreate .= "RRA:AVERAGE:0.5:5:1000 ";
3301 3309
						$rrdcreate .= "RRA:AVERAGE:0.5:60:1000 ";
3302 3310
						$rrdcreate .= "RRA:AVERAGE:0.5:720:1000 ";
3311
						$rrdcreate .= "RRA:AVERAGE:0.5:1440:1500 ";
3303 3312
						$rrdcreate .= "RRA:MAX:0.5:1:1000 ";
3304 3313
						$rrdcreate .= "RRA:MAX:0.5:5:1000 ";
3305 3314
						$rrdcreate .= "RRA:MAX:0.5:60:1000 ";
3306
						$rrdcreate .= "RRA:MAX:0.5:720:1000";
3315
						$rrdcreate .= "RRA:MAX:0.5:720:1000 ";
3316
						$rrdcreate .= "RRA:MAX:0.5:1440:1500 ";
3307 3317

  
3308 3318
					$rrdcreatel = exec("$rrdcreate 2>&1", $rrdcreateoutput, $rrdcreatereturn);
3309 3319
					if ($rrdcreatereturn != 0) {
usr/local/www/status_rrd_graph.php
75 75

  
76 76
$styles = array('inverse' => 'Inverse',
77 77
		'absolute' => 'Absolute');
78
$periods = array("4h", "16h", "48h", "32d", "6m", "1y", "4y");
78 79

  
79 80
$pgtitle = gettext("Status: RRD Graphs");
80 81
include("head.inc");
......
169 170

  
170 171
					<?php
171 172

  
172
					$periods = array("4h", "16h", "48h", "32d", "6m", "16m");
173

  
174 173
					foreach($periods as $period => $interval) {
175 174
						/* check which databases are valid for our category */
176 175
						foreach($databases as $curdatabase) {
usr/local/www/status_rrd_graph_img.php
56 56
$replace = array(" :: ", "", $friendly);
57 57
$prettydb = ucwords(str_replace($search, $replace, $curdatabase));
58 58

  
59
$periods = array("4h", "16h", "48h", "32d", "6m", "16m");
59
$periods = array("4h", "16h", "48h", "32d", "6m", "1y", "4y");
60 60

  
61 61
$found = 0;
62 62
foreach($periods as $period) if($period == $interval) $found = 1;
......
80 80
$graphs['6m']['seconds'] = 16070400;
81 81
$graphs['6m']['average'] = 43200;
82 82
$graphs['6m']['scale'] = "WEEK:1:MONTH:1:MONTH:1:0:%b";
83
$graphs['16m']['seconds'] = 42854400;
84
$graphs['16m']['average'] = 43200;
85
$graphs['16m']['scale'] = "MONTH:1:MONTH:1:MONTH:1:0:%b";
83
$graphs['1y']['seconds'] = 31622400;
84
$graphs['1y']['average'] = 43200;
85
$graphs['1y']['scale'] = "MONTH:1:MONTH:3:MONTH:1:0:%b";
86
$graphs['4y']['seconds'] = 126489600;
87
$graphs['4y']['average'] = 86400;
88
$graphs['4y']['scale'] = "MONTH:1:YEAR:1:MONTH:3:0:%b";
86 89

  
87 90
/* generate the graphs when we request the page. */
88 91
$seconds = $graphs[$interval]['seconds'];

Also available in: Unified diff