diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-26 15:43:29 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-26 15:43:29 +0000 |
| commit | e121a9da67616bab13ba7b7f38d86b3e02391d71 (patch) | |
| tree | 72e01c9f45be4ef5e53f2f85faa997553bbfdcdf /frontends/php/include/classes/pie.inc.php | |
| parent | b09b9afef4f9b1e1d29f5b759832554dab0c9cc8 (diff) | |
| download | zabbix-e121a9da67616bab13ba7b7f38d86b3e02391d71.tar.gz zabbix-e121a9da67616bab13ba7b7f38d86b3e02391d71.tar.xz zabbix-e121a9da67616bab13ba7b7f38d86b3e02391d71.zip | |
- improvements in data source pickup decision in graphs (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5539 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/classes/pie.inc.php')
| -rw-r--r-- | frontends/php/include/classes/pie.inc.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/frontends/php/include/classes/pie.inc.php b/frontends/php/include/classes/pie.inc.php index dadc4bc4..058d743d 100644 --- a/frontends/php/include/classes/pie.inc.php +++ b/frontends/php/include/classes/pie.inc.php @@ -87,6 +87,7 @@ function selectData(){ for($i=0; $i < $this->num; $i++){ + $real_item = get_item_by_itemid($this->items[$i]['itemid']); $type = $this->items[$i]['calc_type']; $from_time = $this->from_time; @@ -94,7 +95,9 @@ function selectData(){ $sql_arr = array(); - if(($this->period / $this->sizeX) <= (ZBX_MAX_TREND_DIFF / ZBX_GRAPH_MAX_SKIP_CELL)){ + if((($real_item['history']*86400) > (time()-($from_time+$this->period/2))) && // should pick data from history or trends + (($this->period / $this->sizeX) <= (ZBX_MAX_TREND_DIFF / ZBX_GRAPH_MAX_SKIP_CELL))) // is reasonable to take data from history? + { array_push($sql_arr, 'SELECT h.itemid, '. ' avg(h.value) AS avg,min(h.value) AS min, '. |