Initial integration of distributed monitoring.

Changes 3196:HEAD of branches/distributed


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

1 files changed, 3 insertions, 2 deletions

diff --git a/frontends/php/charts.php b/frontends/php/charts.php
index 2b665b1d..6a1fcadd 100644
--- a/frontends/php/charts.php
+++ b/frontends/php/charts.php
@@ -108,7 +108,7 @@
 	$h2=S_GROUP.SPACE;
 	$h2=$h2."<select class=\"biginput\" name=\"groupid\" onChange=\"submit()\">";
 	$h2=$h2.form_select("groupid",0,S_ALL_SMALL);
-	$result=DBselect("select groupid,name from groups order by name");
+	$result=DBselect("select groupid,name from groups where mod(groupid,100)=$ZBX_CURNODEID order by name");
 	while($row=DBfetch($result))
 	{
 // Check if at least one host with read permission exists for this group
@@ -140,7 +140,7 @@
 	{
 		$h2=$h2.form_select("hostid",0,S_ALL_SMALL);
 
-		$sql="select h.hostid,h.host from hosts h,items i where h.status=".HOST_STATUS_MONITORED." and h.hostid=i.hostid group by h.hostid,h.host order by h.host";
+		$sql="select h.hostid,h.host from hosts h,items i where h.status=".HOST_STATUS_MONITORED." and h.hostid=i.hostid and mod(h.hostid,100)=$ZBX_CURNODEID group by h.hostid,h.host order by h.host";
 	}
 
 	$result=DBselect($sql);
@@ -180,6 +180,7 @@
 		$sql = "select distinct g.graphid,g.name from graphs g,graphs_items gi,items i,hosts h".
 			" where i.itemid=gi.itemid and g.graphid=gi.graphid ".
 			" and i.hostid=h.hostid and h.status=".HOST_STATUS_MONITORED.
+			" and mod(h.hostid,100)=".$ZBX_CURNODEID.
 			" order by g.name";
 	}