New report data structure (#126)

Following the new docs: https://grafana.com/docs/grafana/latest/developers/http_api/reporting

Author: julienduchesne

report.go

@@ -19,17 +19,30 @@ type ReportSchedule struct {
 	DayOfMonth        string     `json:"dayOfMonth,omitempty"`
 }
 
-// ReportTimeRange represents the time range from a Grafana report.
-type ReportTimeRange struct {
+// ReportOptions represents the options for a Grafana report.
+type ReportOptions struct {
+	Orientation string `json:"orientation"`
+	Layout      string `json:"layout"`
+}
+
+// ReportDashboardTimeRange represents the time range from a dashboard on a Grafana report.
+type ReportDashboardTimeRange struct {
 	From string `json:"from"`
 	To   string `json:"to"`
 }
 
-// ReportOptions represents the options for a Grafana report.
-type ReportOptions struct {
-	Orientation string          `json:"orientation"`
-	Layout      string          `json:"layout"`
-	TimeRange   ReportTimeRange `json:"timeRange"`
+// ReportDashboardIdentifier represents the identifier for a dashboard on a Grafana report.
+type ReportDashboardIdentifier struct {
+	ID   int64  `json:"id,omitempty"`
+	UID  string `json:"uid,omitempty"`
+	Name string `json:"name,omitempty"`
+}
+
+// ReportDashboard represents a dashboard on a Grafana report.
+type ReportDashboard struct {
+	Dashboard ReportDashboardIdentifier `json:"dashboard"`
+	TimeRange ReportDashboardTimeRange  `json:"timeRange"`
+	Variables map[string]string         `json:"reportVariables"`
 }
 
 // Report represents a Grafana report.
@@ -40,8 +53,8 @@ type Report struct {
 	OrgID  int64  `json:"orgId,omitempty"`
 	State  string `json:"state,omitempty"`
 
-	DashboardID        int64          `json:"dashboardId"`
-	DashboardUID       string         `json:"dashboardUid"`
+	Dashboards []ReportDashboard `json:"dashboards"`
+
 	Name               string         `json:"name"`
 	Recipients         string         `json:"recipients"`
 	ReplyTo            string         `json:"replyTo"`

report_test.go

@@ -13,9 +13,19 @@ var (
 		"id": 4,
 		"userId": 0,
 		"orgId": 1,
-		"dashboardId": 33,
-		"dashboardName": "Terraform Acceptance Test",
-		"dashboardUid": "",
+		"dashboards": [
+			{
+				"dashboard": {
+					"id": 33,
+					"uid": "nErXDvCkzz",
+					"name": "Terraform Acceptance Test"
+				},
+				"timeRange": {
+					"from": "now-1h",
+					"to": "now"
+				}
+			}
+		],
 		"name": "My Report",
 		"recipients": "test@test.com",
 		"replyTo": "",
@@ -35,11 +45,7 @@ var (
 		},
 		"options": {
 			"orientation": "landscape",
-			"layout": "grid",
-			"timeRange": {
-				"from": "now-1h",
-				"to": "now"
-			}
+			"layout": "grid"
 		},
 		"templateVars": {},
 		"enableDashboardUrl": true,
@@ -56,9 +62,8 @@ var (
 `
 	now        = time.Now()
 	testReport = Report{
-		DashboardID: 33,
-		Name:        "My Report",
-		Recipients:  "test@test.com",
+		Name:       "My Report",
+		Recipients: "test@test.com",
 		Schedule: ReportSchedule{
 			StartDate:         &now,
 			EndDate:           nil,
@@ -68,13 +73,21 @@ var (
 			WorkdaysOnly:      true,
 			TimeZone:          "GMT",
 		},
+		Dashboards: []ReportDashboard{
+			{
+				Dashboard: ReportDashboardIdentifier{
+					ID:  33,
+					UID: "nErXDvCkzz",
+				},
+				TimeRange: ReportDashboardTimeRange{
+					From: "now-1h",
+					To:   "now",
+				},
+			},
+		},
 		Options: ReportOptions{
 			Orientation: "landscape",
 			Layout:      "grid",
-			TimeRange: ReportTimeRange{
-				From: "now-1h",
-				To:   "now",
-			},
 		},
 		EnableDashboardURL: true,
 		EnableCSV:          true,