InfluxDB: Move database information into jsondata #62308
Merged
Conversation
This file contains hidden or 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
gabor
reviewed
Jan 27, 2023
| Token string | ||
| URL string | ||
|
|
||
| Database string `json:"database"` |
Contributor
There was a problem hiding this comment.
strange.. so, there already was code to read jsonData.database, but the value was never used?
Contributor
Author
There was a problem hiding this comment.
In influxdb.go line 181 it is being used params.Set("db", dsInfo.Database)
Contributor
There was a problem hiding this comment.
i see, sorry, i got confuse because the same models.DatasourceInfo structure is created two times in newInstanceSetting.
gabor
reviewed
Jan 30, 2023
Contributor
gabor
left a comment
There was a problem hiding this comment.
the code looks good 👍 , i have left one idea how to improve it. i have not tested it though. i recommend watching sqlite3 data/grafana.db during the tests to see the right fields get the right values.
public/app/plugins/datasource/influxdb/components/ConfigEditor.tsx
Outdated
Show resolved
Hide resolved
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 is this feature?
Since the
databasefield inDataSourceInstanceSettingsis deprecated we have to move that information in to thejsonData.Newly created InfluxDB v1.x datasources will have
dbNamefield injsonDatato store database information.Existing datasources will not be affected and will keep working. If the user updates the datasource configuration (changes the database name) new data will be written in jsonData.
Also, test data for local development is updated and they do not have
databasefield butjsonData.dbName.Why do we need this feature?
databasefield inDataSourceInstanceSettingsis deprecated. https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/datasource.ts#L583-L587We should move that information into the
jsonData.Who is this feature for?
People who use InfluxDB v1.x
Which issue(s) does this PR fix?:
Fixes #59115
Special notes for your reviewer:
How to test
Disclaimer