From bfcc4bdc3972deaf23bcc9288143ffbd2b91fff0 Mon Sep 17 00:00:00 2001
From: osiu97 <osiu97@gmail.com>
Date: Thu, 10 Jan 2019 11:33:14 +0000
Subject: [PATCH] added brackets in JSON output

---
 PVE-Zabbix.py | 13 +++++++++----
 PVEApi.py     |  0
 VM.py         |  0
 3 files changed, 9 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 PVE-Zabbix.py
 mode change 100644 => 100755 PVEApi.py
 mode change 100644 => 100755 VM.py

diff --git a/PVE-Zabbix.py b/PVE-Zabbix.py
old mode 100644
new mode 100755
index f132587..2b6f097
--- a/PVE-Zabbix.py
+++ b/PVE-Zabbix.py
@@ -5,7 +5,6 @@ import json
 USERNAME = "zabbix@pve"
 PASSWORD = "zabbix"
 HOST = "172.16.3.11:8006"
-NODE = 'h1'
 
 conn = PVEApi(HOST, USERNAME, PASSWORD)
 
@@ -15,7 +14,7 @@ parser.add_argument("type", choices=['vm', 'cluster', 'node'], help='categories'
 parser.add_argument("-l", "--list", dest='listing', action='store_true')
 parser.add_argument("-n", "--name", dest='name')
 args = parser.parse_args()
-
+NODE = args.node
 
 def get_vmnames(vmlist, node, **kwargs):
     """
@@ -56,8 +55,14 @@ def listofdicts_to_zabbix_json(dlist):
     :param dlist: list of dicts you want to convert
     :return: JSON string for zabbix-get
     """
-    dlist = {"data": dlist}
-    zabbixjson = json.dumps(dlist)
+    newdlist=list()
+    for d in dlist:
+        for k,v in d.iteritems():
+            k = '{'+k+'}'
+            newdict = {k: v}
+            newdlist.append(newdict)
+    newdlist = {"data": newdlist}
+    zabbixjson = json.dumps(newdlist)
     return zabbixjson
 
 
diff --git a/PVEApi.py b/PVEApi.py
old mode 100644
new mode 100755
diff --git a/VM.py b/VM.py
old mode 100644
new mode 100755