diff options
| author | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-07 14:16:21 +0000 |
|---|---|---|
| committer | sasha <sasha@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-07 14:16:21 +0000 |
| commit | 6f2e181732084950f1cab209f308347460dc290e (patch) | |
| tree | 010c0b87f1e21a62d39d3e4dc283f4a283076ac1 /frontends/php/discovery.php | |
| parent | 4c4c7ec61d8d890ff596acbc2737aa0f36d54d6f (diff) | |
| download | zabbix-6f2e181732084950f1cab209f308347460dc290e.tar.gz zabbix-6f2e181732084950f1cab209f308347460dc290e.tar.xz zabbix-6f2e181732084950f1cab209f308347460dc290e.zip | |
- [DEV-108] GUI - Autodiscovery
git-svn-id: svn://svn.zabbix.com/trunk@5461 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/discovery.php')
| -rw-r--r-- | frontends/php/discovery.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/frontends/php/discovery.php b/frontends/php/discovery.php index a1d67b67..9877b2ef 100644 --- a/frontends/php/discovery.php +++ b/frontends/php/discovery.php @@ -55,12 +55,14 @@ include_once "include/page_header.php"; $services = array(); - $db_dservices = DBselect('SELECT s.type,s.port FROM dservices s,dhosts h'. + $db_dservices = DBselect('SELECT s.type,s.port,s.key_ FROM dservices s,dhosts h'. ' WHERE '.DBin_node('s.dserviceid'). ' AND s.dhostid=h.dhostid'. ($druleid > 0 ? ' AND h.druleid='.$druleid : '')); while ($dservice = DBfetch($db_dservices)) { - $service_name = discovery_check_type2str($dservice['type']).':'.$dservice['port']; + $service_name = discovery_check_type2str($dservice['type']). + discovery_port2str($dservice['type'], $dservice['port']). + (empty($dservice['key_']) ? '' : ':'.$dservice['key_']); $services[$service_name] = 1; } @@ -99,7 +101,7 @@ include_once "include/page_header.php"; $discovery_info[$dhost['ip']] = array('class' => $class, 'time' => $dhost[$time], 'druleid' => $dhost['druleid']); - $db_dservices = DBselect('SELECT type,port,status,lastup,lastdown FROM dservices '. + $db_dservices = DBselect('SELECT type,port,key_,status,lastup,lastdown FROM dservices '. ' WHERE dhostid='.$dhost['dhostid']. ' order by status,type,port'); while($dservice = DBfetch($db_dservices)){ @@ -111,7 +113,9 @@ include_once "include/page_header.php"; $time = 'lastdown'; } - $service_name = discovery_check_type2str($dservice['type']).':'.$dservice['port']; + $service_name = discovery_check_type2str($dservice['type']). + discovery_port2str($dservice['type'], $dservice['port']). + (empty($dservice['key_']) ? '' : ':'.$dservice['key_']); $discovery_info [$dhost['ip']] |