// var $basename
// base name for this RRD (usually file name without .rrd)
//
+ // var $basedir
+ // base directory for this RRD (with a trailing slash)
+ // note that $rrd_file usually includes that path as well, but graph directory gets based on this value
+ //
// var $config_all
// complete, raw configuration array set
//
var $rrd_file = null;
var $basename = null;
+ var $basedir = null;
var $config_all = null;
var $config_raw = null;
$iinfo = $complete_conf;
}
+ if (isset($iinfo['path']) && strlen($iinfo['path'])) {
+ $this->basedir = $iinfo['path'];
+ if (substr($this->basedir, -1) != '/') { $this->basedir .= '/'; }
+ }
+
if (isset($iinfo['graph-only']) && $iinfo['graph-only'] && !is_null($conf_id)) {
$this->basename = $conf_id;
$this->status = 'graphonly';
}
elseif (isset($iinfo['file'])) {
- $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']{0} != '/')?$this->basedir:'').$iinfo['file'];
+ $this->basename = basename((substr($this->rrd_file, -4) == '.rrd')?substr($this->rrd_file, 0, -4):$this->rrd_file);
}
elseif (!is_null($conf_id) && file_exists($conf_id.'.rrd')) {
- $this->rrd_file = $conf_id.'.rrd';
+ $this->rrd_file = (($iinfo['file']{0} != '/')?$this->basedir:'').$conf_id.'.rrd';
$this->basename = $conf_id;
}
else {
function update($upArray = null) {
// feed new data into RRD
- if ($this->status != 'ok') { trigger_error('Cannot update non-writeable file', E_USER_WARNING); return 1; }
+ if ($this->status != 'ok') { trigger_error('Cannot update non-writeable file', E_USER_WARNING); return false; }
$upvals = array();
if (isset($this->config_raw['update'])) {
- $evalcode = $this->config_raw['update'];
- if (!is_null($evalcode)) {
- ob_start();
- eval($evalcode);
- $ret = ob_get_contents();
- if (strlen($ret)) { $upvals = explode("\n", $ret); }
- ob_end_clean();
+ if (preg_match('/^\s*function\s+{(.*)}\s*$/is', $this->config_raw['update'], $regs)) {
+ $upfunc = create_function('', $regs[1]);
+ $upvals = $upfunc();
+ }
+ else {
+ $evalcode = $this->config_raw['update'];
+ if (!is_null($evalcode)) {
+ ob_start();
+ eval($evalcode);
+ $ret = ob_get_contents();
+ if (strlen($ret)) { $upvals = explode("\n", $ret); }
+ ob_end_clean();
+ }
}
- $walkfunc = create_function('&$val,$key', '$val = is_numeric(trim($val))?trim($val):((trim($val)=="L")?"L":"U");');
- array_walk($upvals, $walkfunc);
}
else {
foreach ($this->rrd_fields as $ds) {
elseif (isset($ds['update'])) {
$val = null; $evalcode = null;
if (substr($ds['update'], 0, 4) == 'val:') {
- $evalcode = 'print(trim('.substr($ds['update'], 4).'));';
+ $evalcode = 'function { return trim('.substr($ds['update'], 4).')); }';
}
elseif (substr($ds['update'], 0, 8) == 'snmp-if:') {
$snmphost = 'localhost'; $snmpcomm = 'public';
if ($valtype == 'in') { $oid = '1.3.6.1.2.1.2.2.1.10.'.$ifnr; }
elseif ($valtype == 'out') { $oid = '1.3.6.1.2.1.2.2.1.16.'.$ifnr; }
if (!is_null($ifnr) && !is_null($oid)) {
- $evalcode = 'print(trim(substr(strrchr(`snmpget -v2c -c '.$snmpcomm.' '.$snmphost.' '.$oid.'`,":"),1)));';
+ $evalcode = 'function { return trim(substr(strrchr(`snmpget -v2c -c '.$snmpcomm.' '.$snmphost.' '.$oid.'`,":"),1)); }';
}
}
else { $evalcode = $ds['update']; }
- if (!is_null($evalcode)) {
+ if (preg_match('/^\s*function\s+{(.*)}\s*$/is', $evalcode, $regs)) {
+ $upfunc = create_function('', $regs[1]);
+ $val = $upfunc();
+ }
+ elseif (!is_null($evalcode)) {
ob_start();
eval($evalcode);
$val = ob_get_contents();
}
}
else { $val = null; }
- $upvals[] = is_null($val)?'U':$val;
+ $upvals[$ds['name']] = $val;
}
}
- if (in_array('L', $upvals)) {
+ $key_names = (!is_numeric(array_shift(array_keys($upvals))));
+ 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] = $lastvals[$rowids[$akey]];
+ $upvals[$akey] = $key_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.' N:'.implode(':', $upvals);
+ $update_cmd = 'rrdtool update '.$this->rrd_file.($key_names?' --template '.implode(':', array_keys($upvals)):'').' N:'.implode(':', $upvals);
$return = `$update_cmd 2>&1`;
}
$success = false;
}
else { $success = true; }
- return ($return_var == 0);
+ return $success;
}
function fetch($cf = 'AVERAGE', $resolution = null, $start = null, $end = null) {
$fname = str_replace('%t', $timeframe, $fname);
$fname = str_replace('%f', $fmt_ext, $fname);
if (substr($fname, -strlen($fmt_ext)) != $fmt_ext) { $fname .= $fmt_ext; }
- if (isset($gconf['path'])) { $fname = $gconf['path'].'/'.$fname; }
+ if (isset($gconf['path']) && ($fname{0} != '/')) { $fname = $gconf['path'].'/'.$fname; }
+ if ($fname{0} != '/') { $fname = $this->basedir.$fname; }
$fname = str_replace('//', '/', $fname);
$graphrows = array(); $specialrows = array(); $gC = 0;
$grow['legend'] = $ds['legend'];
if (!isset($gconf['show_legend'])) { $gconf['show_legend'] = true; }
}
+ if (isset($ds['desc'])) { $grow['desc'] = $ds['desc']; }
$graphrows[] = $grow;
}
}
$pconf = $pconf + (array)$this->config_page;
$return = null;
- switch ($pconf['type']) {
+ switch (@$pconf['type']) {
case 'index':
$return = $this->page_index($pconf);
break;
$stats = $this->h_page_statsArray($pconf);
+ if (isset($pconf['stats_url'])) { $sURL_base = $pconf['stats_url']; }
+ else { $sURL_base = '?stat=%i%a'; }
+
+ if (isset($pconf['stats_url_add'])) { $sURL_add = $pconf['stats_url_add']; }
+ else { $sURL_add = '&sub=%s'; }
+
$out .= '<ul class="indexlist">';
foreach ($stats as $stat) {
$out .= '<li'.(isset($stat['class'])?' class="'.$stat['class'].'"':'').'>';
- $surl = '?stat='.$stat['name'];
- $out .= '<a href="'.$surl.'">'.$stat['name'].'</a>';
+ $sURL = str_replace('%i', $stat['name'], $sURL_base);
+ $sURL = str_replace('%a', '', $sURL);
+ $sURL = str_replace('%s', '', $sURL);
+ $out .= '<a href="'.$sURL.'">'.$stat['name'].'</a>';
if (isset($stat['sub']) && count($stat['sub'])) {
$sprt = array();
- foreach ($stat['sub'] as $ssub) { $sprt[] = '<a href="'.$surl.'&sub='.$ssub.'">'.$ssub.'</a>'; }
+ foreach ($stat['sub'] as $ssub) {
+ $sURL = str_replace('%i', $stat['name'], $sURL_base);
+ $sURL = str_replace('%a', $sURL_add, $sURL);
+ $sURL = str_replace('%s', $ssub, $sURL);
+ $sprt[] = '<a href="'.$sURL.'">'.$ssub.'</a>';
+ }
$out .= ' <span="subs">('.implode(', ', $sprt).')</span>';
}
$out .= '</li>';
$gmeta = $this->graph_plus($tframe, $g_sub, $graph_extras);
if (isset($pconf['graph_url'])) {
$gURL = $pconf['graph_url'];
- $fname = str_replace('%f', basename($gmeta['filename']), $gURL);
- $fname = str_replace('%p', $gmeta['filename'], $gURL);
+ $gURL = str_replace('%f', basename($gmeta['filename']), $gURL);
+ $gURL = str_replace('%p', $gmeta['filename'], $gURL);
if (substr($gURL, -1) == '/') { $gURL .= $gmeta['filename']; }
}
else {
$out .= '<h2>'.$gtitle[$tframe].'</h2>';
$out .= '<img src="'.$gURL.'"';
$out .= ' alt="'.$this->basename.(!is_null($g_sub)?' - '.$g_sub:'').' - '.$tframe.'" class="rrdgraph"';
- $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;">';
+ if (isset($gmeta['width']) && isset($gmeta['height'])) { $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;"'; }
+ $out .= '>';
if (isset($gmeta['data']) && count($gmeta['data'])) {
$out .= '<table class="gdata">';
foreach ($gmeta['data'] as $field=>$gdata) {
projects / php-utility-classes.git / blobdiff