Prometheus: Fixes default step value for annotation query #21934
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hugohaggmark
requested review from
torkelo,
peterholmberg and
tskarhed
and removed request for
a team and
torkelo
torkelo
reviewed
Feb 5, 2020
| @@ -520,20 +522,29 @@ export class PrometheusDatasource extends DataSourceApi<PromQuery, PromOptions> | |||
| }; | |||
| } | |||
|
|
|||
| createAnnotationQueryOptions = (options: any): DataQueryRequest<PromQuery> => { | |||
| const annotation = options.annotation; | |||
| const interval = | |||
There was a problem hiding this comment.
Think we should use this.adjustInterval here so that the interval adjusts to time range (so the default 60s won't end up returning too many data points for a long time range).
There was a problem hiding this comment.
Not sure about that, isn't that covered in createQuery?
There was a problem hiding this comment.
Updated PR description so it's more clear what this fix does.
alexanderzobnin
pushed a commit
that referenced
this pull request
Feb 6, 2020
alexanderzobnin
pushed a commit
that referenced
this pull request
Feb 6, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Introduced during a refactor here #20536.
When the step is removed in the Annotation Editor the
annotation.stepis an empty string''. The original codeannotation.step || '60s'handled this but in the refactor we use destructuring with a default value, step = '60s' } = annotationwhich only applies ifstepisnullorundefined.This PR adds a method to handle this case and make it easier to test. PR also adds a constant used in both Angular view code and in datasource.
Which issue(s) this PR fixes:
Closes #21914
Special notes for your reviewer: