Fix drop id attribute

k8spin · Mar 11, 2021 · aa67107 · aa67107
1 parent 5662505
commit aa67107
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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,