Merge branch 'Device/edit-zabbix-sync' into 'master'

changed how zabbix syncs

See merge request fronk/thetool!1217

application/DeviceMonitoring/DeviceMonitoringController.php

@@ -24,8 +24,7 @@ class DeviceMonitoringController extends mfBaseController {
 
     public function syncToolZabbix() {
         foreach (DeviceModel::getAll() as $device) {
-            $ip = $device->ip;
-            $hosts = $this->zabbix->getHosts($ip);
+            $hosts = array_merge($this->zabbix->getHosts(null, $device->ip), $this->zabbix->getHosts($device->name));
 
             if (empty($hosts)) {
                 echo "{$device->name}({$device->ip}) not found in Zabbix." . PHP_EOL;
@@ -36,12 +35,11 @@ class DeviceMonitoringController extends mfBaseController {
             $icmpItems = $this->zabbix->getICMPItems($hostId);
 
             $status = 0;
-            foreach ($icmpItems as $icmpItem) {
+            foreach ($icmpItems as $icmpItem)
                 if (strpos($icmpItem['key_'], 'icmpping[') !== false) {
                     $status = $icmpItem['lastvalue'] + 1;
                     break;
                 }
-            }
 
             echo "{$device->name}({$device->ip}) found in Zabbix with host ID: {$hostId} and status: {$status}" . PHP_EOL;
             $device->zabbix_online = $status;

lib/Zabbix/Zabbix.php

@@ -58,7 +58,7 @@ class Zabbix {
             return $response['result'];
         } elseif ($ip) {
             $response = $this->zabbixRequest('host.get', array(
-                'search' => array('ip' => array($ip))
+                'search' => array('host' => array($ip))
             ));
             return $response['result'];
         }