-
Notifications
You must be signed in to change notification settings - Fork 11.6k
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: Fix parsing multiple tags on backend mode #77340
Merged
Merged
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
bohandley
approved these changes
Oct 30, 2023
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-77340-to-v10.2.x origin/v10.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6b13064cf6a5f544f558783cda8d3a2b7bc7f7e7 When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-77340-to-v10.2.x
# Create the PR body template
PR_BODY=$(gh pr view 77340 --json body --template 'Backport 6b13064cf6a5f544f558783cda8d3a2b7bc7f7e7 from #77340{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.2.x] InfluxDB: Fix parsing multiple tags on backend mode" --body-file - --label "type/bug" --label "datasource/InfluxDB" --label "area/backend" --label "add to changelog" --label "backport" --base v10.2.x --milestone 10.2.x --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-77340-to-v10.2.x
# Create a pull request where the `base` branch is `v10.2.x` and the `compare`/`head` branch is `backport-77340-to-v10.2.x`.
# Remove the local backport branch
git switch main
git branch -D backport-77340-to-v10.2.x |
grafana-delivery-bot
bot
added
the
backport-failed
Failed to generate backport PR. Please resolve conflicts and create one manually.
label
Oct 30, 2023
itsmylife
added a commit
that referenced
this pull request
Oct 30, 2023
* Multiple tags separated by comma in the result * A non-flaky unit test (cherry picked from commit 6b13064)
itsmylife
added a commit
that referenced
this pull request
Oct 30, 2023
ssama88
pushed a commit
to ssama88/grafana
that referenced
this pull request
Oct 31, 2023
* Multiple tags separated by comma in the result * A non-flaky unit test
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
add to changelog
area/backend
backport v10.2.x
backport-failed
Failed to generate backport PR. Please resolve conflicts and create one manually.
datasource/InfluxDB
type/bug
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?
This is fixing the response when we have multiple tags in the response. Multiple tags must be separated by a comma in the result. This also allows us to be in sync with the frontend mode result.
Why do we need this feature?
To have a proper output
Who is this feature for?
InfluxDB InfluxQL backend mode users
Special notes for your reviewer:
How to test?
influxdbBackendMigration=true
SELECT "usage_idle" FROM "cpu" WHERE $timeFilter GROUP BY "cpu"::tag, "host"::tag
cpu.usage_idle {cpu: cpu3 host: 41c9dcf3b960}
cpu.usage_idle {cpu: cpu3, host: 41c9dcf3b960}
Please check that: