Skip to content

fix: honor LISTEN when metrics are pushed #375

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

Merged
mayankpande88 merged 2 commits into from
Oct 8, 2026
Merged

fix: honor LISTEN when metrics are pushed #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94f039f
fix: honor LISTEN when metrics are pushed
mayankpande88 Oct 8, 2026
bf5fc20
fix: exit non-zero when the scrape endpoint can't be bound
mayankpande88 Oct 8, 2026
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
11 changes: 8 additions & 3 deletions flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
)

var (
ListenAddress = kingpin.Flag("listen", "Listen address - ip:port or :port").Default("0.0.0.0:80").Envar("LISTEN").String()
ListenAddress = kingpin.Flag("listen", "Listen address - ip:port or :port (default 0.0.0.0:80, or 127.0.0.1:10300 when --metrics-endpoint is set)").Envar("LISTEN").String()
CgroupRoot = kingpin.Flag("cgroupfs-root", "The mount point of the host cgroupfs root").Default("/sys/fs/cgroup").Envar("CGROUPFS_ROOT").String()
DisableLogParsing = kingpin.Flag("disable-log-parsing", "Disable container log parsing").Default("false").Envar("DISABLE_LOG_PARSING").Bool()
DisablePinger = kingpin.Flag("disable-pinger", "Don't ping upstreams").Default("true").Envar("DISABLE_PINGER").Bool()
Expand Down Expand Up @@ -135,7 +135,12 @@ func init() {
}
}

if *MetricsEndpoint != nil {
*ListenAddress = "127.0.0.1:10300"
if *ListenAddress == "" {
*ListenAddress = "0.0.0.0:80"
if *MetricsEndpoint != nil {
// Metrics are pushed, so nothing needs to scrape this endpoint:
// keep it off the network and off port 80.
*ListenAddress = "127.0.0.1:10300"
}
}
}
11 changes: 10 additions & 1 deletion main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,16 @@ func main() {

klog.Infoln("listening on:", *flags.ListenAddress)
if err := srv.ListenAndServe(); err != http.ErrServerClosed {
klog.Errorln(err)
if *flags.MetricsEndpoint == nil {
// Nothing can scrape the agent: exit non-zero so the service
// manager restarts it.
klog.Exitln(err)
} else {
Comment thread
mayankpande88 marked this conversation as resolved.
// Metrics are pushed: the local endpoint is optional, so a
// taken port must not stop the agent.
klog.Errorln("local metrics endpoint unavailable, metrics are still pushed:", err)
<-ctx.Done()
}
}
klog.Infoln("shutdown complete")
}
Expand Down
Loading