-
Notifications
You must be signed in to change notification settings - Fork 23
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
Move prometheus server to main #399
Conversation
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
pkg/pipeline/utils/prom_server.go
Outdated
// StartServer listens for prometheus resource usage requests | ||
func StartPromServer(tlsConfig *api.PromTLSConf, server *http.Server) { | ||
logrus.Debugf("entering startServer") |
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.
nit: doc mismatch StartServer
=> StartPromServer
, and debug log startServer
=> StartPromServer
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
pkg/pipeline/utils/prom_server.go
Outdated
} | ||
if err != nil && err != http.ErrServerClosed { | ||
logrus.Errorf("error in http.ListenAndServe: %v", err) | ||
os.Exit(1) |
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.
I saw that you kept the same behaviour, but surely it would make more sense to not exit when metricsSettings.NoPanic
is true?
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
Thanks @KalmanMeth for this! :) |
@KalmanMeth the PR looks good to me, just a few minor remarks above. |
Codecov Report
@@ Coverage Diff @@
## main #399 +/- ##
==========================================
+ Coverage 60.98% 61.00% +0.02%
==========================================
Files 91 92 +1
Lines 6297 6399 +102
==========================================
+ Hits 3840 3904 +64
- Misses 2223 2259 +36
- Partials 234 236 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
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
restarted the e2e test that failed with a timeout
@KalmanMeth I mentioned this shouldn't be merged before the operator PR is ready to address the breaking changes; currently operator deployment is broken, so we need to do either a quick fix on the operator side, or rollback this one |
@jotak Sorry for the misunderstanding. I saw that you had removed the the no-merge label and added the label lgtm. |
the do-not-merge label is still there :) |
Even if we have no encode_prom, define the prometheus endpoint so that operational metrics can be reported.
Define prefix for operational metrics.
Remove addr:port from encode_prom definition.
Allow multiple instantiations of encode_prom with different parameters.
All encode_prom instances use the same global prometheus endpoint.