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

Update docs to support OTEL GA #11858

Merged
merged 2 commits into from
Feb 7, 2024
Merged

Update docs to support OTEL GA #11858

merged 2 commits into from
Feb 7, 2024

Conversation

JStickler
Copy link
Contributor

What this PR does / why we need it:
Updating the docs in advance of OTEL release to remove "experimental" notes.

Also restructured release notes so that most recent content is first.

@JStickler JStickler added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Feb 2, 2024
@JStickler JStickler requested a review from a team as a code owner February 2, 2024 19:32
Copy link
Contributor

@JordanRushing JordanRushing left a comment

Choose a reason for hiding this comment

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

LGTM

@JStickler JStickler merged commit 46c6118 into main Feb 7, 2024
9 checks passed
@JStickler JStickler deleted the 2024.02.02_OTEL branch February 7, 2024 00:30
@grafanabot
Copy link
Collaborator

The backport to release-2.9.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-11858-to-release-2.9.x origin/release-2.9.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 46c6118eb2a2d56406042431dfbed288df6e924b

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-11858-to-release-2.9.x
# Create the PR body template
PR_BODY=$(gh pr view 11858 --json body --template 'Backport 46c6118eb2a2d56406042431dfbed288df6e924b from #11858{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release-2.9.x] Update docs to support OTEL GA" --body-file - --label "size/S" --label "type/docs" --label "backport" --base release-2.9.x --milestone release-2.9.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-11858-to-release-2.9.x

# Create a pull request where the `base` branch is `release-2.9.x` and the `compare`/`head` branch is `backport-11858-to-release-2.9.x`.

# Remove the local backport branch
git switch main
git branch -D backport-11858-to-release-2.9.x

JStickler added a commit that referenced this pull request Feb 7, 2024
JStickler added a commit that referenced this pull request Feb 7, 2024
Manual backport for two of three files updated in #11858.

Note that the third file updated by #11858 has not been published to the
2.9 release, and thus is not part of this backport.
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
**What this PR does / why we need it**:
Updating the docs in advance of OTEL release to remove "experimental"
notes.

Also restructured release notes so that most recent content is first.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-2.9.x backport-failed size/S type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants