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 API docs #11581

Merged
merged 1 commit into from
Jan 5, 2024
Merged

Update API docs #11581

merged 1 commit into from
Jan 5, 2024

Conversation

JStickler
Copy link
Contributor

Which issue(s) this PR fixes:
Fixes #11565

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

github-actions bot commented Jan 4, 2024

Trivy scan found the following vulnerabilities:

  • HIGH, Target: docker.io/grafana/loki:main-599eed7 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libcrypto3 v3.1.3-r0. Fixed in v3.1.4-r0
  • HIGH, Target: docker.io/grafana/loki:main-599eed7 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libssl3 v3.1.3-r0. Fixed in v3.1.4-r0
    \nTo see more details on these vulnerabilities, and how/where to fix them, please run docker build -t grafana/loki:main-599eed7 -f cmd/loki/Dockerfile .
    trivy i grafana/loki:main-599eed7 on your branch. If these were not introduced by your PR, please considering fixing them in via a subsequent PR. Thanks!

Copy link
Contributor

@MichelHollands MichelHollands 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 e1a8141 into main Jan 5, 2024
15 checks passed
@JStickler JStickler deleted the GH_11565 branch January 5, 2024 17:35
@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-11581-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 e1a8141341f20735ea5c67dc33e36d23768ad4d8

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-11581-to-release-2.9.x
# Create the PR body template
PR_BODY=$(gh pr view 11581 --json body --template 'Backport e1a8141341f20735ea5c67dc33e36d23768ad4d8 from #11581{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release-2.9.x] Update API docs" --body-file - --label "size/XS" --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-11581-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-11581-to-release-2.9.x`.

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

JStickler added a commit that referenced this pull request Jan 5, 2024
JStickler added a commit that referenced this pull request Jan 5, 2024
**What this PR does / why we need it**:
 
Manual backport of #11581
rhnasc pushed a commit to inloco/loki that referenced this pull request Apr 12, 2024
**Which issue(s) this PR fixes**:
Fixes grafana#11565
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/XS 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.

Docs feedback: /docs/sources/reference/api.md
3 participants