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

Jump to bottom

Log error message on unhealthy /healthz check #24683

Merged
merged 1 commit into from
Jun 21, 2023
Merged

Log error message on unhealthy /healthz check #24683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions daemon/cmd/agenthealth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"golang.org/x/sys/unix"

"github.com/cilium/cilium/api/v1/models"
"github.com/cilium/cilium/pkg/logging/logfields"
"github.com/cilium/cilium/pkg/option"
)

Expand Down Expand Up @@ -42,6 +43,10 @@ func (d *Daemon) startAgentHealthHTTPService() {
statusCode := http.StatusOK
sr := d.getStatus(true)
if isUnhealthy(&sr) {
log.WithError(errors.New(sr.Cilium.Msg)).WithFields(logrus.Fields{
logfields.State: sr.Cilium.State,
},
).Warn("/healthz returning unhealthy")
statusCode = http.StatusServiceUnavailable
}

Expand Down
8 changes: 4 additions & 4 deletions daemon/cmd/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,13 +646,13 @@ func (d *Daemon) getStatus(brief bool) models.StatusResponse {
Msg: fmt.Sprintf("%s %s", ciliumVer, msg),
}
case d.statusResponse.Kvstore != nil && d.statusResponse.Kvstore.State != models.StatusStateOk:
msg := "Kvstore service is not ready"
msg := "Kvstore service is not ready: " + d.statusResponse.Kvstore.Msg
sr.Cilium = &models.Status{
State: d.statusResponse.Kvstore.State,
Msg: fmt.Sprintf("%s %s", ciliumVer, msg),
}
case d.statusResponse.ContainerRuntime != nil && d.statusResponse.ContainerRuntime.State != models.StatusStateOk:
msg := "Container runtime is not ready"
msg := "Container runtime is not ready: " + d.statusResponse.ContainerRuntime.Msg
if d.statusResponse.ContainerRuntime.State == models.StatusStateDisabled {
msg = "Container runtime is disabled"
}
Expand All @@ -661,13 +661,13 @@ func (d *Daemon) getStatus(brief bool) models.StatusResponse {
Msg: fmt.Sprintf("%s %s", ciliumVer, msg),
}
case d.clientset.IsEnabled() && d.statusResponse.Kubernetes != nil && d.statusResponse.Kubernetes.State != models.StatusStateOk:
msg := "Kubernetes service is not ready"
msg := "Kubernetes service is not ready: " + d.statusResponse.Kubernetes.Msg
sr.Cilium = &models.Status{
State: d.statusResponse.Kubernetes.State,
Msg: fmt.Sprintf("%s %s", ciliumVer, msg),
}
case d.statusResponse.CniFile != nil && d.statusResponse.CniFile.State == models.StatusStateFailure:
msg := "Could not write CNI config file"
msg := "Could not write CNI config file: " + d.statusResponse.CniFile.Msg
sr.Cilium = &models.Status{
State: models.StatusStateFailure,
Msg: fmt.Sprintf("%s %s", ciliumVer, msg),
Expand Down
3 changes: 3 additions & 0 deletions pkg/logging/logfields/logfields.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,4 +729,7 @@ const (

// Value identifies a generic value (e.g., of a key/value pair).
Value = "value"

// State is the state of an individual component (apiserver, kvstore etc)
State = "state"
)