From 6b998ddd44467c7c2b92aa03018d1b00395d83d5 Mon Sep 17 00:00:00 2001 From: Bart Van Der Meerssche Date: Sat, 18 Sep 2010 07:33:35 +0000 Subject: [PATCH] drupal: Newly created rrds should have the increased rra sizes by default as well. Thanks Henk! --- server/drupal/modules/logger/logger.drush.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/drupal/modules/logger/logger.drush.inc b/server/drupal/modules/logger/logger.drush.inc index 5f888d4..1130a6f 100644 --- a/server/drupal/modules/logger/logger.drush.inc +++ b/server/drupal/modules/logger/logger.drush.inc @@ -124,7 +124,7 @@ function _logger_create_node($serial, $country ="", $uid = 0) { // create the meter base rrd if (!file_exists($path->base . $meter .'.rrd')) { - $command = $path->root .'/rrdtool create '. $path->base . $meter .'.rrd -b 1199487600 -s 60 DS:meter:DERIVE:8640000:0:20 RRA:AVERAGE:0.5:1:120 RRA:AVERAGE:0.5:15:192 RRA:AVERAGE:0.5:1440:60 RRA:AVERAGE:0.5:10080:520'; + $command = $path->root .'/rrdtool create '. $path->base . $meter .'.rrd -b 1199487600 -s 60 DS:meter:DERIVE:8640000:0:20 RRA:AVERAGE:0.5:1:1440 RRA:AVERAGE:0.5:15:672 RRA:AVERAGE:0.5:1440:365 RRA:AVERAGE:0.5:10080:520'; system($command, $return); if (!($return == 0)) { drush_set_error('LOGGER_CREATE_RRD_BASE_ERROR', dt('Error creating the base @meter rrd.', array('@meter' => $meter))); @@ -133,7 +133,7 @@ function _logger_create_node($serial, $country ="", $uid = 0) { // create the meter night rrd if (!file_exists($path->night . $meter .'.rrd')) { - $command = $path->root .'/rrdtool create '. $path->night . $meter .'.rrd -b 1199487600 -s 86400 DS:meter:GAUGE:8640000:0:20 RRA:AVERAGE:0.5:1:60 RRA:AVERAGE:0.5:7:520'; + $command = $path->root .'/rrdtool create '. $path->night . $meter .'.rrd -b 1199487600 -s 86400 DS:meter:GAUGE:8640000:0:20 RRA:AVERAGE:0.5:1:365 RRA:AVERAGE:0.5:7:520'; system($command, $return); if (!($return == 0)) { drush_set_error('LOGGER_CREATE_RRD_NIGHT_ERROR', dt('Error creating the night @meter rrd.', array('@meter' => $meter)));