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

docs: Add supported languages for eBPF #3434

Merged
merged 2 commits into from
Jul 23, 2024

Conversation

simonswine
Copy link
Contributor

@simonswine simonswine commented Jul 17, 2024

This is based on my change to Alloy in grafana/alloy#1313.

@simonswine simonswine added the type/docs Improvements for doc docs. Used by Docs team for project management label Jul 17, 2024
@simonswine simonswine force-pushed the 20240717_supported-languages-ebpf branch from 6ddc8ae to ed0b564 Compare July 17, 2024 16:59
@simonswine simonswine changed the title 20240717 supported languages ebpf docs: Add supported languages for eBPF Jul 17, 2024
@simonswine simonswine marked this pull request as ready for review July 22, 2024 10:07
@simonswine simonswine requested review from a team as code owners July 22, 2024 10:07
@simonswine simonswine added the backport release/v1.6 This label will backport a merged PR to the release/v1.6 branch label Jul 22, 2024
Copy link
Contributor

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

Copy link
Contributor

@knylander-grafana knylander-grafana left a comment

Choose a reason for hiding this comment

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

Thank you for updating the docs.

@simonswine simonswine merged commit 4722e80 into grafana:main Jul 23, 2024
19 checks passed
github-actions bot pushed a commit that referenced this pull request Jul 23, 2024
* docs: Add supported languages for eBPF

* Update wording based on alloy PR

(cherry picked from commit 4722e80)
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-3434-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 4722e80dd259f464caa21e1b2c0032b57529fcd7

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-3434-to-release/v1.6
# Create the PR body template
PR_BODY=$(gh pr view 3434 --json body --template 'Backport 4722e80dd259f464caa21e1b2c0032b57529fcd7 from #3434{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.6] docs: Add supported languages for eBPF' --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-3434-to-release/v1.6

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

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

simonswine added a commit that referenced this pull request Jul 23, 2024
* docs: Add supported languages for eBPF

* Update wording based on alloy PR

(cherry picked from commit 4722e80)

Co-authored-by: Christian Simon <simon@swine.de>
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.

2 participants