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

chore: Add relabeling rules flags #3462

Merged

Conversation

simonswine
Copy link
Contributor

@simonswine simonswine commented Aug 1, 2024

This adds flags for the relabeling rules and also makes sure they will show up in the documentation properly.

@simonswine simonswine added type/docs Improvements for doc docs. Used by Docs team for project management backport release/v1.7 This label will backport a merged PR to the release/v1.7 branch labels Aug 1, 2024
@simonswine simonswine changed the title chore: Add relabeling rules flags. chore: Add relabeling rules flags Aug 1, 2024
Copy link
Contributor

github-actions bot commented Aug 1, 2024

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

1 similar comment
Copy link
Contributor

github-actions bot commented Aug 1, 2024

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

@@ -1843,6 +1843,8 @@ The `limits` block configures default and per-tenant limits imposed by component
# CLI flag: -validation.max-profile-symbol-value-length
[max_profile_symbol_value_length: <int> | default = 65535]

distributor_usage_groups:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@bryanhuhta you probably want to provide a similar PR for usage groups.

@simonswine simonswine force-pushed the 20240801_add-docs-for-new-limits branch from 675faf5 to 55cd570 Compare August 1, 2024 13:12
This adds flags for the relabeling rules and also makes sure they will
show up in the documentation properly.
@simonswine simonswine force-pushed the 20240801_add-docs-for-new-limits branch from 55cd570 to 79a9576 Compare August 1, 2024 13:29
@simonswine simonswine marked this pull request as ready for review August 1, 2024 13:49
@simonswine simonswine requested review from a team as code owners August 1, 2024 13:49
@simonswine simonswine merged commit 80e8ad3 into grafana:main Aug 5, 2024
18 checks passed
github-actions bot pushed a commit that referenced this pull request Aug 5, 2024
This adds flags for the relabeling rules and also makes sure they will
show up in the documentation properly.

(cherry picked from commit 80e8ad3)
Copy link
Contributor

github-actions bot commented Aug 5, 2024

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

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-3462-to-release/v1.7
# Create the PR body template
PR_BODY=$(gh pr view 3462 --json body --template 'Backport 80e8ad3320c52ce315114f5db84bb86df707c6e6 from #3462{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.7] chore: Add relabeling rules flags' --body-file - --label 'type/docs' --label 'backport' --base release/v1.7 --milestone release/v1.7 --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-3462-to-release/v1.7

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

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

simonswine added a commit that referenced this pull request Aug 5, 2024
This adds flags for the relabeling rules and also makes sure they will
show up in the documentation properly.

(cherry picked from commit 80e8ad3)

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.7 This label will backport a merged PR to the release/v1.7 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