// ***** init RRD stat module *****
$this->set_def($rrdconfig, $conf_id);
- if (!is_null($this->rrd_file)) {
+ if (($this->status == 'unused') && !is_null($this->rrd_file)) {
if (!is_writeable($this->rrd_file)) {
if (!file_exists($this->rrd_file)) {
if (@touch($this->rrd_file)) { $this->create(); }
$iinfo = $complete_conf;
}
- if (!isset($iinfo['file'])) { return false; }
+ if (isset($iinfo['graph-only']) && $iinfo['graph-only'] && !is_null($conf_id)) {
+ $this->basename = $conf_id;
+ $this->status = 'graphonly';
+ }
+ else {
+ if (!isset($iinfo['file'])) { return false; }
- $this->rrd_file = $iinfo['file'];
- $this->basename = (substr($this->rrd_file, -4) == '.rrd')?substr($this->rrd_file, 0, -4):$this->rrd_file;
+ $this->rrd_file = $iinfo['file'];
+ $this->basename = (substr($this->rrd_file, -4) == '.rrd')?substr($this->rrd_file, 0, -4):$this->rrd_file;
+ }
// fields (data sources, DS)
// name - DS name
if (!is_null($evalcode)) {
ob_start();
eval($evalcode);
- $upvals = explode("\n", ob_get_contents());
+ $ret = ob_get_contents();
+ if (strlen($ret)) { $upvals = explode("\n", $ret); }
ob_end_clean();
}
+ $walkfunc = create_function('&$val,$key', '$val = is_numeric($val)?$val:"U";');
+ array_walk($upvals, $walkfunc);
}
else {
foreach ($this->rrd_fields as $ds) {
$upvals[] = is_null($val)?'U':$val;
}
}
- $update_cmd = 'rrdtool update '.$this->rrd_file.' N:'.implode(':', $upvals);
- $return = `$update_cmd 2>&1`;
+ $return = null;
+ if (count($upvals)) {
+ $update_cmd = 'rrdtool update '.$this->rrd_file.' N:'.implode(':', $upvals);
+ $return = `$update_cmd 2>&1`;
+ }
if (strpos($return, 'ERROR') !== false) {
trigger_error($this->rrd_file.' - rrd update error: '.$return, E_USER_WARNING);
$gColors = array('#00CC00','#0000FF','#000000','#FF0000','#00FF00','#FFFF00','#FF00FF','#00FFFF','#808080','#800000','#008000','#000080','#808000','#800080','#008080','#C0C0C0');
}
- if (!in_array($this->status, array('ok','readonly'))) { trigger_error('Error: rrd status is '.$this->status, E_USER_WARNING); return false; }
+ if (!in_array($this->status, array('ok','readonly','graphonly'))) { trigger_error('Error: rrd status is '.$this->status, E_USER_WARNING); return false; }
// assemble configuration
$gconf = (array)$extra;
$duration = isset($gconf['duration'])?$gconf['duration']:396*86400; // 365+31 days
$slice = isset($gconf['slice'])?$gconf['slice']:86400; // 1 day
// vertical lines at month borders
- $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01')).'#FF0000';
- $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01').' -1 year').'#FF0000';
+ $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01 12:00:00')).'#FF0000';
+ $addSpecial .= ' VRULE:'.strtotime(date('Y-01-01 12:00:00').' -1 year').'#FF0000';
}
else {
$duration = isset($gconf['duration'])?$gconf['duration']:$this->rrd_step*500; // 500 steps
$grow['name'] = $erow['name'].(isset($erow['scale'])?'_tmp':'');
if ($grow['dType'] == 'DEF') {
$grow['dsname'] = isset($erow['dsname'])?$erow['dsname']:$erow['name'];
+ if (isset($erow['dsfile'])) { $grow['dsfile'] = $erow['dsfile']; }
$grow['cf'] = isset($erow['cf'])?$erow['cf']:'AVERAGE';
}
else {
if (!isset($gconf['show_legend'])) { $gconf['show_legend'] = true; }
}
if (isset($erow['stack'])) { $grow['stack'] = ($erow['stack'] == true); }
+ if (isset($erow['desc'])) { $grow['desc'] = $erow['desc']; }
$graphrows[] = $grow;
}
}
else {
foreach ($graphrows as $grow) {
if (isset($grow['gType']) && strlen($grow['gType'])) {
- $textprefix = isset($grow['legend'])?$grow['legend']:$grow['name'];
+ $textprefix = isset($grow['desc'])?$grow['desc']:(isset($grow['legend'])?$grow['legend']:$grow['name']);
// XXX: use lines below once we have rrdtol 1.2
// $graphrows[] = array('dType'=>'VDEF', 'name'=>$grow['name'].'_last', 'rpn_expr'=>$grow['name'].',LAST');
// $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'].'_last', 'text'=>'%3.2lf%s');
foreach ($graphrows as $grow) {
if (isset($grow['dType']) && strlen($grow['dType'])) {
$gDefs .= ' '.$grow['dType'].':'.$grow['name'].'=';
- $gDefs .= ($grow['dType']=='DEF')?$this->rrd_file.':'.$grow['dsname'].':'.$grow['cf']:$grow['rpn_expr'];
+ if ($grow['dType'] == 'DEF') {
+ $gDefs .= isset($grow['dsfile'])?$grow['dsfile']:$this->rrd_file;
+ $gDefs .= ':'.$grow['dsname'].':'.$grow['cf'];
+ }
+ else { $gDefs .= $grow['rpn_expr']; }
}
if (isset($grow['gType']) && strlen($grow['gType'])) {
// XXX: change from STACK type to STACK flag once we have rrdtool 1.2
$out .= '<p class="last_up">Last Update: '.(is_null($this->last_update())?'unknown':date('Y-m-d H:i:s', $this->last_update())).'</p>';
}
- if (in_array($this->status, array('ok','readonly'))) {
+ if (in_array($this->status, array('ok','readonly','graphonly'))) {
$g_sub = isset($pconf['graph_sub'])?$pconf['graph_sub']:null;
foreach (array('day','week','month','year') as $tframe) {
$ret = $this->graph($tframe, $g_sub, $graph_extras);