diff options
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/db.inc.php | 10 | ||||
| -rw-r--r-- | frontends/php/include/items.inc.php | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php index c2dd11ab..d7b0c271 100644 --- a/frontends/php/include/db.inc.php +++ b/frontends/php/include/db.inc.php @@ -22,14 +22,14 @@ // DATABASE CONFIGURATION - $DB_TYPE ="ORACLE"; +// $DB_TYPE ="ORACLE"; // $DB_TYPE ="POSTGRESQL"; -// $DB_TYPE ="MYSQL"; + $DB_TYPE ="MYSQL"; $DB_SERVER ="localhost"; // $DB_DATABASE ="zabbix"; - $DB_DATABASE ="ZABBIX"; - $DB_USER ="scott"; - $DB_PASSWORD ="tiger"; + $DB_DATABASE ="osmiy"; + $DB_USER ="root"; + $DB_PASSWORD =""; // END OF DATABASE CONFIGURATION // $USER_DETAILS =""; diff --git a/frontends/php/include/items.inc.php b/frontends/php/include/items.inc.php index 4d980fcd..202e2b3d 100644 --- a/frontends/php/include/items.inc.php +++ b/frontends/php/include/items.inc.php @@ -541,7 +541,7 @@ } COpt::profiling_start('prepare data'); - $result = DBselect('select distinct h.hostid, h.host,i.itemid, i.value_type, i.lastvalue, i.units, i.description'. + $result = DBselect('select distinct h.hostid, h.host,i.itemid, i.key_, i.value_type, i.lastvalue, i.units, i.description'. ' from hosts h,items i '.$group_where. ' h.status='.HOST_STATUS_MONITORED.' and h.hostid=i.hostid and i.status='.ITEM_STATUS_ACTIVE. ' order by i.description'); @@ -568,7 +568,7 @@ COpt::profiling_start('prepare data'); if($access == 0) continue; $hosts[$row['host']] = $row['host']; - $items[$row['description']][$row['host']] = array( + $items[item_description($row["description"],$row["key_"])][$row['host']] = array( 'itemid' => $row['itemid'], 'value_type' => $row['value_type'], 'lastvalue' => $row['lastvalue'], |