projects
/
php-utility-classes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
75124b9
)
allow to magically find files if they're named <conf_id>.rrd
author
robert
<robert>
Wed, 18 May 2005 21:55:18 +0000
(21:55 +0000)
committer
robert
<robert>
Wed, 18 May 2005 21:55:18 +0000
(21:55 +0000)
include/classes/rrdstat.php-class
patch
|
blob
|
blame
|
history
diff --git
a/include/classes/rrdstat.php-class
b/include/classes/rrdstat.php-class
index ff144456b2103bd05cc17c041443600b7510f21c..680516c136f8eb3594d9939534d79d5eeefb5db9 100644
(file)
--- a/
include/classes/rrdstat.php-class
+++ b/
include/classes/rrdstat.php-class
@@
-68,11
+68,15
@@
class rrdstat {
$this->rrd_file = $iinfo['file'];
$this->basename = (substr($this->rrd_file, -4) == '.rrd')?substr($this->rrd_file, 0, -4):$this->rrd_file;
}
$this->rrd_file = $iinfo['file'];
$this->basename = (substr($this->rrd_file, -4) == '.rrd')?substr($this->rrd_file, 0, -4):$this->rrd_file;
}
+ elseif (!is_null($conf_id) && file_exists($conf_id.'.rrd')) {
+ $this->rrd_file = $conf_id.'.rrd';
+ $this->basename = $conf_id;
+ }
else {
$this->basename = !is_null($conf_id)?$conf_id:'xxx.unknown';
}
else {
$this->basename = !is_null($conf_id)?$conf_id:'xxx.unknown';
}
- if (
isset($iinfo['file']
)) {
+ if (
!is_null($this->rrd_file
)) {
// fields (data sources, DS)
// name - DS name
// type - one of COUNTER, GAUGE, DERIVE, ABSOLUTE
// fields (data sources, DS)
// name - DS name
// type - one of COUNTER, GAUGE, DERIVE, ABSOLUTE
@@
-312,7
+316,7
@@
class rrdstat {
if (isset($gconf['path'])) { $fname = $gconf['path'].'/'.$fname; }
$fname = str_replace('//', '/', $fname);
if (isset($gconf['path'])) { $fname = $gconf['path'].'/'.$fname; }
$fname = str_replace('//', '/', $fname);
- $graphrows = array(); $gC = 0;
+ $graphrows = array(); $
specialrows = array(); $
gC = 0;
$gDefs = ''; $gGraphs = ''; $addSpecial = '';
if ($timeframe == 'day') {
$gDefs = ''; $gGraphs = ''; $addSpecial = '';
if ($timeframe == 'day') {