From 372f5cae7c6f4e9c450eacedfc2a8933fe196bed Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Tue, 25 May 2021 16:25:04 +0200 Subject: [PATCH] Also log environment info --- pkg/icingadb/ha.go | 2 +- pkg/icingaredis/heartbeat.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/icingadb/ha.go b/pkg/icingadb/ha.go index 0a90bd06..c9f944af 100644 --- a/pkg/icingadb/ha.go +++ b/pkg/icingadb/ha.go @@ -186,7 +186,7 @@ func (h *HA) realize(s *icingaredisv1.IcingaStatus, t *types.UnixMilli, shouldLo } if shouldLog { - h.logger.Infow("Another instance is active", "instance_id", instance.Id, "heartbeat", instance.Heartbeat, zap.Duration("heartbeat_age", time.Now().Sub(instance.Heartbeat.Time()))) + h.logger.Infow("Another instance is active", "instance_id", instance.Id, zap.String("environment", s.Environment), "heartbeat", instance.Heartbeat, zap.Duration("heartbeat_age", time.Now().Sub(instance.Heartbeat.Time()))) } takeover = false break diff --git a/pkg/icingaredis/heartbeat.go b/pkg/icingaredis/heartbeat.go index c347b330..bbb160c2 100644 --- a/pkg/icingaredis/heartbeat.go +++ b/pkg/icingaredis/heartbeat.go @@ -112,7 +112,11 @@ func (h Heartbeat) controller() { select { case m := <-messages: if !h.active { - h.logger.Info("Received first Icinga 2 heartbeat") + s, err := m.IcingaStatus() + if err != nil { + return err + } + h.logger.Infow("Received first Icinga 2 heartbeat", zap.String("environment", s.Environment)) h.active = true } h.beat <- m