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.

Sign up for GitHub

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

fix: support configuration of HTTP server address #1365

Merged
merged 5 commits into from
Sep 6, 2022
Merged

fix: support configuration of HTTP server address #1365

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9c95e6
fix: support configuration of HTTP server address
enocom Aug 31, 2022
7361af4
fix: support separate address for prometheus
enocom Aug 31, 2022
9ae8c3c
Merge branch 'main' into anyhost
enocom Aug 31, 2022
d2b6d5f
Revert "fix: support separate address for prometheus"
enocom Sep 4, 2022
5951407
Merge branch 'main' into anyhost
enocom Sep 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ type Command struct {
prometheus bool
prometheusNamespace string
healthCheck bool
httpAddress string
httpPort string
}

Expand Down Expand Up @@ -231,6 +232,8 @@ func NewCommand(opts ...Option) *Command {
"Enable Prometheus HTTP endpoint /metrics on localhost")
cmd.PersistentFlags().StringVar(&c.prometheusNamespace, "prometheus-namespace", "",
"Use the provided Prometheus namespace for metrics")
cmd.PersistentFlags().StringVar(&c.httpAddress, "http-address", "localhost",
"Address for Prometheus and health check server")
cmd.PersistentFlags().StringVar(&c.httpPort, "http-port", "9090",
"Port for Prometheus and health check server")
cmd.PersistentFlags().BoolVar(&c.healthCheck, "health-check", false,
Expand Down Expand Up @@ -528,7 +531,7 @@ func runSignalWrapper(cmd *Command) error {
// Start the HTTP server if anything requiring HTTP is specified.
if needsHTTPServer {
server := &http.Server{
Addr: fmt.Sprintf("localhost:%s", cmd.httpPort),
Addr: fmt.Sprintf("%s:%s", cmd.httpAddress, cmd.httpPort),
Handler: mux,
}
// Start the HTTP server.
Expand Down