- [DEV-59] improved Availability Reports (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5145 97f52cf1-0a1b-0410-bd0e-c28be96e8082

4 files changed, 214 insertions, 10 deletions

diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index d245d3e1..3379f1c2 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -570,6 +570,52 @@ require_once "include/items.inc.php";
 	}
 
 	/*
+	 * Function: validate_group_with_templates
+	 *
+	 * Description:
+	 *     Check available groups and host(template) by user permission
+	 *     and check current group an host(template) relations
+	 *
+	 * Author:
+	 *     Aly
+	 *
+	 * Comments:
+	 *
+	 */
+	function	validate_group_with_templates($perm, $options = array(),$group_var=null,$host_var=null)
+	{
+		if(is_null($group_var)) $group_var = "web.latest.groupid";
+		if(is_null($host_var))	$host_var = "web.latest.hostid";
+
+		$_REQUEST["groupid"]    = get_request("groupid", -1 );
+		$_REQUEST["hostid"]     = get_request("hostid", get_profile($host_var,0));
+
+		if($_REQUEST["groupid"] == -1)
+		{
+			$_REQUEST["groupid"] = get_profile($group_var,0);
+			
+			if(!in_node($_REQUEST["groupid"])) $_REQUEST["groupid"] = 0;
+
+			if ($_REQUEST["hostid"] > 0 && !DBfetch(DBselect('select groupid from hosts_groups '.
+				' where hostid='.$_REQUEST["hostid"].' and groupid='.$_REQUEST["groupid"])))
+			{
+					$_REQUEST["groupid"] = 0;
+			}
+		}
+
+		if(in_array("always_select_first_host",$options) && $_REQUEST["hostid"] == 0 && $_REQUEST["groupid"] != 0)
+			$_REQUEST["hostid"] = -1;
+
+		$result = get_correct_group_and_host($_REQUEST["groupid"],$_REQUEST["hostid"], $perm, $options);
+
+		$_REQUEST["groupid"]    = $result["groupid"];
+		$_REQUEST["hostid"]     = $result["hostid"];
+		
+		update_profile($host_var,$_REQUEST["hostid"]);
+		update_profile($group_var,$_REQUEST["groupid"]);
+	}
+
+	/*
 	 * Function: get_correct_group_and_host
 	 *
 	 * Description:
@@ -600,6 +646,8 @@ require_once "include/items.inc.php";
 			$with_host_status = " and h.status=".HOST_STATUS_MONITORED;
 		elseif(in_array('real_hosts',$options))
 			$with_host_status = " and h.status<>".HOST_STATUS_TEMPLATE;
+		elseif(in_array('templated_hosts',$options))
+			$with_host_status = " and h.status=".HOST_STATUS_TEMPLATE;
 		else
 			$with_host_status = "";
 
@@ -631,9 +679,12 @@ require_once "include/items.inc.php";
 			{
 				$with_node = " and ".DBin_node('g.groupid', get_current_nodeid(!$only_current_node));
 
-				if(!DBfetch(DBselect("select distinct g.groupid from groups g, hosts_groups hg, hosts h".$item_table.
-					" where hg.groupid=g.groupid and h.hostid=hg.hostid and h.hostid in (".$accessed_hosts.") ".
-					" and g.groupid=".$groupid.$with_host_status.$with_items.$with_node)))
+				if(!DBfetch(DBselect('SELECT DISTINCT g.groupid '.
+								' FROM groups g, hosts_groups hg, hosts h'.$item_table.
+								' WHERE hg.groupid=g.groupid '.
+									' AND h.hostid=hg.hostid '.
+									' AND h.hostid in ('.$accessed_hosts.') '.
+									' AND g.groupid='.$groupid.$with_host_status.$with_items.$with_node)))
 				{
 					$groupid = 0;
 				}
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 502a81ab..4cfeca29 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -960,6 +960,8 @@
 	'S_SHOW'=>				'Show',
 	'S_TRUE'=>				'True',
 	'S_FALSE'=>				'False',
+	'S_BY_HOST'=>			'By host',
+	'S_BY_TRIGGER_TEMPLATE'=> 'By trigger template',
 
 //	report3.php
 	'S_IT_SERVICES_AVAILABILITY_REPORT'=>	'IT services availability report',
diff --git a/frontends/php/include/reports.inc.php b/frontends/php/include/reports.inc.php
new file mode 100644
index 00000000..8c5872d2
--- /dev/null
+++ b/frontends/php/include/reports.inc.php
@@ -0,0 +1,151 @@
+<?php
+/* 
+** ZABBIX
+** Copyright (C) 2000-2008 SIA Zabbix
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+**/
+?>
+<?php
+
+function show_report2_header($config,$available_hosts){
+	
+	$r_form = new CForm();
+	$r_form->SetMethod('get');
+	
+	$cmbConf = new CComboBox('config',$config,'submit()');
+	$cmbConf->AddItem(0,S_BY_HOST);
+	$cmbConf->AddItem(1,S_BY_TRIGGER_TEMPLATE);
+
+	$r_form->AddItem(array(S_MODE.SPACE,$cmbConf,SPACE));
+
+	$cmbGroup = new CComboBox('groupid',$_REQUEST['groupid'],'submit()');
+	$cmbGroup->AddItem(0,S_ALL_SMALL);
+	
+	$status_filter = ' AND h.status='.HOST_STATUS_MONITORED.' AND i.status='.ITEM_STATUS_ACTIVE;
+	if($config==1)
+		$status_filter = ' AND h.status='.HOST_STATUS_TEMPLATE;
+
+	$sql = 'SELECT DISTINCT g.groupid,g.name '.
+					' FROM groups g,hosts_groups hg,hosts h, items i'.
+					' WHERE h.hostid in ('.$available_hosts.') '.
+						' AND g.groupid=hg.groupid '.
+						' AND h.hostid=hg.hostid'.$status_filter.
+					' ORDER BY g.name';
+
+	$result=DBselect($sql);
+	while($row=DBfetch($result)){
+		$cmbGroup->AddItem($row['groupid'],	get_node_name_by_elid($row['groupid']).$row['name']);
+	}
+	$r_form->AddItem(array(S_GROUP.SPACE,$cmbGroup));
+
+	if(0 == $config){
+		$cmbHosts = new CComboBox('hostid',$_REQUEST['hostid'],'submit()');
+		$sql_cond = ' AND h.status='.HOST_STATUS_MONITORED;
+	}
+	else{
+		$cmbTpls = new CComboBox('hostid',$_REQUEST['hostid'],'submit()');
+		$cmbTrigs = new CComboBox('tpl_triggerid',get_request('tpl_triggerid',0),'submit()');
+
+		$cmbTrigs->AddItem(0,S_ALL_SMALL);
+		
+		$sql_cond = ' AND h.status='.HOST_STATUS_TEMPLATE;		
+	}
+	
+	
+	if($_REQUEST['groupid'] > 0){
+		$sql='SELECT h.hostid,h.host '.
+			' FROM hosts h,items i,hosts_groups hg '.
+			' WHERE h.hostid=i.hostid '.
+				' AND hg.groupid='.$_REQUEST['groupid'].
+				' AND hg.hostid=h.hostid'.
+				' AND h.hostid in ('.$available_hosts.') '.
+				$sql_cond.
+			' GROUP BY h.hostid,h.host '.
+			' ORDER BY h.host';
+	}
+	else{
+		$sql='SELECT h.hostid,h.host '.
+			' FROM hosts h,items i '.
+			' WHERE h.hostid=i.hostid '.
+				' AND h.hostid in ('.$available_hosts.') '.
+				$sql_cond.
+			' GROUP BY h.hostid,h.host '.
+			' ORDER BY h.host';
+		if(0 == $config){
+			$cmbHosts->AddItem(0,S_ALL_SMALL);
+		}
+		else{
+			$cmbTpls->AddItem(0,S_ALL_SMALL);
+		}
+		
+	}
+	
+	$result=DBselect($sql);
+	while($row=DBfetch($result)){
+		if(0 == $config){
+			$cmbHosts->AddItem($row['hostid'],get_node_name_by_elid($row['hostid']).$row['host']);
+		}
+		else{
+			$cmbTpls->AddItem($row['hostid'],get_node_name_by_elid($row['hostid']).$row['host']);
+		}
+	}
+
+	
+	if(0 == $config){
+		$r_form->AddItem(array(SPACE.S_HOST.SPACE,$cmbHosts));
+	}
+	else{
+		$r_form->AddItem(array(SPACE.S_TEMPLATE.SPACE,$cmbTpls));
+		if($_REQUEST['hostid'] > 0){	
+			$sql = 'SELECT DISTINCT t.triggerid,t.description '.
+				' FROM triggers t,hosts h,items i,functions f '.
+				' WHERE f.itemid=i.itemid '.
+					' AND h.hostid=i.hostid '.
+					' AND t.status='.TRIGGER_STATUS_ENABLED.
+					' AND t.triggerid=f.triggerid '.
+					' AND h.hostid='.$_REQUEST['hostid'].
+					' AND h.status='.HOST_STATUS_TEMPLATE.
+					' AND '.DBin_node('t.triggerid').
+					' AND i.status='.ITEM_STATUS_ACTIVE.
+				' ORDER BY t.description';
+		}
+		else{
+			$sql = 'SELECT DISTINCT t.triggerid,t.description '.
+				' FROM triggers t,hosts h,items i,functions f '.
+				' WHERE f.itemid=i.itemid '.
+					' AND h.hostid=i.hostid '.
+					' AND t.status='.TRIGGER_STATUS_ENABLED.
+					' AND t.triggerid=f.triggerid '.
+					' AND h.status='.HOST_STATUS_TEMPLATE.
+					' AND h.hostid in ('.$available_hosts.')'.
+					' AND '.DBin_node('t.triggerid').
+					' AND i.status='.ITEM_STATUS_ACTIVE.
+				' ORDER BY t.description';
+		}
+		$result=DBselect($sql);
+
+		while($row=DBfetch($result)){
+			$cmbTrigs->AddItem(
+					$row['triggerid'],
+					get_node_name_by_elid($row['triggerid']).expand_trigger_description($row['triggerid'])
+					);
+		}
+	
+		$r_form->AddItem(array(BR.S_TRIGGER.SPACE,$cmbTrigs));
+	}
+		show_table_header(S_AVAILABILITY_REPORT_BIG, $r_form);
+}
+?>
\ No newline at end of file
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index bb3d2456..82e9c5bf 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -313,7 +313,7 @@
 	 * Comments:
 	 *
 	 */
-	function        get_realhosts_by_triggerid($triggerid)
+	function get_realhosts_by_triggerid($triggerid)
 	{
 		$trigger = get_trigger_by_triggerid($triggerid);
 		if($trigger['templateid'] > 0)
@@ -322,7 +322,7 @@
 		return get_hosts_by_triggerid($triggerid);
 	}
 
-	function	get_trigger_by_triggerid($triggerid)
+	function get_trigger_by_triggerid($triggerid)
 	{
 		$sql="select * from triggers where triggerid=$triggerid";
 		$result=DBselect($sql);
@@ -335,13 +335,13 @@
 		return FALSE;
 	}
 
-	function	&get_hosts_by_triggerid($triggerid)
+	function get_hosts_by_triggerid($triggerid)
 	{
 		return DBselect('select distinct h.* from hosts h, functions f, items i'.
 			' where i.itemid=f.itemid and h.hostid=i.hostid and f.triggerid='.$triggerid);
 	}
 
-	function	&get_functions_by_triggerid($triggerid)
+	function get_functions_by_triggerid($triggerid)
 	{
 		return DBselect('select * from functions where triggerid='.$triggerid);
 	}
@@ -358,7 +358,7 @@
 	 * Comments:
 	 *
 	 */
-	function	&get_triggers_by_hostid($hostid, $show_mixed = "yes")
+	function get_triggers_by_hostid($hostid, $show_mixed = "yes")
 	{
 		$db_triggers = DBselect("select distinct t.* from triggers t, functions f, items i".
 			" where i.hostid=$hostid and f.itemid=i.itemid and f.triggerid=t.triggerid");
@@ -383,7 +383,7 @@
 		return DBselect($sql);
 	}
 
-	function	&get_triggers_by_templateid($triggerid)
+	function get_triggers_by_templateid($triggerid)
 	{
 		return DBselect('select * from triggers where templateid='.$triggerid);
 	}
@@ -400,7 +400,7 @@
 	 * Comments:
 	 *
 	 */
-	function	&get_hosts_by_expression($expression)
+	function get_hosts_by_expression($expression)
 	{
 		global $ZBX_TR_EXPR_ALLOWED_MACROS, $ZBX_TR_EXPR_REPLACE_TO;