Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AzureMonitor: Fix logs query multi-resource and timespan values #67914

Merged
merged 4 commits into from
May 5, 2023

Conversation

aangelisc
Copy link
Contributor

This PR updates the Log Analytics datasource to appropriately set the resource value if multiple resources are selected and also to correctly set the query timespan.

The endpoint expects the workspaces property to be set if multiple resources are to be queried. The endpoint also expects the timespan property to be set to specify the period of data to be queried. If the timespan property exists and a period is also specified in the query then the intersection of the two periods will be used. See relevant documentation here.

Timespans are formatted using RCF3339.

Fixes #67716
Fixes #67717

@aangelisc aangelisc added type/bug datasource/Azure Azure Monitor Datasource add to changelog backport v9.4.x Mark PR for automatic backport to v9.4.x backport v9.5.x Bot will automatically open backport PR backport v10.0.x labels May 5, 2023
@aangelisc aangelisc added this to the 10.0.x milestone May 5, 2023
@aangelisc aangelisc self-assigned this May 5, 2023
@aangelisc aangelisc requested a review from a team as a code owner May 5, 2023 13:21
@aangelisc aangelisc requested review from asimpson and bossinc and removed request for a team May 5, 2023 13:21
@github-actions
Copy link
Contributor

github-actions bot commented May 5, 2023

Backend code coverage report for PR #67914

Plugin Main PR Difference
azuremonitor 70.7% 70.7% 0%

@github-actions
Copy link
Contributor

github-actions bot commented May 5, 2023

Frontend code coverage report for PR #67914
No changes

Copy link
Contributor

@asimpson asimpson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! 🏆

@aangelisc aangelisc merged commit 9d16718 into main May 5, 2023
@aangelisc aangelisc deleted the andreas/logs-ds-updates branch May 5, 2023 15:47
grafanabot pushed a commit that referenced this pull request May 5, 2023
* Update TimeGrain interface methods

- Make them util functions because it's simpler

* Update logs ds to appropiately set resources and timespan

* Set timespan using RCF times

* Update tests

(cherry picked from commit 9d16718)
grafanabot pushed a commit that referenced this pull request May 5, 2023
* Update TimeGrain interface methods

- Make them util functions because it's simpler

* Update logs ds to appropiately set resources and timespan

* Set timespan using RCF times

* Update tests

(cherry picked from commit 9d16718)
grafanabot pushed a commit that referenced this pull request May 5, 2023
* Update TimeGrain interface methods

- Make them util functions because it's simpler

* Update logs ds to appropiately set resources and timespan

* Set timespan using RCF times

* Update tests

(cherry picked from commit 9d16718)
aangelisc added a commit that referenced this pull request May 5, 2023
…lues (#67933)

AzureMonitor: Fix logs query multi-resource and timespan values (#67914)

* Update TimeGrain interface methods

- Make them util functions because it's simpler

* Update logs ds to appropiately set resources and timespan

* Set timespan using RCF times

* Update tests

(cherry picked from commit 9d16718)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
aangelisc added a commit that referenced this pull request May 5, 2023
…ues (#67932)

AzureMonitor: Fix logs query multi-resource and timespan values (#67914)

* Update TimeGrain interface methods

- Make them util functions because it's simpler

* Update logs ds to appropiately set resources and timespan

* Set timespan using RCF times

* Update tests

(cherry picked from commit 9d16718)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
aangelisc added a commit that referenced this pull request May 5, 2023
…ues (#67931)

AzureMonitor: Fix logs query multi-resource and timespan values (#67914)

* Update TimeGrain interface methods

- Make them util functions because it's simpler

* Update logs ds to appropiately set resources and timespan

* Set timespan using RCF times

* Update tests

(cherry picked from commit 9d16718)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
@zerok zerok modified the milestones: 10.0.x, 10.0.0-preview, 10.1.x May 31, 2023
@ricky-undeadcoders ricky-undeadcoders modified the milestones: 10.1.x, 10.1.0 Aug 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/backend backport v9.4.x Mark PR for automatic backport to v9.4.x backport v9.5.x Bot will automatically open backport PR backport v10.0.x datasource/Azure Azure Monitor Datasource type/bug
Projects
Status: Done
5 participants