// else it's the configuration for this one RRD
// currently only a config array is supported, XML config is planned
//
+ // private $rrdtool_bin
+ // RRDtool binary to use
+ //
// private $rrd_file
// RRD file name
//
// private function text_quote($text)
// return a quoted/escaped text for use in rrdtool commandline text fields
+ private $rrdtool_bin = '/usr/bin/rrdtool';
+
private $rrd_file = null;
private $basename = null;
private $basedir = null;
function __construct($rrdconfig, $conf_id = null) {
// ***** init RRD stat module *****
$this->mod_textdomain = 'class_rrdstat';
- $mod_charset = 'iso-8859-15';
+ $mod_charset = 'utf-8';
bindtextdomain($this->mod_textdomain, class_exists('baseutils')?baseutils::getDir('locale'):'locale/');
bind_textdomain_codeset($this->mod_textdomain, $mod_charset);
$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']; }
+ 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 {
}
- // MRTG-style RRD "database", see http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/tut/rrdtutorial.en.html
+ // MRTG-style RRD "database", see http://oss.oetiker.ch/rrdtool/tut/rrdtutorial.en.html
//
// archives (RRAs):
// 600 samples of 5 minutes (2 days and 2 hours)
// return RRDtool version
static $version;
if (!isset($version)) {
- $create_cmd = 'rrdtool --version';
+ $create_cmd = $this->rrdtool_bin.' --version';
$return = `$create_cmd 2>&1`;
if (strpos($return, 'ERROR') !== false) {
trigger_error($this->rrd_file.' - rrd version error: '.$return, E_USER_WARNING);
// create RRD file
// compose create command
- $create_cmd = 'rrdtool create '.$this->rrd_file.' --step '.$this->rrd_step;
+ $create_cmd = $this->rrdtool_bin.' create '.$this->rrd_file.' --step '.$this->rrd_step;
foreach ($this->rrd_fields as $ds) {
if (!isset($ds['type'])) { $ds['type'] = 'COUNTER'; }
if (!isset($ds['heartbeat'])) { $ds['heartbeat'] = 2*$this->rrd_step; }
$evalcode = 'function { return 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);
+ if (substr_count($ds['update'], ':') >= 4) {
+ list($nix, $snmphost, $snmpcomm, $ifname, $valtype) = explode(':', $ds['update'], 5);
+ }
+ else {
+ $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) {
$upvals[$ds['name']] = $val;
}
}
- $key_names = (!is_numeric(array_shift(array_keys($upvals))));
+ $upval_keys = array_keys($upvals);
+ $keys_have_names = !is_numeric(array_shift($upval_keys));
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] = $key_names?$lastvals[$akey]:$lastvals[$rowids[$akey]];
+ $upvals[$akey] = $keys_have_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.($key_names?' --template '.implode(':', array_keys($upvals)):'').' N:'.implode(':', $upvals);
+ $update_cmd = $this->rrdtool_bin.' update '.$this->rrd_file
+ .($keys_have_names?' --template '.implode(':', array_keys($upvals)):'').' N:'.implode(':', $upvals);
$return = `$update_cmd 2>&1`;
}
public function fetch($cf = 'AVERAGE', $resolution = null, $start = null, $end = null) {
// fetch data from a RRD
- 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'))) {
+ trigger_error('Error: rrd status is '.$this->status, E_USER_WARNING); return false;
+ }
if (!in_array($cf, array('AVERAGE','MIN','MAX','LAST'))) { $cf = 'AVERAGE'; }
if (!is_numeric($resolution)) { $resolution = $this->rrd_step; }
if (!is_numeric($end)) { $end = $this->last_update(); }
elseif ($end < 0) { $end += $this->last_update(); }
$end = intval($end/$resolution)*$resolution;
- if (!is_numeric($start)) { $start = $end; }
+ if (!is_numeric($start)) { $start = $end-$resolution; }
elseif ($start < 0) { $start += $end; }
$start = intval($start/$resolution)*$resolution;
- $fetch_cmd = 'rrdtool fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution.' --start '.$start.' --end '.$end;
+ $fetch_cmd = 'LANG=C '.$this->rrdtool_bin.' fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution
+ .' --start '.$start.' --end '.$end;
$return = `$fetch_cmd 2>&1`;
if (strpos($return, 'ERROR') !== false) {
$fresult = array();
$rows = explode("\n", $return);
$fields = preg_split('/\s+/', array_shift($rows));
- if (array_shift($fields) == 'timestamp') {
- $fresult[0] = $fields;
+ if (in_array(array_shift($fields), array('timestamp', ''))) {
+ //$fresult[0] = $fields;
foreach ($rows as $row) {
if (strlen(trim($row))) {
$rvals = preg_split('/\s+/', $row);
// 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;
+ $last_cmd = $this->rrdtool_bin.' last '.$this->rrd_file;
$return = trim(`$last_cmd 2>&1`);
$last_update = is_numeric($return)?$return:null;
}
// create a RRD graph
static $gColors;
if (!isset($gColors)) {
- $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','graphonly'))) { 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;
foreach ($grow_def as $key=>$erow) {
if (isset($erow['name']) && strlen($erow['name'])) {
if (!isset($erow['scale']) && isset($gconf['scale'])) { $erow['scale'] = $gconf['scale']; }
- if (!isset($erow['scale_time_src']) && isset($gconf['scale_time_src'])) { $erow['scale_time_src'] = $gconf['scale_time_src']; }
- if (!isset($erow['scale_time_tgt']) && isset($gconf['scale_time_tgt'])) { $erow['scale_time_tgt'] = $gconf['scale_time_tgt']; }
+ if (!isset($erow['scale_time_src']) && isset($gconf['scale_time_src'])) {
+ $erow['scale_time_src'] = $gconf['scale_time_src'];
+ }
+ if (!isset($erow['scale_time_tgt']) && isset($gconf['scale_time_tgt'])) {
+ $erow['scale_time_tgt'] = $gconf['scale_time_tgt'];
+ }
foreach (array('scale_time_src','scale_time_tgt') as $st) {
if (!isset($erow[$st]) || !is_numeric($erow[$st])) {
switch (@$erow[$st]) {
$grow = array();
$grow['dType'] = 'CDEF';
$grow['name'] = $erow['name'];
- $grow['rpn_expr'] = $erow['name'].'_tmp,'.$erow['scale'].',*';
+ $grow['rpn_expr'] = $erow['name'].'_tmp,'.sprintf('%F', $erow['scale']).',*';
}
if ($use_gcrows) { $grow['gType'] = isset($erow['gType'])?$erow['gType']:'LINE1'; }
else { $grow['gType'] = ((count($grow_def)==2) && ($key==0))?'AREA':'LINE1'; }
}
if (isset($crow['cf'])) {
if ($this->rrd_version() >= '1.2') {
- $graphrows[] = array('dType'=>'VDEF', 'name'=>$srow['name'].'_'.$crow['cf'], 'rpn_expr'=>$srow['name'].','.$crow['cf']);
+ $graphrows[] = array('dType'=>'VDEF', 'name'=>$srow['name'].'_'.$crow['cf'],
+ 'rpn_expr'=>$srow['name'].','.$crow['cf']);
}
}
elseif (isset($crow['rpn_expr'])) {
$textprefix = isset($grow['desc'])?$grow['desc']:(isset($grow['legend'])?$grow['legend']:$grow['name']);
if ($this->rrd_version() >= '1.2') {
$graphrows[] = array('dType'=>'VDEF', 'name'=>'_'.$grow['name'].'__max', 'rpn_expr'=>$grow['name'].',MAXIMUM');
- $specialrows[] = array('sType'=>'PRINT', 'name'=>'_'.$grow['name'].'__max', 'text'=>$textprefix.'|'.dgettext($td, 'Maximum').'|%.2lf%s');
+ $specialrows[] = array('sType'=>'PRINT', 'name'=>'_'.$grow['name'].'__max',
+ 'text'=>$textprefix.'|'.dgettext($td, 'Maximum').'|%.2lf%s');
$graphrows[] = array('dType'=>'VDEF', 'name'=>'_'.$grow['name'].'__avg', 'rpn_expr'=>$grow['name'].',AVERAGE');
- $specialrows[] = array('sType'=>'PRINT', 'name'=>'_'.$grow['name'].'__avg', 'text'=>$textprefix.'|'.dgettext($td, 'Average').'|%.2lf%s');
+ $specialrows[] = array('sType'=>'PRINT', 'name'=>'_'.$grow['name'].'__avg',
+ 'text'=>$textprefix.'|'.dgettext($td, 'Average').'|%.2lf%s');
$graphrows[] = array('dType'=>'VDEF', 'name'=>'_'.$grow['name'].'__last', 'rpn_expr'=>$grow['name'].',LAST');
- $specialrows[] = array('sType'=>'PRINT', 'name'=>'_'.$grow['name'].'__last', 'text'=>$textprefix.'|'.dgettext($td, 'Current').'|%.2lf%s');
+ $specialrows[] = array('sType'=>'PRINT', 'name'=>'_'.$grow['name'].'__last',
+ 'text'=>$textprefix.'|'.dgettext($td, 'Current').'|%.2lf%s');
}
else {
- $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'MAX', 'text'=>$textprefix.'|'.dgettext($td, 'Maximum').'|%.2lf%s');
- $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'AVERAGE', 'text'=>$textprefix.'|'.dgettext($td, 'Average').'|%.2lf%s');
- $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'LAST', 'text'=>$textprefix.'|'.dgettext($td, 'Current').'|%.2lf%s');
+ $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'MAX',
+ 'text'=>$textprefix.'|'.dgettext($td, 'Maximum').'|%.2lf%s');
+ $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'AVERAGE',
+ 'text'=>$textprefix.'|'.dgettext($td, 'Average').'|%.2lf%s');
+ $specialrows[] = array('sType'=>'PRINT', 'name'=>$grow['name'], 'cf'=>'LAST',
+ 'text'=>$textprefix.'|'.dgettext($td, 'Current').'|%.2lf%s');
}
}
}
$addSpecial .= ':'.$this->text_quote($srow['text']);
}
- $graph_cmd = 'rrdtool graph '.str_replace('*', '\*', $fname.$gOpts.$gDefs.$gGraphs.$addSpecial);
+ $graph_cmd = $this->rrdtool_bin.' graph '.str_replace('*', '\*', $fname.$gOpts.$gDefs.$gGraphs.$addSpecial);
$return = `$graph_cmd 2>&1`;
if (strpos($return, 'ERROR') !== false) {
$out .= '<body>'."\n";
$out .= '<h1>'.$ptitle.'</h1>'."\n";
- if (isset($pconf['text_intro']) && strlen($pconf['text_intro'])) { $out .= '<p class="intro">'.$pconf['text_intro'].'</p>'; }
+ if (isset($pconf['text_intro']) && strlen($pconf['text_intro'])) {
+ $out .= '<p class="intro">'.$pconf['text_intro'].'</p>';
+ }
$stats = $this->h_page_statsArray($pconf);
if (isset($pconf['stats_url_add'])) { $sURL_add = $pconf['stats_url_add']; }
else { $sURL_add = '&sub=%s'; }
- $num_rows = is_numeric($pconf['num_rows'])?$pconf['num_rows']:2;
- $num_cols = ceil(count($stats)/$num_rows);
+ $default_num_cols = $GLOBALS['ua']->isMobile()?1:2;
+ $num_cols = is_numeric($pconf['num_rows'])?$pconf['num_rows']:$default_num_cols;
+ $num_rows = ceil(count($stats)/$num_cols);
$out .= '<table class="overview">'."\n";
- for ($col = 0; $col < $num_cols; $col++) {
+ for ($row = 0; $row < $num_rows; $row++) {
$out .= '<tr>'."\n";
- for ($row = 0; $row < $num_rows; $row++) {
- $idx = $col * $num_rows + $row;
+ for ($col = 0; $col < $num_cols; $col++) {
+ $idx = $row * $num_cols + $col;
$out .= '<td>'."\n";
if ($idx < count($stats)) {
@list($sname, $s_psub) = explode('|', $stats[$idx]['name'], 2);
$s_ptitle = $this->config_all[$sname]['page']['title_page'];
}
else {
- $s_ptitle = isset($s_psub)?sprintf(dgettext($td, '%s (%s) statistics'), $sname, $s_psub):sprintf(dgettext($td, '%s statistics'), $sname);
+ $s_ptitle = isset($s_psub)
+ ?sprintf(dgettext($td, '%s (%s) statistics'), $sname, $s_psub)
+ :sprintf(dgettext($td, '%s statistics'), $sname);
}
if (!isset($pconf['hide_titles']) || !$pconf['hide_titles']) {
$out .= '<h2>'.$s_ptitle.'</h2>'."\n";
$out .= '<a href="'.$sURL.'">';
$out .= '<img src="'.$gURL.'"';
$out .= ' alt="'.$s_rrd->basename.(!is_null($g_sub)?' - '.$g_sub:'').' - '.$tframe.'" class="rrdgraph"';
- if (isset($gmeta['width']) && isset($gmeta['height'])) { $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 .= '></a>'."\n";
}
else {
$out .= '<body>'."\n";
$out .= '<h1>'.$ptitle.'</h1>'."\n";
- if (isset($pconf['text_intro']) && strlen($pconf['text_intro'])) { $out .= '<p class="intro">'.$pconf['text_intro'].'</p>'."\n"; }
+ if (isset($pconf['text_intro']) && strlen($pconf['text_intro'])) {
+ $out .= '<p class="intro">'.$pconf['text_intro'].'</p>'."\n";
+ }
if (!isset($pconf['show_update']) || $pconf['show_update']) {
$out .= '<p class="last_up">';
if (is_null($this->last_update())) { $up_time = dgettext($td, 'unknown'); }
$out .= '<h2>'.$gtitle[$tframe].'</h2>'."\n";
$out .= '<img src="'.$gURL.'"';
$out .= ' alt="'.$this->basename.(!is_null($g_sub)?' - '.$g_sub:'').' - '.$tframe.'" class="rrdgraph"';
- if (isset($gmeta['width']) && isset($gmeta['height'])) { $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 .= '>'."\n";
- $colorize_data = (isset($pconf['data_colorize']) && $pconf['data_colorize']) || (!isset($pconf['data_colorize']) && $gmeta['default_colorize']);
+ $colorize_data = (isset($pconf['data_colorize']) && $pconf['data_colorize']) ||
+ (!isset($pconf['data_colorize']) && $gmeta['default_colorize']);
if (isset($gmeta['data']) && count($gmeta['data'])) {
$out .= '<table class="gdata">'."\n";
foreach ($gmeta['data'] as $field=>$gdata) {
// return generic page footer
$out = '<p class="footer">';
$out .= sprintf(dgettext($this->mod_textdomain, 'Statistics created with %s using a library created by %s.'),
- '<a href="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/">RRDtool</a>',
+ '<a href="http://oss.oetiker.ch/rrdtool/">RRDtool</a>',
'<a href="http://www.kairo.at/">KaiRo.at</a>');
$out .= '</p>'."\n";
return $out;
projects / php-utility-classes.git / blobdiff