From 3576d41ef9d8bd485477818c8991fc7ecf908089 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 15:24:26 +0300 Subject: [PATCH] [v11.2.x] Azure: Fix duplicated traces in multi-resource trace query (#95246) Azure: Fix duplicated traces in multi-resource trace query (#95156) Use first resource as base resource for query (cherry picked from commit 8bb7475e4f3bcd790ae4cb5278681a99f87760bf) Co-authored-by: Andreas Christou --- .../azuremonitor/loganalytics/azure-log-analytics-datasource.go | 2 +- .../loganalytics/azure-log-analytics-datasource_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go index 27d52ea5730..3a424ae789e 100644 --- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go +++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go @@ -495,7 +495,7 @@ func (e *AzureLogAnalyticsDatasource) createRequest(ctx context.Context, queryUR } if query.AppInsightsQuery { - body["applications"] = query.Resources + body["applications"] = []string{query.Resources[0]} } jsonValue, err := json.Marshal(body) diff --git a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go index 8cc975da67b..e2a2bd4216e 100644 --- a/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go +++ b/pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource_test.go @@ -649,7 +649,7 @@ func TestLogAnalyticsCreateRequest(t *testing.T) { TimeColumn: "timestamp", }) require.NoError(t, err) - expectedBody := fmt.Sprintf(`{"applications":["/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.Insights/components/r1","/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.Insights/components/r2"],"query":"","query_datetimescope_column":"timestamp","query_datetimescope_from":"%s","query_datetimescope_to":"%s","timespan":"%s/%s"}`, from.Format(time.RFC3339), to.Format(time.RFC3339), from.Format(time.RFC3339), to.Format(time.RFC3339)) + expectedBody := fmt.Sprintf(`{"applications":["/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.Insights/components/r1"],"query":"","query_datetimescope_column":"timestamp","query_datetimescope_from":"%s","query_datetimescope_to":"%s","timespan":"%s/%s"}`, from.Format(time.RFC3339), to.Format(time.RFC3339), from.Format(time.RFC3339), to.Format(time.RFC3339)) body, err := io.ReadAll(req.Body) require.NoError(t, err) if !cmp.Equal(string(body), expectedBody) {