Skip to content

Commit

Permalink
Fix Zabbix vPoller helper discovery methods
Browse files Browse the repository at this point in the history
  • Loading branch information
dnaeon committed Sep 11, 2014
1 parent df10a33 commit 6cff378
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/vpoller/helpers/zabbix.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
"""

import json
import logging


Expand Down Expand Up @@ -182,7 +181,7 @@ def zabbix_vm_disk_discover(self):
props = [('{#VSPHERE.' + obj_t + '.' + k.upper() + '}', v) for k, v in item.items()]
data.append(dict(props))

return json.dumps({'data': data}, indent=4)
return {'data': data}

def zabbix_lld_data(self):
"""
Expand All @@ -209,4 +208,4 @@ def zabbix_lld_data(self):
props = [('{#VSPHERE.' + obj_t + '.' + k.upper() + '}', v) for k, v in item.items()]
data.append(dict(props))

return json.dumps({'data': data}, indent=4)
return {'data': data}

0 comments on commit 6cff378

Please sign in to comment.