fix grafana dashboards bud

logzio · Jun 27, 2023 · 36beccc · 36beccc
1 parent 532d79b
commit 36beccc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/logzio/resource_grafana_dashboard.go b/logzio/resource_grafana_dashboard.go
@@ -212,15 +212,15 @@ func getCreateUpdateGrafanaDashboardFromSchema(d *schema.ResourceData) (grafana_
 	var dashboardObject map[string]interface{}
 	var payload grafana_dashboards.CreateUpdatePayload
 
-	for _, key := range grafanaDashboardsFieldsToDelete {
-		delete(dashboardObject, key)
-	}
-
 	err := json.Unmarshal([]byte(d.Get(grafanaDashboardJson).(string)), &dashboardObject)
 	if err != nil {
 		return payload, err
 	}
 
+	for _, key := range grafanaDashboardsFieldsToDelete {
+		delete(dashboardObject, key)
+	}
+
 	payload = grafana_dashboards.CreateUpdatePayload{
 		FolderUid: d.Get(grafanaDashboardFolderUid).(string),
 		Message:   d.Get(grafanaDashboardMessage).(string),

diff --git a/logzio/testdata/fixtures/grafana_dashboard/create.json b/logzio/testdata/fixtures/grafana_dashboard/create.json
@@ -1,5 +1,6 @@
 {
   "title": "_terraform_provider_test",
   "uid": "_terraform_provider_test",
-  "panels": []
+  "panels": [],
+  "id": 123456
 }
diff --git a/readme.md b/readme.md
@@ -198,6 +198,8 @@ terraform import logzio_subaccount.my_subaccount <SUBACCOUNT-ID>
 - **v1.13.2**:
   - **alerts v2**:
     - **Bug fix**: Add default value of `JSON` to `output_type` to match API behaviour.
+  - **grafana dashboards**:
+    - **Bug fix**: Handle dashboard configs with id and version fields.
 - **v1.13.1**:
   - **s3 fetcher**:
     - **Bug fix**: `prefix` field now being applied.