diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-04 11:33:08 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-04 11:33:08 +0000 |
| commit | f4071accf03abf288b80530284abea72cbda92c3 (patch) | |
| tree | 8e3f08dc56a0e4c70e9d1f1299b251981ec23e0c /frontends/php/queue.php | |
| parent | e155c74da360c3024cf27f9147ff93d2bcd10ec5 (diff) | |
| download | zabbix-f4071accf03abf288b80530284abea72cbda92c3.tar.gz zabbix-f4071accf03abf288b80530284abea72cbda92c3.tar.xz zabbix-f4071accf03abf288b80530284abea72cbda92c3.zip | |
- added frontend-side support of external checks. (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@3974 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/queue.php')
| -rw-r--r-- | frontends/php/queue.php | 44 |
1 files changed, 24 insertions, 20 deletions
diff --git a/frontends/php/queue.php b/frontends/php/queue.php index b0a8753f..b9fe734b 100644 --- a/frontends/php/queue.php +++ b/frontends/php/queue.php @@ -54,9 +54,22 @@ include_once "include/page_header.php"; <?php $now = time(); + $item_types = array( + ITEM_TYPE_ZABBIX, + ITEM_TYPE_ZABBIX_ACTIVE, + ITEM_TYPE_SNMPV1, + //ITEM_TYPE_TRAPPER, + ITEM_TYPE_SNMPV2C, + ITEM_TYPE_SNMPV3, + ITEM_TYPE_SIMPLE, + ITEM_TYPE_INTERNAL, + ITEM_TYPE_AGGREGATE, + //ITEM_TYPE_HTTPTEST, + ITEM_TYPE_EXTERNAL); + $result = DBselect("select i.itemid,i.nextcheck,i.description,i.key_,i.type,h.host,h.hostid ". " from items i,hosts h ". - " where i.status=".ITEM_STATUS_ACTIVE." and i.type not in (".ITEM_TYPE_TRAPPER.",".ITEM_TYPE_HTTPTEST.") ". + " where i.status=".ITEM_STATUS_ACTIVE." and i.type in (".implode(',',$item_types).") ". " and ((h.status=".HOST_STATUS_MONITORED." and h.available != ".HOST_AVAILABLE_FALSE.") ". " 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]') ". @@ -67,14 +80,15 @@ include_once "include/page_header.php"; if($_REQUEST["show"]==0) { - for($i=ITEM_TYPE_ZABBIX;$i<=ITEM_TYPE_AGGREGATE;$i++) + + foreach($item_types as $type) { - $sec_5[$i]=0; - $sec_10[$i]=0; - $sec_30[$i]=0; - $sec_60[$i]=0; - $sec_300[$i]=0; - $sec_rest[$i]=0; + $sec_5[$type]=0; + $sec_10[$type]=0; + $sec_30[$type]=0; + $sec_60[$type]=0; + $sec_300[$type]=0; + $sec_rest[$type]=0; } while($row=DBfetch($result)) @@ -88,19 +102,9 @@ include_once "include/page_header.php"; } $table->setHeader(array(S_ITEMS,S_5_SECONDS,S_10_SECONDS,S_30_SECONDS,S_1_MINUTE,S_5_MINUTES,S_MORE_THAN_5_MINUTES)); - $a=array( - S_ZABBIX_AGENT => ITEM_TYPE_ZABBIX, - S_ZABBIX_AGENT_ACTIVE => ITEM_TYPE_ZABBIX_ACTIVE, - S_SNMPV1_AGENT => ITEM_TYPE_SNMPV1, - S_SNMPV2_AGENT => ITEM_TYPE_SNMPV2C, - S_SNMPV3_AGENT => ITEM_TYPE_SNMPV3, - S_SIMPLE_CHECK => ITEM_TYPE_SIMPLE, - S_ZABBIX_INTERNAL => ITEM_TYPE_INTERNAL, - S_ZABBIX_AGGREGATE => ITEM_TYPE_AGGREGATE - ); - foreach($a as $name => $type) + foreach($item_types as $type) { - $elements=array($name,$sec_5[$type],$sec_10[$type], + $elements=array(item_type2str($type),$sec_5[$type],$sec_10[$type], new CCol($sec_30[$type],"warning"), new CCol($sec_60[$type],"average"), new CCol($sec_300[$type],"high"), |