- [ZBX-24] fixed Queue to show status of current node only (Alexei)

   [svn merge -r4690:4693 svn://svn.zabbix.com/branches/1.4]


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

2 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 13bf01fd..5ad0d600 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ Changes for 1.5:
 
 Changes for 1.4.3:
 
+ - [ZBX-24] fixed Queue to show status of current node only (Alexei)
  - support of encoding of log files to displayed encoding (Alexei)
  - [ZBX-12] fixed calculations in ZABBIX availability report (Alexei)
  - [ZBX-11] fixed Free BSD 4.x 64 bit-related issues (Alexei)
diff --git a/frontends/php/queue.php b/frontends/php/queue.php
index 20ad52c1..b3c9f744 100644
--- a/frontends/php/queue.php
+++ b/frontends/php/queue.php
@@ -75,6 +75,9 @@ include_once "include/page_header.php";
 		" or (h.status=".HOST_STATUS_MONITORED." and h.available=".HOST_AVAILABLE_FALSE." and h.disable_until<=$now)) ".
 		" and i.hostid=h.hostid and i.nextcheck<$now and i.key_ not in ('status','icmpping','icmppingsec','zabbix[log]') ".
 		" and h.hostid in (".get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,get_current_nodeid()).")".
+//		" and h.hostid in (".get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,$ZBX_LOCALNODEID).")".
+//		" and ".DBin_node('h.hostid', $ZBX_LOCALNODEID).
+		" and ".DBin_node('h.hostid', get_current_nodeid()).
 		" order by i.nextcheck,h.host,i.description,i.key_");
 
 	$table = new CTableInfo(S_THE_QUEUE_IS_EMPTY);