-
Notifications
You must be signed in to change notification settings - Fork 488
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] prometheus.exporter.[blackbox, snmp] misc. fixes #5187
[Docs] prometheus.exporter.[blackbox, snmp] misc. fixes #5187
Conversation
docs/sources/flow/reference/components/prometheus.exporter.cloudwatch.md
Outdated
Show resolved
Hide resolved
Co-authored-by: Clayton Cornell <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@spartan0x117 Can we backport this to v0.34, v0.35, and v0.36 docs or is it something for next only? |
@clayton-cornell I hadn't thought about the backporting when batching these changes. The Should I remove the cloudwatch changes from this PR and make it a separate one? |
@spartan0x117 We can remove the cloudwatch and do it in a separate PR... or backport to all anyway. If we backport to v0.34 the backport will fail because it can't cherrypick into a file that doesn't exist. We could checkout the faield backprot to v0.34, delete cloudwatch, and then push it. Either way the result will be the same. Cleanest is to strip out cloudwatch into its own PR. |
This reverts commit 93a593a.
Makes sense! I backed out the cloudwatch changes and moved them to this PR: #5195 |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-5187-to-release-v0.34 origin/release-v0.34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 31999c8224d3d6cbf848fa441e5862a03abd5837
# Push it to GitHub
git push --set-upstream origin backport-5187-to-release-v0.34
git switch main
# Remove the local backport branch
git branch -D backport-5187-to-release-v0.34 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-5187-to-release-v0.35 origin/release-v0.35
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 31999c8224d3d6cbf848fa441e5862a03abd5837
# Push it to GitHub
git push --set-upstream origin backport-5187-to-release-v0.35
git switch main
# Remove the local backport branch
git branch -D backport-5187-to-release-v0.35 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-5187-to-release-v0.36 origin/release-v0.36
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 31999c8224d3d6cbf848fa441e5862a03abd5837
# Push it to GitHub
git push --set-upstream origin backport-5187-to-release-v0.36
git switch main
# Remove the local backport branch
git branch -D backport-5187-to-release-v0.36 Then, create a pull request where the |
* Remove name from block arguments and add a sentence that a label is required * Fix blocks header levels and move 'period and length' section * Add suggested change Co-authored-by: Clayton Cornell <[email protected]> * Revert "Fix blocks header levels and move 'period and length' section" This reverts commit 93a593a. --------- Co-authored-by: Clayton Cornell <[email protected]> (cherry picked from commit 31999c8)
* Remove name from block arguments and add a sentence that a label is required * Fix blocks header levels and move 'period and length' section * Add suggested change Co-authored-by: Clayton Cornell <[email protected]> * Revert "Fix blocks header levels and move 'period and length' section" This reverts commit 93a593a. --------- Co-authored-by: Clayton Cornell <[email protected]> (cherry picked from commit 31999c8)
* Remove name from block arguments and add a sentence that a label is required * Fix blocks header levels and move 'period and length' section * Add suggested change Co-authored-by: Clayton Cornell <[email protected]> * Revert "Fix blocks header levels and move 'period and length' section" This reverts commit 93a593a. --------- Co-authored-by: Clayton Cornell <[email protected]> (cherry picked from commit 31999c8)
* Remove name from block arguments and add a sentence that a label is required * Fix blocks header levels and move 'period and length' section * Add suggested change Co-authored-by: Clayton Cornell <[email protected]> * Revert "Fix blocks header levels and move 'period and length' section" This reverts commit 93a593a. --------- Co-authored-by: Clayton Cornell <[email protected]> (cherry picked from commit 31999c8) Co-authored-by: Mischa Thompson <[email protected]>
* Remove name from block arguments and add a sentence that a label is required * Fix blocks header levels and move 'period and length' section * Add suggested change Co-authored-by: Clayton Cornell <[email protected]> * Revert "Fix blocks header levels and move 'period and length' section" This reverts commit 93a593a. --------- Co-authored-by: Clayton Cornell <[email protected]> (cherry picked from commit 31999c8) Co-authored-by: Mischa Thompson <[email protected]>
* Remove name from block arguments and add a sentence that a label is required * Fix blocks header levels and move 'period and length' section * Add suggested change Co-authored-by: Clayton Cornell <[email protected]> * Revert "Fix blocks header levels and move 'period and length' section" This reverts commit 93a593a. --------- Co-authored-by: Clayton Cornell <[email protected]> (cherry picked from commit 31999c8) Co-authored-by: Mischa Thompson <[email protected]>
PR Description
(Hopefully) alleviates some confusion in the docs for
prometheus.exporter.blackbox
andprometheus.exporter.snmp
derive thename
attribute from the label of the block and is not a required argument to the block.Which issue(s) this PR fixes
Related to #5163
Notes to the Reviewer
PR Checklist