IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Azure Monitor/body close logs an error bug (#74632)

Browse Source 
on body close causes logs an error even if no error. also changed to warning similar to the rest of grafana
This commit is contained in:
Andrew Hackmann 2023-09-11 09:02:44 -05:00 committed by GitHub
parent a90e3f67e4
commit c8a0ebe0e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/tsdb/azuremonitor/azuremonitor.go
View File

@ -393,8 +393,9 @@ func parseSubscriptions(res *http.Response) ([]string, error) {
return nil, err
}
defer func() {
err := res.Body.Close()
backend.Logger.Error("Failed to close response body", "err", err)
if err := res.Body.Close(); err != nil {
backend.Logger.Warn("Failed to close response body", "err", err)
}
}()
result := make([]string, len(target.Value))

12
pkg/tsdb/azuremonitor/loganalytics/azure-log-analytics-datasource.go
View File

@ -288,8 +288,9 @@ func (e *AzureLogAnalyticsDatasource) executeQuery(ctx context.Context, query *A
}
defer func() {
err := res.Body.Close()
backend.Logger.Error("Failed to close response body", "err", err)
if err := res.Body.Close(); err != nil {
backend.Logger.Warn("Failed to close response body", "err", err)
}
}()
logResponse, err := e.unmarshalResponse(res)
@ -563,7 +564,7 @@ func getCorrelationWorkspaces(ctx context.Context, baseResource string, resource
defer func() {
if err := res.Body.Close(); err != nil {
backend.Logger.Error("Failed to close response body", "err", err)
backend.Logger.Warn("Failed to close response body", "err", err)
}
}()
@ -666,8 +667,9 @@ func (e *AzureLogAnalyticsDatasource) unmarshalResponse(res *http.Response) (Azu
return AzureLogAnalyticsResponse{}, err
}
defer func() {
err := res.Body.Close()
backend.Logger.Error("Failed to close response body", "err", err)
if err := res.Body.Close(); err != nil {
backend.Logger.Warn("Failed to close response body", "err", err)
}
}()
if res.StatusCode/100 != 2 {

10
pkg/tsdb/azuremonitor/metrics/azuremonitor-datasource.go
View File

@ -265,8 +265,9 @@ func (e *AzureMonitorDatasource) retrieveSubscriptionDetails(cli *http.Client, c
}
defer func() {
err := res.Body.Close()
backend.Logger.Error("Failed to close response body", "err", err)
if err := res.Body.Close(); err != nil {
backend.Logger.Warn("Failed to close response body", "err", err)
}
}()
body, err := io.ReadAll(res.Body)
@ -317,8 +318,9 @@ func (e *AzureMonitorDatasource) executeQuery(ctx context.Context, query *types.
}
defer func() {
err := res.Body.Close()
backend.Logger.Error("Failed to close response body", "err", err)
if err := res.Body.Close(); err != nil {
backend.Logger.Warn("Failed to close response body", "err", err)
}
}()
data, err := e.unmarshalResponse(res)

10
pkg/tsdb/azuremonitor/resourcegraph/azure-resource-graph-datasource.go
View File

@ -167,8 +167,9 @@ func (e *AzureResourceGraphDatasource) executeQuery(ctx context.Context, query *
}
defer func() {
err := res.Body.Close()
backend.Logger.Error("Failed to close response body", "err", err)
if err := res.Body.Close(); err != nil {
backend.Logger.Warn("Failed to close response body", "err", err)
}
}()
argResponse, err := e.unmarshalResponse(res)
@ -221,8 +222,9 @@ func (e *AzureResourceGraphDatasource) unmarshalResponse(res *http.Response) (Az
}
defer func() {
err := res.Body.Close()
backend.Logger.Error("Failed to close response body", "err", err)
if err := res.Body.Close(); err != nil {
backend.Logger.Warn("Failed to close response body", "err", err)
}
}()
if res.StatusCode/100 != 2 {