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

InfluxDB: Use grafana timeout value for flux queries #81252

Merged
merged 3 commits into from Jan 25, 2024

Conversation

itsmylife
Copy link
Contributor

What is this feature?

Use grafana timeout configuration for flux query calls

Which issue(s) does this PR fix?:

Fixes #29457

Special notes for your reviewer:

Please check that:

  • It works as expected from a user's perspective.
  • If this is a pre-GA feature, it is behind a feature toggle.
  • The docs are updated, and if this is a notable improvement, it's added to our What's New doc.

@itsmylife itsmylife added datasource/InfluxDB no-backport Skip backport of PR no-changelog Skip including change in changelog/release notes labels Jan 25, 2024
@itsmylife itsmylife added this to the 10.4.x milestone Jan 25, 2024
@itsmylife itsmylife requested a review from a team as a code owner January 25, 2024 11:40
im instancemgmt.InstanceManager
features featuremgmt.FeatureToggles
}

func ProvideService(httpClient httpclient.Provider, features featuremgmt.FeatureToggles) *Service {
func ProvideService(cfg *setting.Cfg, httpClient httpclient.Provider, features featuremgmt.FeatureToggles) *Service {
Copy link
Member

Choose a reason for hiding this comment

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

You shouldn't use this as a dependency. Rather I think you should read the timeout value from HTTP options retrieved in newInstanceSettings?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I updated it badee42

@itsmylife itsmylife requested a review from marefr January 25, 2024 15:21
Copy link
Member

@marefr marefr left a comment

Choose a reason for hiding this comment

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

LGTM

@itsmylife itsmylife merged commit 7d0017f into main Jan 25, 2024
11 checks passed
@itsmylife itsmylife deleted the ismail/flux-set-grafana-timeout branch January 25, 2024 16:05
rwwiv pushed a commit that referenced this pull request Jan 25, 2024
* use grafana timeout for flux queries

* get timeout from settings

* fix test
@lars20070
Copy link

Thanks for the fix! 👍

Ukochka pushed a commit that referenced this pull request Feb 14, 2024
* use grafana timeout for flux queries

* get timeout from settings

* fix test
@aangelisc aangelisc modified the milestones: 10.4.x, 10.4.0 Mar 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/backend datasource/InfluxDB no-backport Skip backport of PR no-changelog Skip including change in changelog/release notes
Projects
None yet
4 participants