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: Fix invalid references to targets in discovery.relabel #3153

Merged

Conversation

ajalab
Copy link
Contributor

@ajalab ajalab commented Apr 1, 2024

The component discovery.relabel exports a label output, but some code examples are trying to get targets field instead and failing.

This PR fixes such invalid references.

@ajalab ajalab requested review from a team as code owners April 1, 2024 09:55
@CLAassistant
Copy link

CLAassistant commented Apr 1, 2024

CLA assistant check
All committers have signed the CLA.

@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

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!

@korniltsev korniltsev enabled auto-merge (squash) April 1, 2024 10:00
@korniltsev korniltsev merged commit 65be0e0 into grafana:main Apr 1, 2024
16 checks passed
@ajalab ajalab deleted the docs-fix-invalid-reference-discovery-relabel branch April 1, 2024 10:08
@simonswine simonswine added type/docs Improvements for doc docs. Used by Docs team for project management backport release/v1.5 This label will backport a merged PR to the release/v1.5 branch labels Apr 24, 2024
github-actions bot pushed a commit that referenced this pull request Apr 24, 2024
Copy link
Contributor

The backport to release/v1.5 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-3153-to-release/v1.5 origin/release/v1.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 65be0e07d548a7f6e048fb419f9a0c8f58bb9465

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-3153-to-release/v1.5
# Create the PR body template
PR_BODY=$(gh pr view 3153 --json body --template 'Backport 65be0e07d548a7f6e048fb419f9a0c8f58bb9465 from #3153{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release/v1.5] docs: Fix invalid references to `targets` in discovery.relabel" --body-file - --label "type/docs" --label "backport" --base release/v1.5 --milestone release/v1.5 --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-3153-to-release/v1.5

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

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

simonswine pushed a commit to simonswine/pyroscope that referenced this pull request Apr 24, 2024
simonswine added a commit that referenced this pull request Apr 24, 2024
#3248)

(cherry picked from commit 65be0e0)

Co-authored-by: Koki Kato <koki.kato1994@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/v1.5 This label will backport a merged PR to the release/v1.5 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.

4 participants