// else it's the configuration for this one RRD
// currently only a config array is supported, XML config is planned
//
+ // private $rrdtool_bin
+ // RRDtool binary to use
+ //
// private $rrd_file
// RRD file name
//
// private function text_quote($text)
// return a quoted/escaped text for use in rrdtool commandline text fields
+ private $rrdtool_bin = '/usr/bin/rrdtool';
+
private $rrd_file = null;
private $basename = null;
private $basedir = null;
function __construct($rrdconfig, $conf_id = null) {
// ***** init RRD stat module *****
$this->mod_textdomain = 'class_rrdstat';
- $mod_charset = 'iso-8859-15';
+ $mod_charset = 'utf-8';
bindtextdomain($this->mod_textdomain, class_exists('baseutils')?baseutils::getDir('locale'):'locale/');
bind_textdomain_codeset($this->mod_textdomain, $mod_charset);
// return RRDtool version
static $version;
if (!isset($version)) {
- $create_cmd = 'rrdtool --version';
+ $create_cmd = $this->rrdtool_bin.' --version';
$return = `$create_cmd 2>&1`;
if (strpos($return, 'ERROR') !== false) {
trigger_error($this->rrd_file.' - rrd version error: '.$return, E_USER_WARNING);
// create RRD file
// compose create command
- $create_cmd = 'rrdtool create '.$this->rrd_file.' --step '.$this->rrd_step;
+ $create_cmd = $this->rrdtool_bin.' create '.$this->rrd_file.' --step '.$this->rrd_step;
foreach ($this->rrd_fields as $ds) {
if (!isset($ds['type'])) { $ds['type'] = 'COUNTER'; }
if (!isset($ds['heartbeat'])) { $ds['heartbeat'] = 2*$this->rrd_step; }
$upvals[$ds['name']] = $val;
}
}
- $key_names = (!is_numeric(array_shift(array_keys($upvals))));
+ $upval_keys = array_keys($upvals);
+ $keys_have_names = !is_numeric(array_shift($upval_keys));
if (in_array('L', $upvals, true)) {
// for at least one value, we need to set the same as the last recorded value
$fvals = $this->fetch();
$rowids = array_shift($fvals);
$lastvals = array_shift($fvals);
foreach (array_keys($upvals, 'L') as $akey) {
- $upvals[$akey] = $key_names?$lastvals[$akey]:$lastvals[$rowids[$akey]];
+ $upvals[$akey] = $keys_have_names?$lastvals[$akey]:$lastvals[$rowids[$akey]];
}
}
$walkfunc = create_function('&$val,$key', '$val = is_numeric(trim($val))?trim($val):"U";');
array_walk($upvals, $walkfunc);
$return = null;
if (count($upvals)) {
- $update_cmd = 'rrdtool update '.$this->rrd_file
- .($key_names?' --template '.implode(':', array_keys($upvals)):'').' N:'.implode(':', $upvals);
+ $update_cmd = $this->rrdtool_bin.' update '.$this->rrd_file
+ .($keys_have_names?' --template '.implode(':', array_keys($upvals)):'').' N:'.implode(':', $upvals);
$return = `$update_cmd 2>&1`;
}
elseif ($start < 0) { $start += $end; }
$start = intval($start/$resolution)*$resolution;
- $fetch_cmd = 'rrdtool fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution.' --start '.$start.' --end '.$end;
+ $fetch_cmd = $this->rrdtool_bin.' fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution
+ .' --start '.$start.' --end '.$end;
$return = `$fetch_cmd 2>&1`;
if (strpos($return, 'ERROR') !== false) {
// fetch time of last update in this RRD file
static $last_update;
if (!isset($last_update) && in_array($this->status, array('ok','readonly'))) {
- $last_cmd = 'rrdtool last '.$this->rrd_file;
+ $last_cmd = $this->rrdtool_bin.' last '.$this->rrd_file;
$return = trim(`$last_cmd 2>&1`);
$last_update = is_numeric($return)?$return:null;
}
$addSpecial .= ':'.$this->text_quote($srow['text']);
}
- $graph_cmd = 'rrdtool graph '.str_replace('*', '\*', $fname.$gOpts.$gDefs.$gGraphs.$addSpecial);
+ $graph_cmd = $this->rrdtool_bin.' graph '.str_replace('*', '\*', $fname.$gOpts.$gDefs.$gGraphs.$addSpecial);
$return = `$graph_cmd 2>&1`;
if (strpos($return, 'ERROR') !== false) {