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);
$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";');
$return = null;
if (count($upvals)) {
$update_cmd = $this->rrdtool_bin.' update '.$this->rrd_file
- .($key_names?' --template '.implode(':', array_keys($upvals)):'').' N:'.implode(':', $upvals);
+ .($keys_have_names?' --template '.implode(':', array_keys($upvals)):'').' N:'.implode(':', $upvals);
$return = `$update_cmd 2>&1`;
}
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 = $this->rrdtool_bin.' fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution
+ $fetch_cmd = 'LANG=C '.$this->rrdtool_bin.' fetch '.$this->rrd_file.' '.$cf.' --resolution '.$resolution
.' --start '.$start.' --end '.$end;
$return = `$fetch_cmd 2>&1`;
$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);
public function last_update() {
// fetch time of last update in this RRD file
- static $last_update;
+ static $last_update, $last_saved;
+ if (isset($last_update) && isset($last_saved) && ($last_saved <= (time() - 10))) { unset($last_update); }
if (!isset($last_update) && in_array($this->status, array('ok','readonly'))) {
$last_cmd = $this->rrdtool_bin.' last '.$this->rrd_file;
$return = trim(`$last_cmd 2>&1`);
$last_update = is_numeric($return)?$return:null;
+ $last_saved = time();
}
return isset($last_update)?$last_update:null;
}
$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($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);
foreach ($snames as $iname) {
$newstat = array('name'=>$iname);
$sfiles[] = isset($this->config_all[$iname]['file'])?$this->config_all[$iname]['file']:$iname.'.rrd';
- if (is_array($this->config_all[$iname])) {
+ if (is_array(@$this->config_all[$iname])) {
foreach ($this->config_all[$iname] as $key=>$val) {
if (substr($key, 0, 5) == 'page.') { $newstat['sub'][] = substr($key, 5); }
}