allow graph-only configs with external file references in graph rows

[php-utility-classes.git] / include / classes / rrdstat.php-class

diff --git a/include/classes/rrdstat.php-class b/include/classes/rrdstat.php-class
index 9adb461d1e5232ddb9da72c315c9638e6d1e7cd1..2eece6d227f1f7a09b2cbdf5d1b0a586fded0d9d 100644 (file)
--- a/include/classes/rrdstat.php-class
+++ b/include/classes/rrdstat.php-class
@@ -3,6 +3,7 @@
 class rrdstat {
 
   var $rrd_file = null;
 class rrdstat {
 
   var $rrd_file = null;

+  var $basename = null;

 
   var $config_raw = null;
   var $config_graph = null;
 
   var $config_raw = null;
   var $config_graph = null;


@@ -19,10 +20,10 @@ class rrdstat {
     // ***** init RRD stat module *****
     $this->set_def($rrdconfig, $conf_id);
 
     // ***** 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 (!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 {
           else { trigger_error('RRD file can not be created', E_USER_WARNING); }
         }
         else {


@@ -58,9 +59,16 @@ class rrdstat {
       $iinfo = $complete_conf;
     }
 
       $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->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
 
     // fields (data sources, DS)
     //  name - DS name


@@ -136,9 +144,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'; }
   }
 
     else { $this->status = 'ok'; }
   }
 


@@ -151,9 +160,12 @@ class rrdstat {
       if (!is_null($evalcode)) {
         ob_start();
         eval($evalcode);
       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();
       }
         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) {
     }
     else {
       foreach ($this->rrd_fields as $ds) {


@@ -190,10 +202,17 @@ class rrdstat {
         $upvals[] = is_null($val)?'U':$val;
       }
     }
         $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 = 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);
+      $success = false;
+    }
+    else { $success = true; }

   return ($return_var == 0);
   }
 
   return ($return_var == 0);
   }
 


@@ -214,7 +233,7 @@ class rrdstat {
     $return = `$fetch_cmd 2>&1`;
 
     if (strpos($return, 'ERROR') !== false) {
     $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 {
       $fresult = false;
     }
     else {


@@ -246,7 +265,7 @@ class rrdstat {
       $gColors = array('#00CC00','#0000FF','#000000','#FF0000','#00FF00','#FFFF00','#FF00FF','#00FFFF','#808080','#800000','#008000','#000080','#808000','#800080','#008080','#C0C0C0');
     }
 
       $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;
 
     // assemble configuration
     $gconf = (array)$extra;


@@ -269,7 +288,7 @@ class rrdstat {
     }
 
     if (isset($gconf['filename'])) { $fname = $gconf['filename']; }
     }
 
     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);
     $fname = str_replace('%s', strval($sub), $fname);
     $fname = str_replace('%t', $timeframe, $fname);
     $fname = str_replace('%f', $fmt_ext, $fname);


@@ -306,8 +325,8 @@ class rrdstat {
       $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
       $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
     }
     else {
       $duration = isset($gconf['duration'])?$gconf['duration']:$this->rrd_step*500; // 500 steps


@@ -323,6 +342,7 @@ class rrdstat {
           $grow['name'] = $erow['name'].(isset($erow['scale'])?'_tmp':'');
           if ($grow['dType'] == 'DEF') {
             $grow['dsname'] = isset($erow['dsname'])?$erow['dsname']:$erow['name'];
           $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 {
             $grow['cf'] = isset($erow['cf'])?$erow['cf']:'AVERAGE';
           }
           else {


@@ -343,6 +363,7 @@ class rrdstat {
             if (!isset($gconf['show_legend'])) { $gconf['show_legend'] = true; }
           }
           if (isset($erow['stack'])) { $grow['stack'] = ($erow['stack'] == true); }
             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;
         }
       }
           $graphrows[] = $grow;
         }
       }


@@ -392,7 +413,7 @@ class rrdstat {
     else {
       foreach ($graphrows as $grow) {
         if (isset($grow['gType']) && strlen($grow['gType'])) {
     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');
           // 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');


@@ -431,7 +452,11 @@ class rrdstat {
     foreach ($graphrows as $grow) {
       if (isset($grow['dType']) && strlen($grow['dType'])) {
         $gDefs .= ' '.$grow['dType'].':'.$grow['name'].'=';
     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
       }
       if (isset($grow['gType']) && strlen($grow['gType'])) {
         // XXX: change from STACK type to STACK flag once we have rrdtool 1.2


@@ -455,7 +480,7 @@ class rrdstat {
     $return = `$graph_cmd 2>&1`;
 
     if (strpos($return, 'ERROR') !== false) {
     $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 = $graph_cmd."\n\n".$return;
     }
     $return = 'file:'.$fname."\n".$return;


@@ -464,7 +489,6 @@ class rrdstat {
 
   function simple_html($sub = null, $page_extras = null, $graph_extras = null) {
     // create a simple (MRTG-like) HTML page and return it in a string
 
   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 = (array)$page_extras;
 
     // assemble configuration
     $pconf = (array)$page_extras;


@@ -473,7 +497,7 @@ class rrdstat {
     }
     $pconf = $pconf + (array)$this->config_page;
 
     }
     $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)';
     $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)';


@@ -499,10 +523,10 @@ class rrdstat {
 
     $out .= '<h1>'.$ptitle.'</h1>';
     if (!isset($pconf['show_update']) || $pconf['show_update']) {
 
     $out .= '<h1>'.$ptitle.'</h1>';
     if (!isset($pconf['show_update']) || $pconf['show_update']) {

-      $out .= '<p class="last_up">Last Update: '.date('Y-m-d H:i:s', $this->last_update()).'</p>';
+      $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);
       $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);


@@ -528,7 +552,7 @@ class rrdstat {
             $gmeta['info'][] = $gline;
           }
         }
             $gmeta['info'][] = $gline;
           }
         }

-        if (is_null($gfilename)) { $gfilename = $basename.(!is_null($g_sub)?'-'.$g_sub:'').'-'.$tframe.'.png'; }
+        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);
         if (isset($pconf['graph_url'])) {
           $gURL = $pconf['graph_url'];
           $fname = str_replace('%f', basename($gfilename), $gURL);


@@ -542,7 +566,7 @@ class rrdstat {
 //         $out .= '<p>'.nl2br($ret).'</p>';
         $out .= '<h2>'.$gtitle[$tframe].'</h2>';
         $out .= '<img src="'.$gURL.'"';
 //         $out .= '<p>'.nl2br($ret).'</p>';
         $out .= '<h2>'.$gtitle[$tframe].'</h2>';
         $out .= '<img src="'.$gURL.'"';

-        $out .= ' alt="'.$basename.(!is_null($g_sub)?' - '.$g_sub:'').' - '.$tframe.'" class="rrdgraph"';
+        $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['data']) && count($gmeta['data'])) {
           $out .= '<table class="gdata">';
         $out .= ' style="width:'.$gmeta['width'].'px;height:'.$gmeta['height'].'px;">';
         if (isset($gmeta['data']) && count($gmeta['data'])) {
           $out .= '<table class="gdata">';