-
Notifications
You must be signed in to change notification settings - Fork 10
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
Add telemetry-prom-merge-port flag for merged metrics #36
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
curtbushko
changed the title
Add telemetry flags for merged metrics
Add telemetry-prom-merge-port flag for merged metrics
Oct 19, 2022
2 tasks
curtbushko
added
the
pr/no-changelog
This PR does not introduce a user-facing change that should be reflected in the changelog
label
Oct 19, 2022
curtbushko
force-pushed
the
curtbushko/agentless-metrics-merging
branch
from
October 19, 2022 19:10
8f3883f
to
c6fc569
Compare
pglass
reviewed
Oct 19, 2022
3 tasks
pglass
approved these changes
Oct 19, 2022
ishustava
reviewed
Oct 19, 2022
@@ -54,6 +54,7 @@ func TestMetricsServerClosed(t *testing.T) { | |||
} | |||
|
|||
func TestMetricsServerEnabled(t *testing.T) { | |||
mergedMetricsBackendBindAddr := mergedMetricsBackendBindHost + defaultMergedMetricsBackendBindPort |
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.
Should we add tests that the metrics backend port can be overridden?
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.
Done!
curtbushko
requested review from
ishustava,
a team,
samsalisbury and
mdeggies
and removed request for
a team
October 20, 2022 17:58
curtbushko
force-pushed
the
curtbushko/agentless-metrics-merging
branch
from
October 20, 2022 22:29
9f26c3b
to
bd10094
Compare
Add telemetry flags for merge metrics
curtbushko
force-pushed
the
curtbushko/agentless-metrics-merging
branch
from
October 21, 2022 02:37
bd10094
to
c720af1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
pr/no-changelog
This PR does not introduce a user-facing change that should be reflected in the changelog
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds a new flag to consul-dataplane named
telemetry-prom-merge-port
with a default value of20100
. This is in order to support merged metrics with consul-k8s. The PR is paired with the consul-k8s PR Merged metrics with consul-dataplane and this PR should be merged before consul-k8s one.I have mainly tested the merged metrics through the consul-k8s acceptance tests and they are passing. The acceptance tests test: