X-Git-Url: https://git-public.kairo.at/?a=blobdiff_plain;ds=inline;f=include%2Fclasses%2Frrdstat.php-class;h=2fc1de17c7b02186a494e3fcab683a971bf4a949;hb=f5e899dff253a61864949d7596252b2163920c2c;hp=6b241c7d281f0faf2c90304f47a8b009296717d6;hpb=099bd59fede8a97b821b13ad8a931239c9c751bf;p=php-utility-classes.git diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class index 6b241c7..2fc1de1 100644 --- a/include/classes/rrdstat.php-class +++ b/include/classes/rrdstat.php-class @@ -263,6 +263,17 @@ class rrdstat { return $fresult; } + function last_update() { + // 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; + $return = trim(`$last_cmd 2>&1`); + $last_update = is_numeric($return)?$return:null; + } + return isset($last_update)?$last_update:null; + } + function graph($timeframe = 'day', $sub = null, $extra = null) { // create a RRD graph static $gColors; @@ -492,6 +503,36 @@ class rrdstat { return $return; } + function graph_plus($timeframe = 'day', $sub = null, $extra = null) { + // create a RRD graph and return meta info as a ready-to-use array + $gmeta = array('filename'=>null); + $ret = $this->graph($timeframe, $sub, $extra); + if (strpos($ret, "\n\n") !== false) { $gmeta['graph_cmd'] = substr($ret, 0, strpos($ret, "\n\n")); $ret = substr($ret, strpos($ret, "\n\n")+2); } + else { $gmeta['graph_cmd'] = null; } + $grout = explode("\n", $ret); + foreach ($grout as $gline) { + if (preg_match('/^file:(.+)$/', $gline, $regs)) { + $gmeta['filename'] = $regs[1]; + } + elseif (preg_match('/^(\d+)x(\d+)$/', $gline, $regs)) { + $gmeta['width'] = $regs[1]; $gmeta['height'] = $regs[2]; + } + elseif (preg_match('/^([^\|]+)\|([^|]+)\|([^\|]*)$/', $gline, $regs)) { + $gmeta['data'][$regs[1]][$regs[2]] = $regs[3]; + } + elseif (preg_match('/^([^\|]+)\|([^\|]*)$/', $gline, $regs)) { + $gmeta['var'][$regs[1]] = $regs[2]; + } + elseif (strlen(trim($gline))) { + $gmeta['info'][] = $gline; + } + } + if (is_null($gmeta['filename'])) { + $gmeta['filename'] = $this->basename.(!is_null($sub)?'-'.$sub:'').'-'.$timeframe.'.png'; + } + return $gmeta; + } + function page($sub = null, $page_extras = null, $graph_extras = null) { // create a (HTML) page and return it in a string @@ -535,7 +576,7 @@ class rrdstat { function page_index($pconf) { // create a bare, very simple index list HTML page and return it in a string - $ptitle = isset($pconf['title_page'])?$pconf['title_page']:'Index - RRD statistics'; + $ptitle = isset($pconf['title_page'])?$pconf['title_page']:'RRD statistics index'; $out = '
'; $out .= 'The following RRD stats are available:
'; - - $out .= ''.$pconf['text_intro'].'
'; } - if (isset($pconf['scan_files']) && $pconf['scan_files']) { - $rrdfiles = glob('*.rrd'); - foreach ($rrdfiles as $rrdfile) { - $iname = (substr($rrdfile, -4) == '.rrd')?substr($rrdfile, 0, -4):$rrdfile; - if (!in_array($rrdfile, $sfiles) && !(in_array($iname, $s_exclude))) { - $stats[] = array('name'=>$iname, 'class'=>'scanfile'); - } - } + elseif (!isset($pconf['text_intro'])) { + $out .= 'The following RRD stats are available:
'; } + + $stats = $this->h_page_statsArray($pconf); + + $out .= ''.$pconf['text_intro'].'
'; } + + $stats = $this->h_page_statsArray($pconf); + + $num_rows = is_numeric($pconf['num_rows'])?$pconf['num_rows']:2; + $num_cols = ceil(count($stats)/$num_rows); + + $out .= '';
+ if ($idx < count($stats)) {
+ list($sname, $s_psub) = explode('|', $stats[$idx]['name'], 2);
+ $s_psname = 'page'.(isset($s_psub)?'.'.$s_psub:'');
+ $g_sub = $this->config_all[$sname][$s_psname]['graph_sub'];
+
+ if (isset($this->config_all[$sname][$s_psname]['title_page'])) {
+ $s_ptitle = $this->config_all[$sname][$s_psname]['title_page'];
+ }
+ elseif (isset($this->config_all[$sname]['page']['title_page'])) {
+ $s_ptitle = $this->config_all[$sname]['page']['title_page'];
+ }
+ else {
+ $s_ptitle = $sname.(isset($s_psub)?' ('.$s_psub.')':'').' statistics';
+ }
+ if (!isset($pconf['hide_titles']) || !$pconf['hide_titles']) {
+ $out .= ''.$s_ptitle.''; + } + + $s_rrd = new rrdstat($this->config_all, $sname); + if (in_array($s_rrd->status, array('ok','readonly','graphonly'))) { + $tframe = isset($pconf['graph_timeframe'])?$pconf['graph_timeframe']:'day'; + $gmeta = $s_rrd->graph_plus($tframe, $g_sub); + if (isset($pconf['graph_url'])) { + $gURL = $pconf['graph_url']; + $fname = str_replace('%f', basename($gmeta['filename']), $gURL); + $fname = str_replace('%p', $gmeta['filename'], $gURL); + if (substr($gURL, -1) == '/') { $gURL .= $gmeta['filename']; } + } + else { + $gURL = $gmeta['filename']; + } + $out .= 'basename.(!is_null($g_sub)?' - '.$g_sub:'').' - '.$tframe.'" class="rrdgraph"'; + $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;">'; + $out .= ''; + } + else { + $out .= 'RRD error: status is "'.$s_rrd->status.'"'; + } + } + else { + $out .= ' '; + } + $out .= ' | ';
+ }
+ $out .= '
Last Update: '.(is_null($this->last_update())?'unknown':date('Y-m-d H:i:s', $this->last_update())).'
'; } + $g_sub = isset($pconf['graph_sub'])?$pconf['graph_sub']:null; 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); - 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('/^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)) { - $gmeta['data'][$regs[1]][$regs[2]] = $regs[3]; - } - elseif (preg_match('/^([^\|]+)\|([^\|]*)$/', $gline, $regs)) { - $gmeta['var'][$regs[1]] = $regs[2]; - } - elseif (strlen(trim($gline))) { - $gmeta['info'][] = $gline; - } - } - if (is_null($gfilename)) { $gfilename = $this->basename.(!is_null($g_sub)?'-'.$g_sub:'').'-'.$tframe.'.png'; } + $gmeta = $this->graph_plus($tframe, $g_sub, $graph_extras); 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; } + $fname = str_replace('%f', basename($gmeta['filename']), $gURL); + $fname = str_replace('%p', $gmeta['filename'], $gURL); + if (substr($gURL, -1) == '/') { $gURL .= $gmeta['filename']; } } else { - $gURL = $gfilename; + $gURL = $gmeta['filename']; } $out .= ''.nl2br($ret).'
'; @@ -712,31 +782,65 @@ class rrdstat { $out .= ''.$gval.'
'; } } + $out .= '