From 7a0a587ddb835435e65dad2e83f78056ddeb10e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Tue, 5 Mar 2019 11:00:54 +0000 Subject: [PATCH] feat(api): expose alert.inhibitedBy in the API --- internal/alertmanager/models.go | 17 +++++++++-------- internal/models/alertmanager.go | 4 ++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/internal/alertmanager/models.go b/internal/alertmanager/models.go index c34339d4d..e68a8d7c6 100644 --- a/internal/alertmanager/models.go +++ b/internal/alertmanager/models.go @@ -310,14 +310,15 @@ func (am *Alertmanager) pullAlerts(version string) error { alert.Alertmanager = []models.AlertmanagerInstance{ models.AlertmanagerInstance{ - Name: am.Name, - Cluster: am.ClusterID(), - State: alert.State, - StartsAt: alert.StartsAt, - EndsAt: alert.EndsAt, - Source: alert.GeneratorURL, - Silences: silences, - SilencedBy: alert.SilencedBy, + Name: am.Name, + Cluster: am.ClusterID(), + State: alert.State, + StartsAt: alert.StartsAt, + EndsAt: alert.EndsAt, + Source: alert.GeneratorURL, + Silences: silences, + SilencedBy: alert.SilencedBy, + InhibitedBy: alert.InhibitedBy, }, } diff --git a/internal/models/alertmanager.go b/internal/models/alertmanager.go index 913e26efb..3d44238f8 100644 --- a/internal/models/alertmanager.go +++ b/internal/models/alertmanager.go @@ -19,8 +19,8 @@ type AlertmanagerInstance struct { // in api responses, this is used internally Silences map[string]*Silence `json:"-"` // export list of silenced IDs in api response - SilencedBy []string `json:"silencedBy"` - // TODO also export InhibitedBy here if it ever becomes needed + SilencedBy []string `json:"silencedBy"` + InhibitedBy []string `json:"inhibitedBy"` } // AlertmanagerAPIStatus describes the Alertmanager instance overall health