X-Git-Url: https://git-public.kairo.at/?p=php-utility-classes.git;a=blobdiff_plain;f=include%2Fclasses%2Frrdstat.php-class;h=6eed1bf259c75360e3aab44cac1ed2cfc3a78df0;hp=308c5a2b7732da8ec7440facbed8d0ea13396d9d;hb=579a80ebd0fdf1304f305b36058b9c8499d50a45;hpb=e920ca68f705d79c416b98752c228c57271d66e0
diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class
index 308c5a2..6eed1bf 100644
--- a/include/classes/rrdstat.php-class
+++ b/include/classes/rrdstat.php-class
@@ -3,6 +3,7 @@
class rrdstat {
var $rrd_file = null;
+ var $basename = null;
var $config_raw = null;
var $config_graph = null;
@@ -15,14 +16,14 @@ class rrdstat {
var $status = 'unused';
- function rrdstat($init_info = null) {
+ function rrdstat($rrdconfig, $conf_id = null) {
// ***** init RRD stat module *****
- $this->set_def($init_info);
+ $this->set_def($rrdconfig, $conf_id);
if (!is_null($this->rrd_file)) {
if (!is_writeable($this->rrd_file)) {
if (!file_exists($this->rrd_file)) {
- if (touch($this->rrd_file)) { $this->create(); }
+ if (@touch($this->rrd_file)) { $this->create(); }
else { trigger_error('RRD file can not be created', E_USER_WARNING); }
}
else {
@@ -36,19 +37,32 @@ class rrdstat {
}
}
- function set_def($init_info = null) {
- if (is_array($init_info) && isset($init_info['file'])) {
+ function set_def($rrdconfig, $conf_id = null) {
+ if (is_array($rrdconfig)) {
// we have an array in the format we like to have
- $iinfo =& $init_info;
+ $complete_conf =& $rrdconfig;
}
else {
// we have something else (XML data?), try to generate the iinfo aray from it
- $iinfo =& $init_info;
+ $complete_conf =& $rrdconfig;
+ }
+
+ if (!is_null($conf_id)) {
+ $iinfo = isset($complete_conf[$conf_id])?$complete_conf[$conf_id]:array();
+ if (isset($complete_conf['*'])) {
+ $iinfo = (array)$iinfo + (array)$complete_conf['*'];
+ if (isset($complete_conf['*']['graph'])) { $iinfo['graph'] = (array)$iinfo['graph'] + (array)$complete_conf['*']['graph']; }
+ if (isset($complete_conf['*']['page'])) { $iinfo['page'] = (array)$iinfo['page'] + (array)$complete_conf['*']['page']; }
+ }
+ }
+ else {
+ $iinfo = $complete_conf;
}
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;
// fields (data sources, DS)
// name - DS name
@@ -124,9 +138,10 @@ class rrdstat {
}
}
}
- $output = array(); $return_var = null;
- exec($create_cmd, $output, $return_var);
- if ($return_var) { trigger_error('rrd create returned with value '.$return_var, E_USER_WARNING); }
+ $return = `$create_cmd 2>&1`;
+ if (strpos($return, 'ERROR') !== false) {
+ trigger_error($this->rrd_file.' - rrd create error: '.$return, E_USER_WARNING);
+ }
else { $this->status = 'ok'; }
}
@@ -134,43 +149,60 @@ class rrdstat {
// feed new data into RRD
if ($this->status != 'ok') { trigger_error('Cannot update non-writeable file', E_USER_WARNING); return 1; }
$upvals = array();
- foreach($this->rrd_fields as $ds) {
- if (is_array($upArray) && isset($upArray[$ds['name']])) { $val = $upArray[$ds['name']]; }
- elseif (isset($ds['update'])) {
- $val = null; $evalcode = null;
- if (substr($ds['update'], 0, 4) == 'val:') {
- $evalcode = 'print(trim('.substr($ds['update'], 4).'));';
- }
- elseif (substr($ds['update'], 0, 8) == 'snmp-if:') {
- $snmphost = 'localhost'; $snmpcomm = 'public';
- list($nix, $ifname, $valtype) = explode(':', $ds['update'], 3);
- $iflist = explode("\n", `snmpwalk -v2c -c $snmpcomm $snmphost interfaces.ifTable.ifEntry.ifDescr`);
- $ifnr = null;
- foreach ($iflist as $ifdesc) {
- if (preg_match('/ifDescr\.(\d+) = STRING: '.$ifname.'/', $ifdesc, $regs)) { $ifnr = $regs[1]; }
+ if (isset($this->config_raw['update'])) {
+ $evalcode = $this->config_raw['update'];
+ if (!is_null($evalcode)) {
+ ob_start();
+ eval($evalcode);
+ $upvals = explode("\n", ob_get_contents());
+ 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) {
+ if (is_array($upArray) && isset($upArray[$ds['name']])) { $val = $upArray[$ds['name']]; }
+ elseif (isset($ds['update'])) {
+ $val = null; $evalcode = null;
+ if (substr($ds['update'], 0, 4) == 'val:') {
+ $evalcode = 'print(trim('.substr($ds['update'], 4).'));';
+ }
+ elseif (substr($ds['update'], 0, 8) == 'snmp-if:') {
+ $snmphost = 'localhost'; $snmpcomm = 'public';
+ list($nix, $ifname, $valtype) = explode(':', $ds['update'], 3);
+ $iflist = explode("\n", `snmpwalk -v2c -c $snmpcomm $snmphost interfaces.ifTable.ifEntry.ifDescr`);
+ $ifnr = null;
+ foreach ($iflist as $ifdesc) {
+ if (preg_match('/ifDescr\.(\d+) = STRING: '.$ifname.'/', $ifdesc, $regs)) { $ifnr = $regs[1]; }
+ }
+ $oid = null;
+ 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)));';
+ }
}
- $oid = null;
- 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)));';
+ else { $evalcode = $ds['update']; }
+ if (!is_null($evalcode)) {
+ ob_start();
+ eval($evalcode);
+ $val = ob_get_contents();
+ ob_end_clean();
}
}
- else { $evalcode = $ds['update']; }
- if (!is_null($evalcode)) {
- ob_start();
- eval($evalcode);
- $val = ob_get_contents();
- ob_end_clean();
- }
+ else { $val = null; }
+ $upvals[] = is_null($val)?'U':$val;
}
- else { $val = null; }
- $upvals[] = is_null($val)?'U':$val;
}
$update_cmd = 'rrdtool update '.$this->rrd_file.' N:'.implode(':', $upvals);
- $output = array(); $return_var = null;
- exec($update_cmd, $output, $return_var);
- if ($return_var) { trigger_error('rrd update returned with value '.$return_var, E_USER_WARNING); }
+ $return = `$update_cmd 2>&1`;
+
+ if (strpos($return, 'ERROR') !== false) {
+ trigger_error($this->rrd_file.' - rrd update error: '.$return, E_USER_WARNING);
+ $success = false;
+ }
+ else { $success = true; }
return ($return_var == 0);
}
@@ -191,7 +223,7 @@ class rrdstat {
$return = `$fetch_cmd 2>&1`;
if (strpos($return, 'ERROR') !== false) {
- trigger_error('rrd fetch error: '.$return, E_USER_WARNING);
+ trigger_error($this->rrd_file.' - rrd fetch error: '.$return, E_USER_WARNING);
$fresult = false;
}
else {
@@ -226,15 +258,11 @@ class rrdstat {
if (!in_array($this->status, array('ok','readonly'))) { trigger_error('Error: rrd status is '.$this->status, E_USER_WARNING); return false; }
// assemble configuration
- $gconf = $this->config_graph;
+ $gconf = (array)$extra;
if (!is_null($sub) && is_array($this->config_raw['graph.'.$sub])) {
- if (is_array($gconf)) { $gconf = array_merge($gconf, $this->config_raw['graph.'.$sub]); }
- else { $gconf = $this->config_raw['graph.'.$sub]; }
- }
- if (is_array($extra)) {
- if (is_array($gconf)) { $gconf = array_merge($gconf, $extra); }
- else { $gconf = $extra; }
+ $gconf = $gconf + $this->config_raw['graph.'.$sub];
}
+ $gconf = $gconf + (array)$this->config_graph;
if (isset($gconf['format']) && ($gconf['format'] == 'SVG')) {
$format = $gconf['format']; $fmt_ext = '.svg';
@@ -250,11 +278,13 @@ class rrdstat {
}
if (isset($gconf['filename'])) { $fname = $gconf['filename']; }
- else { $fname = str_replace('.rrd', (is_null($sub)?'':'-%s').'-%t%f', $this->rrd_file); }
+ else { $fname = $this->basename.(is_null($sub)?'':'-%s').'-%t%f'; }
$fname = str_replace('%s', strval($sub), $fname);
$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; }
+ $fname = str_replace('//', '/', $fname);
$graphrows = array(); $gC = 0;
$gDefs = ''; $gGraphs = ''; $addSpecial = '';
@@ -434,28 +464,24 @@ class rrdstat {
$return = `$graph_cmd 2>&1`;
if (strpos($return, 'ERROR') !== false) {
- trigger_error('rrd graph error: '.$return, E_USER_WARNING);
+ trigger_error($this->rrd_file.' - rrd graph error: '.$return, E_USER_WARNING);
$return = $graph_cmd."\n\n".$return;
}
+ $return = 'file:'.$fname."\n".$return;
return $return;
}
function simple_html($sub = null, $page_extras = null, $graph_extras = null) {
// create a simple (MRTG-like) HTML page and return it in a string
- $basename = str_replace('.rrd', '', $this->rrd_file);
// assemble configuration
- $pconf = $this->config_page;
+ $pconf = (array)$page_extras;
if (!is_null($sub) && is_array($this->config_raw['page.'.$sub])) {
- if (is_array($pconf)) { $gconf = array_merge($pconf, $this->config_raw['page.'.$sub]); }
- else { $pconf = $this->config_raw['page.'.$sub]; }
- }
- if (is_array($page_extras)) {
- if (is_array($pconf)) { $pconf = array_merge($pconf, $page_extras); }
- else { $pconf = $page_extras; }
+ $pconf = $pconf + $this->config_raw['page.'.$sub];
}
+ $pconf = $pconf + (array)$this->config_page;
- $ptitle = isset($pconf['title_page'])?$pconf['title_page']:$basename.' - RRD statistics';
+ $ptitle = isset($pconf['title_page'])?$pconf['title_page']:$this->basename.' - RRD statistics';
$gtitle = array();
$gtitle['day'] = isset($pconf['title_day'])?$pconf['title_day']:'Day overview (scaling 5 minutes)';
$gtitle['week'] = isset($pconf['title_week'])?$pconf['title_week']:'Week overview (scaling 30 minutes)';
@@ -481,7 +507,7 @@ class rrdstat {
$out .= ''.$ptitle.'
';
if (!isset($pconf['show_update']) || $pconf['show_update']) {
- $out .= 'Last Update: '.date('Y-m-d H:i:s', $this->last_update()).'
';
+ $out .= 'Last Update: '.(is_null($this->last_update())?'unknown':date('Y-m-d H:i:s', $this->last_update())).'
';
}
if (in_array($this->status, array('ok','readonly'))) {
@@ -491,9 +517,13 @@ class rrdstat {
if (strpos($ret, "\n\n") !== false) { $graph_cmd = substr($ret, 0, strpos($ret, "\n\n")); $ret = substr($ret, strpos($ret, "\n\n")+2); }
else { $graph_cmd = null; }
$grout = explode("\n",$ret);
+ $gfilename = null;
$gmeta = array();
foreach ($grout as $gline) {
- if (preg_match('/^(\d+)x(\d+)$/', $gline, $regs)) {
+ if (preg_match('/^file:(.+)$/', $gline, $regs)) {
+ $gfilename = $regs[1];
+ }
+ elseif (preg_match('/^(\d+)x(\d+)$/', $gline, $regs)) {
$gmeta['width'] = $regs[1]; $gmeta['height'] = $regs[2];
}
elseif (preg_match('/^([^\|]+)\|([^|]+)\|([^\|]*)$/', $gline, $regs)) {
@@ -506,11 +536,21 @@ class rrdstat {
$gmeta['info'][] = $gline;
}
}
+ if (is_null($gfilename)) { $gfilename = $this->basename.(!is_null($g_sub)?'-'.$g_sub:'').'-'.$tframe.'.png'; }
+ if (isset($pconf['graph_url'])) {
+ $gURL = $pconf['graph_url'];
+ $fname = str_replace('%f', basename($gfilename), $gURL);
+ $fname = str_replace('%p', $gfilename, $gURL);
+ if (substr($gURL, -1) == '/') { $gURL .= $gfilename; }
+ }
+ else {
+ $gURL = $gfilename;
+ }
$out .= '';
// $out .= '
'.nl2br($ret).'
';
$out .= '
'.$gtitle[$tframe].'
';
- $out .= '
?'-'.$g_sub:'').'-'.$tframe.'.png)
basename.(!is_null($g_sub)?' - '.$g_sub:'').' - '.$tframe.'" class="rrdgraph"';
$out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;">';
if (isset($gmeta['data']) && count($gmeta['data'])) {
$out .= '