diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-02 12:51:31 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2006-08-02 12:51:31 +0000 |
| commit | 14299f10d33a8675777664944a385f993ca24b64 (patch) | |
| tree | 659482724c5fa62f7fce1176af3b0ac53707362c /frontends/php/graphs.php | |
| parent | 6d65c1403d0ee5c56ae5f1a2c58a2c0defa4c665 (diff) | |
| download | zabbix-14299f10d33a8675777664944a385f993ca24b64.tar.gz zabbix-14299f10d33a8675777664944a385f993ca24b64.tar.xz zabbix-14299f10d33a8675777664944a385f993ca24b64.zip | |
- improved sound notification of trigger status changing (Eugene)
- developed aggrigated graphs (Eugene)
- fixed graphs drawing (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@3092 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/graphs.php')
| -rw-r--r-- | frontends/php/graphs.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/frontends/php/graphs.php b/frontends/php/graphs.php index 5e3d19c7..50dde233 100644 --- a/frontends/php/graphs.php +++ b/frontends/php/graphs.php @@ -40,6 +40,7 @@ "width"=> array(T_ZBX_INT, O_OPT, NULL, BETWEEN(0,65535), 'isset({save})'), "height"=> array(T_ZBX_INT, O_OPT, NULL, BETWEEN(0,65535), 'isset({save})'), "yaxistype"=> array(T_ZBX_INT, O_OPT, NULL, IN("0,1"), 'isset({save})'), + "graphtype"=> array(T_ZBX_INT, O_OPT, NULL, IN("0,1"), 'isset({save})'), "yaxismin"=> array(T_ZBX_DBL, O_OPT, NULL, BETWEEN(-65535,65535), 'isset({save})'), "yaxismax"=> array(T_ZBX_DBL, O_OPT, NULL, BETWEEN(-65535,65535), 'isset({save})'), "yaxismax"=> array(T_ZBX_DBL, O_OPT, NULL, BETWEEN(-65535,65535), 'isset({save})'), @@ -89,7 +90,7 @@ $result=update_graph($_REQUEST["graphid"], $_REQUEST["name"],$_REQUEST["width"],$_REQUEST["height"], $_REQUEST["yaxistype"],$_REQUEST["yaxismin"],$_REQUEST["yaxismax"], - $showworkperiod,$showtriggers); + $showworkperiod,$showtriggers,$_REQUEST["graphtype"]); if($result) { @@ -103,7 +104,7 @@ { $result=add_graph($_REQUEST["name"],$_REQUEST["width"],$_REQUEST["height"], $_REQUEST["yaxistype"],$_REQUEST["yaxismin"],$_REQUEST["yaxismax"], - $showworkperiod,$showtriggers); + $showworkperiod,$showtriggers,$_REQUEST["graphtype"]); if($result) { add_audit(AUDIT_ACTION_ADD,AUDIT_RESOURCE_GRAPH, @@ -265,7 +266,7 @@ array( new CCheckBox("all_graphs",NULL, "CheckAll('".$form->GetName()."','all_graphs');"), S_ID), - $_REQUEST["hostid"] != 0 ? NULL : S_HOSTS, S_NAME,S_WIDTH,S_HEIGHT,S_GRAPH)); + $_REQUEST["hostid"] != 0 ? NULL : S_HOSTS, S_NAME,S_WIDTH,S_HEIGHT,S_GRAPH_TYPE,S_GRAPH)); if($_REQUEST["hostid"] > 0) { @@ -329,12 +330,19 @@ $chkBox = new CCheckBox("group_graphid[]",NULL,NULL,$row["graphid"]); if($row["templateid"] > 0) $chkBox->SetEnabled(false); + + if($row["graphtype"] == GRAPH_TYPE_STACKED) + $graphtype = S_STACKED; + else + $graphtype = S_NORMAL; + $table->AddRow(array( array($chkBox, $row["graphid"]), $host_list, $name, $row["width"], $row["height"], + $graphtype, $edit )); } |