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

FeatureToggle: Disable dashgpt by default and mark it as preview #78348

Merged
merged 1 commit into from
Nov 17, 2023

Conversation

ivanortegaalba
Copy link
Contributor

DashGPT features were announced in 10.2.0 as a public preview. However, we marked them as GA in the 10.2.1 by mistake.

We discovered there is a performance issue associated with this feature flag being enabled by default. Also, to be congruent with the 10.2 minor, we should mark it back as a public preview.

@grafana-delivery-bot grafana-delivery-bot bot added this to the 10.3.x milestone Nov 17, 2023
@ivanortegaalba ivanortegaalba enabled auto-merge (squash) November 17, 2023 16:49
@ivanortegaalba ivanortegaalba merged commit ddfe4e1 into main Nov 17, 2023
28 checks passed
@ivanortegaalba ivanortegaalba deleted the dashgpt-ff-as-public-preview branch November 17, 2023 16:51
Copy link
Contributor

The backport to v10.2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-78348-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 ddfe4e1bddabcaeab759e2ea9a6d590db2ff021b

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-78348-to-v10.2.x
# Create the PR body template
PR_BODY=$(gh pr view 78348 --json body --template 'Backport ddfe4e1bddabcaeab759e2ea9a6d590db2ff021b from #78348{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[v10.2.x] FeatureToggle: Disable `dashgpt` by default and mark it as preview" --body-file - --label "type/bug" --label "type/docs" --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-78348-to-v10.2.x

# Create a pull request where the `base` branch is `v10.2.x` and the `compare`/`head` branch is `backport-78348-to-v10.2.x`.

# Remove the local backport branch
git switch main
git branch -D backport-78348-to-v10.2.x

@grafana-delivery-bot grafana-delivery-bot bot added the backport-failed Failed to generate backport PR. Please resolve conflicts and create one manually. label Nov 17, 2023
ivanortegaalba added a commit that referenced this pull request Nov 17, 2023
ivanortegaalba added a commit that referenced this pull request Nov 20, 2023
…preview (#78349)

FeatureToggle: Disable `dashgpt` by default and mark it as preview (#78348)

(cherry picked from commit ddfe4e1)
@aangelisc aangelisc modified the milestones: 10.3.x, 10.2.3 Dec 21, 2023
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. type/bug type/docs
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants