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

esVersion support both int or str #806

Merged
merged 1 commit into from
Aug 8, 2022
Merged

Conversation

NissesSenap
Copy link
Collaborator

Description

Use intOrStr on esVersion in the datasource to be compatible with both grafana 7 and 8.
The only thing that have been changed in the GrafanaDataSourceJsonData struct is the esVersion, the rest is just indentation.

Fixes #753

Relevant issues/tickets

#753

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

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

make run
k apply -f deploy/examples/datasources/es.yaml

port-forward to the deployment and verify that the datasource is getting the version set.

@NissesSenap
Copy link
Collaborator Author

ping @faelin and @redradrat

@NissesSenap NissesSenap requested a review from pb82 July 27, 2022 07:28
Copy link
Collaborator

@hubeadmin hubeadmin left a comment

Choose a reason for hiding this comment

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

LGTM, thanks! :)

@hubeadmin hubeadmin merged commit de9a7b2 into grafana:master Aug 8, 2022
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.

[Bug] esVersion type-constraint conflict in GrafanaDataSource Provisioning
2 participants