From aa67107a91280fed3fee0fa6aa78dc1f7a901c73 Mon Sep 17 00:00:00 2001
From: David Alvarez Quiroga <david.alvarez@nagra.com>
Date: Thu, 11 Mar 2021 17:33:17 +0100
Subject: [PATCH] Fix drop id attribute

---
 grafana/dashboard.py    | 2 +-
 grafana/datasource.py   | 4 ++--
 grafana/organization.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/grafana/dashboard.py b/grafana/dashboard.py
index a473781..653d22b 100644
--- a/grafana/dashboard.py
+++ b/grafana/dashboard.py
@@ -17,7 +17,7 @@ async def create(api, name, title, jsonDashboard, organizationNames, lock, logge
                 api.organizations.switch_organization(orgId)
                 jsonDashboard['uid'] = name
                 jsonDashboard['title'] = title if title else name
-                del jsonDashboard['id']
+                jsonDashboard.pop('id', None)
                 dashboard_object = {
                     'dashboard': jsonDashboard,
                     'folderId': 0,
diff --git a/grafana/datasource.py b/grafana/datasource.py
index 2ecb3e5..b068a84 100644
--- a/grafana/datasource.py
+++ b/grafana/datasource.py
@@ -17,7 +17,7 @@ async def create(api, name, jsonDatasource, organizationNames, lock, logger):
                 api.organizations.switch_organization(orgId)
                 jsonDatasource['name'] = name
                 if jsonDatasource.get('id'):
-                    del jsonDatasource['id']
+                    jsonDatasource.pop('id', None)
                 response = api.datasource.create_datasource(jsonDatasource)
                 responses.append(response)
             except GrafanaException as err:
@@ -75,7 +75,7 @@ async def update(api, oldName, newName, newJsonDatasource, oldOrganizationNames,
             try:
                 newJsonDatasource['name'] = newName
                 if newJsonDatasource.get('id'):
-                    del newJsonDatasource['id']
+                    newJsonDatasource.pop('id', None)
                 response = api.datasource.create_datasource(newJsonDatasource)
                 responses.append(response)
             except GrafanaException as err:
diff --git a/grafana/organization.py b/grafana/organization.py
index e680e0c..051d4b9 100644
--- a/grafana/organization.py
+++ b/grafana/organization.py
@@ -68,7 +68,7 @@ def _create_dashboards(api, dashboards, orgId):
         # Override the uid and title
         dashboardParsed['uid'] = dashboardName
         dashboardParsed['title'] = dashboardName
-        del dashboardParsed['id']
+        dashboardParsed.pop('id', None)
         dashboard_object = {
             'dashboard': dashboardParsed,
             'folderId': 0,