Add a Zabbix 'zabbix_vm_disk_get' helper method

src/vpoller/agent.py

@@ -1215,7 +1215,7 @@ def vm_disk_get(self, msg):
         else:
             return data
 
-        props = data['result']
+        props = data['result'][0]
         disks = props['disk']
 
         for disk in disks:

src/vpoller/helpers/zabbix.py

@@ -76,7 +76,7 @@ def run(self):
             'vm.discover':         self.zabbix_lld_data,
             'vm.get':              self.zabbix_item_value,
             'vm.disk.discover':    self.zabbix_lld_data,
-            'vm.disk.get':         self.zabbix_item_value,
+            'vm.disk.get':         self.zabbix_vm_disk_get,
             'vm.host.get':         self.zabbix_item_value,
             'datastore.discover':  self.zabbix_lld_data,
             'datastore.get':       self.zabbix_item_value,
@@ -104,6 +104,21 @@ def zabbix_item_value(self):
 
         return self.data['result'][0][property_name]
 
+    def zabbix_vm_disk_get(self):
+        """
+        Processes a single property value for a VM guest disk
+
+        The value we return is of the first property only,
+        so that each item in Zabbix stores a single property value.
+
+        Returns:
+            The property value from the result message
+
+        """
+        property_name = self.msg['properties'][0]
+
+        return self.data['result'][0]['disk'][property_name]
+
     def zabbix_lld_data(self):
         """
         Translates a discovery request to Zabbix LLD format