From ded96ea9011e0b349bcc743cc8e462e2db9fc3d5 Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 10 Jun 2021 06:56:38 -0400
Subject: [PATCH] Upgrade ARG API version (#35464) (#35492)

(cherry picked from commit 05f398510841d469c76761d9090c15ad6b5c912c)

Co-authored-by: shuotli <63325084+shuotli@users.noreply.github.com>
---
 pkg/tsdb/azuremonitor/azure-resource-graph-datasource.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/tsdb/azuremonitor/azure-resource-graph-datasource.go b/pkg/tsdb/azuremonitor/azure-resource-graph-datasource.go
index 1422533a852..152f6292532 100644
--- a/pkg/tsdb/azuremonitor/azure-resource-graph-datasource.go
+++ b/pkg/tsdb/azuremonitor/azure-resource-graph-datasource.go
@@ -42,7 +42,7 @@ type AzureResourceGraphQuery struct {
 	InterpolatedQuery string
 }
 
-const argAPIVersion = "2018-09-01-preview"
+const argAPIVersion = "2021-03-01"
 const argQueryProviderName = "/providers/Microsoft.ResourceGraph/resources"
 
 // executeTimeSeriesQuery does the following:
@@ -132,6 +132,7 @@ func (e *AzureResourceGraphDatasource) executeQuery(ctx context.Context, query *
 	reqBody, err := json.Marshal(map[string]interface{}{
 		"subscriptions": query.Model.Get("subscriptions").MustStringArray(),
 		"query":         query.InterpolatedQuery,
+		"options":       map[string]string{"resultFormat": "table"},
 	})
 
 	if err != nil {