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

[DOC] Remove --stability-level for Alloy v1.2 #3382

Merged

Conversation

knylander-grafana
Copy link
Contributor

@knylander-grafana knylander-grafana commented Jun 21, 2024

Changes the command line for starting Alloy to not use --stability-level when starting Alloy v1.2.

This PR should go live when Alloy 1.2 is released.

@knylander-grafana knylander-grafana added type/docs Improvements for doc docs. Used by Docs team for project management backport release/v1.6 This label will backport a merged PR to the release/v1.6 branch labels Jun 21, 2024
@knylander-grafana knylander-grafana requested review from a team as code owners June 21, 2024 22:39
Copy link
Contributor

This PR must be merged before a backport PR will be created.

1 similar comment
Copy link
Contributor

This PR must be merged before a backport PR will be created.

Copy link
Contributor

@clayton-cornell clayton-cornell left a comment

Choose a reason for hiding this comment

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

Looks OK to me. Everything lines up :-)

Copy link
Collaborator

@korniltsev korniltsev 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 \m/

@clayton-cornell
Copy link
Contributor

clayton-cornell commented Jun 24, 2024

Line 12-14 in docs/sources/configure-client/grafana-agent/java/_index.md should probably be updated as well. River only applies to Agent Flow. Alloy uses https://grafana.com/docs/alloy/latest/concepts/configuration-syntax/ (which is the same as River, but it's not called River in Alloy.

@knylander-grafana
Copy link
Contributor Author

Line 12-14 in docs/sources/configure-client/grafana-agent/java/_index.md should probably be updated as well. River only applies to Agent Flow. Alloy uses grafana.com/docs/alloy/latest/concepts/configuration-syntax (which is the same as River, but it's not called River in Alloy.

I've updated the text and links. Let me know if what I added is correct.

Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
@knylander-grafana knylander-grafana merged commit dfd129c into grafana:main Jun 27, 2024
16 checks passed
@knylander-grafana knylander-grafana deleted the updates-for-alloy-1-2 branch June 27, 2024 18:21
github-actions bot pushed a commit that referenced this pull request Jun 27, 2024
Co-authored-by: Clayton Cornell <131809008+clayton-cornell@users.noreply.github.com>
(cherry picked from commit dfd129c)
Copy link
Contributor

The backport to release/v1.6 failed:

Validation Failed: "Could not resolve to a node with the global id of 'T_kwDOAG3Mbc4AczmP'."

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3382-to-release/v1.6 origin/release/v1.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x dfd129c09f3020d65193d849194fc0b3cabb58a2

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-3382-to-release/v1.6
# Create the PR body template
PR_BODY=$(gh pr view 3382 --json body --template 'Backport dfd129c09f3020d65193d849194fc0b3cabb58a2 from #3382{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.6] [DOC] Remove --stability-level for Alloy v1.2' --body-file - --label 'type/docs' --label 'backport' --base release/v1.6 --milestone release/v1.6 --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-3382-to-release/v1.6

# Create a pull request where the `base` branch is `release/v1.6` and the `compare`/`head` branch is `backport-3382-to-release/v1.6`.

# Remove the local backport branch
git switch main
git branch -D backport-3382-to-release/v1.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/v1.6 This label will backport a merged PR to the release/v1.6 branch backport-failed type/docs Improvements for doc docs. Used by Docs team for project management
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants