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

feat: add support for queryTimeout in datasources #783

Merged
merged 2 commits into from Jul 5, 2022

Conversation

weisdd
Copy link
Contributor

@weisdd weisdd commented Jul 3, 2022

Description

This PR adds support for queryTimeout (part of jsonData) in datasources.

Relevant issues/tickets

Closes: #782

Type of change

  • New feature (non-breaking change which adds functionality)

Checklist

  • This change requires a documentation update
  • I have added tests that prove my fix is effective or that my feature works
  • I have added a test case that will be used to verify my changes
  • Verified independently on a cluster by reviewer

Verification steps

  1. Add a datasource with a custom queryTimeout in jsonData:
apiVersion: integreatly.org/v1alpha1
kind: GrafanaDataSource
metadata:
  name: example-grafanadatasource
spec:
  name: middleware.yaml
  datasources:
    - name: Prometheus
      type: prometheus
      access: proxy
      url: http://prometheus-service:9090
      isDefault: true
      version: 1
      editable: true
      jsonData:
        tlsSkipVerify: true
        timeInterval: "5s"
        queryTimeout: 30s
  1. In Grafana, inspect the datasource:

image

Signed-off-by: Igor Beliakov <demtis.register@gmail.com>
pb82
pb82 approved these changes Jul 5, 2022
@pb82 pb82 merged commit 8538935 into grafana-operator:master Jul 5, 2022
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can specify the queryTimeout in jsonData for integreatly.org/v1alpha1 GrafanaDataSource
2 participants