From 2c13b7034e3810ab8de90e566c69319517b560ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 3 May 2019 20:01:17 +0100 Subject: [PATCH 1/2] chore(docs): update docs with note about alertmanager 0.17.0 --- README.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 33101366a..9fff886f8 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,8 @@ Alertmanager `0.16.x` is **NOT** supported by karma due to changes in the API, see [this issue](https://github.com/prymitive/karma/issues/115) for details. A new API endpoint -[was added](https://github.com/prometheus/alertmanager/pull/1791) and will be -available in the next Alertmanager release (`>=0.17.0`). This new endpoint is -supported by karma. - -tl;dr skip Alertmanager `0.16.x` and wait for `0.17.0` if you wish to use it -with karma +[was added for 0.17.0](https://github.com/prometheus/alertmanager/pull/1791) and +alertmanager `>=0.17.0` is supported. --- From 94ddb04b9357ef1b25cba134cb7b8b2a54ce5053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 3 May 2019 20:01:43 +0100 Subject: [PATCH 2/2] chore(backend): rename mapper to match alertmanager version --- internal/alertmanager/mapper.go | 6 +++--- internal/mapper/{v016 => v017}/Dockerfile | 0 internal/mapper/{v016 => v017}/Makefile | 4 ++-- internal/mapper/{v016 => v017}/alerts.go | 4 ++-- internal/mapper/{v016 => v017}/api.go | 8 ++++---- .../client/alert/alert_client.go | 0 .../client/alert/get_alerts_parameters.go | 0 .../client/alert/get_alerts_responses.go | 2 +- .../client/alert/post_alerts_parameters.go | 2 +- .../client/alert/post_alerts_responses.go | 0 .../client/alertgroup/alertgroup_client.go | 0 .../alertgroup/get_alert_groups_parameters.go | 0 .../alertgroup/get_alert_groups_responses.go | 2 +- .../client/alertmanager_client.go | 10 +++++----- .../client/general/general_client.go | 0 .../client/general/get_status_parameters.go | 0 .../client/general/get_status_responses.go | 2 +- .../receiver/get_receivers_parameters.go | 0 .../receiver/get_receivers_responses.go | 2 +- .../client/receiver/receiver_client.go | 0 .../silence/delete_silence_parameters.go | 0 .../silence/delete_silence_responses.go | 0 .../client/silence/get_silence_parameters.go | 0 .../client/silence/get_silence_responses.go | 2 +- .../client/silence/get_silences_parameters.go | 0 .../client/silence/get_silences_responses.go | 2 +- .../silence/post_silences_parameters.go | 2 +- .../client/silence/post_silences_responses.go | 0 .../client/silence/silence_client.go | 0 .../mapper/{v016 => v017}/models/alert.go | 0 .../{v016 => v017}/models/alert_group.go | 20 +++++++++---------- .../{v016 => v017}/models/alert_groups.go | 0 .../{v016 => v017}/models/alert_status.go | 0 .../models/alertmanager_config.go | 0 .../models/alertmanager_status.go | 0 .../{v016 => v017}/models/cluster_status.go | 0 .../{v016 => v017}/models/gettable_alert.go | 0 .../{v016 => v017}/models/gettable_alerts.go | 0 .../{v016 => v017}/models/gettable_silence.go | 0 .../models/gettable_silences.go | 0 .../mapper/{v016 => v017}/models/label_set.go | 0 .../mapper/{v016 => v017}/models/matcher.go | 0 .../mapper/{v016 => v017}/models/matchers.go | 0 .../{v016 => v017}/models/peer_status.go | 0 .../{v016 => v017}/models/postable_alert.go | 0 .../{v016 => v017}/models/postable_alerts.go | 0 .../{v016 => v017}/models/postable_silence.go | 0 .../mapper/{v016 => v017}/models/receiver.go | 0 .../mapper/{v016 => v017}/models/silence.go | 0 .../{v016 => v017}/models/silence_status.go | 0 .../{v016 => v017}/models/version_info.go | 0 internal/mapper/{v016 => v017}/run.sh | 0 internal/mapper/{v016 => v017}/silences.go | 4 ++-- 53 files changed, 36 insertions(+), 36 deletions(-) rename internal/mapper/{v016 => v017}/Dockerfile (100%) rename internal/mapper/{v016 => v017}/Makefile (80%) rename internal/mapper/{v016 => v017}/alerts.go (94%) rename internal/mapper/{v016 => v017}/api.go (92%) rename internal/mapper/{v016 => v017}/client/alert/alert_client.go (100%) rename internal/mapper/{v016 => v017}/client/alert/get_alerts_parameters.go (100%) rename internal/mapper/{v016 => v017}/client/alert/get_alerts_responses.go (98%) rename internal/mapper/{v016 => v017}/client/alert/post_alerts_parameters.go (98%) rename internal/mapper/{v016 => v017}/client/alert/post_alerts_responses.go (100%) rename internal/mapper/{v016 => v017}/client/alertgroup/alertgroup_client.go (100%) rename internal/mapper/{v016 => v017}/client/alertgroup/get_alert_groups_parameters.go (100%) rename internal/mapper/{v016 => v017}/client/alertgroup/get_alert_groups_responses.go (98%) rename internal/mapper/{v016 => v017}/client/alertmanager_client.go (91%) rename internal/mapper/{v016 => v017}/client/general/general_client.go (100%) rename internal/mapper/{v016 => v017}/client/general/get_status_parameters.go (100%) rename internal/mapper/{v016 => v017}/client/general/get_status_responses.go (96%) rename internal/mapper/{v016 => v017}/client/receiver/get_receivers_parameters.go (100%) rename internal/mapper/{v016 => v017}/client/receiver/get_receivers_responses.go (96%) rename internal/mapper/{v016 => v017}/client/receiver/receiver_client.go (100%) rename internal/mapper/{v016 => v017}/client/silence/delete_silence_parameters.go (100%) rename internal/mapper/{v016 => v017}/client/silence/delete_silence_responses.go (100%) rename internal/mapper/{v016 => v017}/client/silence/get_silence_parameters.go (100%) rename internal/mapper/{v016 => v017}/client/silence/get_silence_responses.go (98%) rename internal/mapper/{v016 => v017}/client/silence/get_silences_parameters.go (100%) rename internal/mapper/{v016 => v017}/client/silence/get_silences_responses.go (97%) rename internal/mapper/{v016 => v017}/client/silence/post_silences_parameters.go (98%) rename internal/mapper/{v016 => v017}/client/silence/post_silences_responses.go (100%) rename internal/mapper/{v016 => v017}/client/silence/silence_client.go (100%) rename internal/mapper/{v016 => v017}/models/alert.go (100%) rename internal/mapper/{v016 => v017}/models/alert_group.go (87%) rename internal/mapper/{v016 => v017}/models/alert_groups.go (100%) rename internal/mapper/{v016 => v017}/models/alert_status.go (100%) rename internal/mapper/{v016 => v017}/models/alertmanager_config.go (100%) rename internal/mapper/{v016 => v017}/models/alertmanager_status.go (100%) rename internal/mapper/{v016 => v017}/models/cluster_status.go (100%) rename internal/mapper/{v016 => v017}/models/gettable_alert.go (100%) rename internal/mapper/{v016 => v017}/models/gettable_alerts.go (100%) rename internal/mapper/{v016 => v017}/models/gettable_silence.go (100%) rename internal/mapper/{v016 => v017}/models/gettable_silences.go (100%) rename internal/mapper/{v016 => v017}/models/label_set.go (100%) rename internal/mapper/{v016 => v017}/models/matcher.go (100%) rename internal/mapper/{v016 => v017}/models/matchers.go (100%) rename internal/mapper/{v016 => v017}/models/peer_status.go (100%) rename internal/mapper/{v016 => v017}/models/postable_alert.go (100%) rename internal/mapper/{v016 => v017}/models/postable_alerts.go (100%) rename internal/mapper/{v016 => v017}/models/postable_silence.go (100%) rename internal/mapper/{v016 => v017}/models/receiver.go (100%) rename internal/mapper/{v016 => v017}/models/silence.go (100%) rename internal/mapper/{v016 => v017}/models/silence_status.go (100%) rename internal/mapper/{v016 => v017}/models/version_info.go (100%) rename internal/mapper/{v016 => v017}/run.sh (100%) rename internal/mapper/{v016 => v017}/silences.go (94%) diff --git a/internal/alertmanager/mapper.go b/internal/alertmanager/mapper.go index 8694e3b7f..f6d26ddeb 100644 --- a/internal/alertmanager/mapper.go +++ b/internal/alertmanager/mapper.go @@ -2,7 +2,7 @@ package alertmanager import ( "github.com/prymitive/karma/internal/mapper" - v016 "github.com/prymitive/karma/internal/mapper/v016" + v017 "github.com/prymitive/karma/internal/mapper/v017" v04 "github.com/prymitive/karma/internal/mapper/v04" v05 "github.com/prymitive/karma/internal/mapper/v05" v061 "github.com/prymitive/karma/internal/mapper/v061" @@ -17,6 +17,6 @@ func init() { mapper.RegisterAlertMapper(v062.AlertMapper{}) mapper.RegisterSilenceMapper(v04.SilenceMapper{}) mapper.RegisterSilenceMapper(v05.SilenceMapper{}) - mapper.RegisterAlertMapper(v016.AlertMapper{}) - mapper.RegisterSilenceMapper(v016.SilenceMapper{}) + mapper.RegisterAlertMapper(v017.AlertMapper{}) + mapper.RegisterSilenceMapper(v017.SilenceMapper{}) } diff --git a/internal/mapper/v016/Dockerfile b/internal/mapper/v017/Dockerfile similarity index 100% rename from internal/mapper/v016/Dockerfile rename to internal/mapper/v017/Dockerfile diff --git a/internal/mapper/v016/Makefile b/internal/mapper/v017/Makefile similarity index 80% rename from internal/mapper/v016/Makefile rename to internal/mapper/v017/Makefile index f4f9fda86..ffea8fa00 100644 --- a/internal/mapper/v016/Makefile +++ b/internal/mapper/v017/Makefile @@ -1,6 +1,6 @@ -ALERTMANAGER_VERSION := 2fa210d0e3c86bea44a38f4131c069752738a6cb +ALERTMANAGER_VERSION := v0.17.0 API_VERSION := v2 -PACKAGE := v016 +PACKAGE := v017 TARGET_DIR := /go/src/github.com/prymitive/karma/internal/mapper/$(PACKAGE) IMAGE_NAME := openapi_client_$(PACKAGE) diff --git a/internal/mapper/v016/alerts.go b/internal/mapper/v017/alerts.go similarity index 94% rename from internal/mapper/v016/alerts.go rename to internal/mapper/v017/alerts.go index c7e27b604..ba39ee50d 100644 --- a/internal/mapper/v016/alerts.go +++ b/internal/mapper/v017/alerts.go @@ -1,4 +1,4 @@ -package v016 +package v017 import ( "net/http" @@ -28,7 +28,7 @@ func (m AlertMapper) QueryArgs() string { // IsSupported returns true if given version string is supported func (m AlertMapper) IsSupported(version string) bool { - versionRange := semver.MustParseRange(">=0.16.1") + versionRange := semver.MustParseRange(">=0.17.0") return versionRange(semver.MustParse(version)) } diff --git a/internal/mapper/v016/api.go b/internal/mapper/v017/api.go similarity index 92% rename from internal/mapper/v016/api.go rename to internal/mapper/v017/api.go index 426eee548..b616e0405 100644 --- a/internal/mapper/v016/api.go +++ b/internal/mapper/v017/api.go @@ -1,4 +1,4 @@ -package v016 +package v017 import ( "net/http" @@ -10,9 +10,9 @@ import ( httptransport "github.com/go-openapi/runtime/client" "github.com/prymitive/karma/internal/mapper" - "github.com/prymitive/karma/internal/mapper/v016/client" - "github.com/prymitive/karma/internal/mapper/v016/client/alertgroup" - "github.com/prymitive/karma/internal/mapper/v016/client/silence" + "github.com/prymitive/karma/internal/mapper/v017/client" + "github.com/prymitive/karma/internal/mapper/v017/client/alertgroup" + "github.com/prymitive/karma/internal/mapper/v017/client/silence" "github.com/prymitive/karma/internal/models" ) diff --git a/internal/mapper/v016/client/alert/alert_client.go b/internal/mapper/v017/client/alert/alert_client.go similarity index 100% rename from internal/mapper/v016/client/alert/alert_client.go rename to internal/mapper/v017/client/alert/alert_client.go diff --git a/internal/mapper/v016/client/alert/get_alerts_parameters.go b/internal/mapper/v017/client/alert/get_alerts_parameters.go similarity index 100% rename from internal/mapper/v016/client/alert/get_alerts_parameters.go rename to internal/mapper/v017/client/alert/get_alerts_parameters.go diff --git a/internal/mapper/v016/client/alert/get_alerts_responses.go b/internal/mapper/v017/client/alert/get_alerts_responses.go similarity index 98% rename from internal/mapper/v016/client/alert/get_alerts_responses.go rename to internal/mapper/v017/client/alert/get_alerts_responses.go index b0716a02f..f229bf9b7 100644 --- a/internal/mapper/v016/client/alert/get_alerts_responses.go +++ b/internal/mapper/v017/client/alert/get_alerts_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/prymitive/karma/internal/mapper/v016/models" + models "github.com/prymitive/karma/internal/mapper/v017/models" ) // GetAlertsReader is a Reader for the GetAlerts structure. diff --git a/internal/mapper/v016/client/alert/post_alerts_parameters.go b/internal/mapper/v017/client/alert/post_alerts_parameters.go similarity index 98% rename from internal/mapper/v016/client/alert/post_alerts_parameters.go rename to internal/mapper/v017/client/alert/post_alerts_parameters.go index 8533bc1b7..f40852b17 100644 --- a/internal/mapper/v016/client/alert/post_alerts_parameters.go +++ b/internal/mapper/v017/client/alert/post_alerts_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/prymitive/karma/internal/mapper/v016/models" + models "github.com/prymitive/karma/internal/mapper/v017/models" ) // NewPostAlertsParams creates a new PostAlertsParams object diff --git a/internal/mapper/v016/client/alert/post_alerts_responses.go b/internal/mapper/v017/client/alert/post_alerts_responses.go similarity index 100% rename from internal/mapper/v016/client/alert/post_alerts_responses.go rename to internal/mapper/v017/client/alert/post_alerts_responses.go diff --git a/internal/mapper/v016/client/alertgroup/alertgroup_client.go b/internal/mapper/v017/client/alertgroup/alertgroup_client.go similarity index 100% rename from internal/mapper/v016/client/alertgroup/alertgroup_client.go rename to internal/mapper/v017/client/alertgroup/alertgroup_client.go diff --git a/internal/mapper/v016/client/alertgroup/get_alert_groups_parameters.go b/internal/mapper/v017/client/alertgroup/get_alert_groups_parameters.go similarity index 100% rename from internal/mapper/v016/client/alertgroup/get_alert_groups_parameters.go rename to internal/mapper/v017/client/alertgroup/get_alert_groups_parameters.go diff --git a/internal/mapper/v016/client/alertgroup/get_alert_groups_responses.go b/internal/mapper/v017/client/alertgroup/get_alert_groups_responses.go similarity index 98% rename from internal/mapper/v016/client/alertgroup/get_alert_groups_responses.go rename to internal/mapper/v017/client/alertgroup/get_alert_groups_responses.go index ee65ea33f..fbd9b0b14 100644 --- a/internal/mapper/v016/client/alertgroup/get_alert_groups_responses.go +++ b/internal/mapper/v017/client/alertgroup/get_alert_groups_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/prymitive/karma/internal/mapper/v016/models" + models "github.com/prymitive/karma/internal/mapper/v017/models" ) // GetAlertGroupsReader is a Reader for the GetAlertGroups structure. diff --git a/internal/mapper/v016/client/alertmanager_client.go b/internal/mapper/v017/client/alertmanager_client.go similarity index 91% rename from internal/mapper/v016/client/alertmanager_client.go rename to internal/mapper/v017/client/alertmanager_client.go index 9487a8b99..879263a5c 100644 --- a/internal/mapper/v016/client/alertmanager_client.go +++ b/internal/mapper/v017/client/alertmanager_client.go @@ -11,11 +11,11 @@ import ( strfmt "github.com/go-openapi/strfmt" - "github.com/prymitive/karma/internal/mapper/v016/client/alert" - "github.com/prymitive/karma/internal/mapper/v016/client/alertgroup" - "github.com/prymitive/karma/internal/mapper/v016/client/general" - "github.com/prymitive/karma/internal/mapper/v016/client/receiver" - "github.com/prymitive/karma/internal/mapper/v016/client/silence" + "github.com/prymitive/karma/internal/mapper/v017/client/alert" + "github.com/prymitive/karma/internal/mapper/v017/client/alertgroup" + "github.com/prymitive/karma/internal/mapper/v017/client/general" + "github.com/prymitive/karma/internal/mapper/v017/client/receiver" + "github.com/prymitive/karma/internal/mapper/v017/client/silence" ) // Default alertmanager HTTP client. diff --git a/internal/mapper/v016/client/general/general_client.go b/internal/mapper/v017/client/general/general_client.go similarity index 100% rename from internal/mapper/v016/client/general/general_client.go rename to internal/mapper/v017/client/general/general_client.go diff --git a/internal/mapper/v016/client/general/get_status_parameters.go b/internal/mapper/v017/client/general/get_status_parameters.go similarity index 100% rename from internal/mapper/v016/client/general/get_status_parameters.go rename to internal/mapper/v017/client/general/get_status_parameters.go diff --git a/internal/mapper/v016/client/general/get_status_responses.go b/internal/mapper/v017/client/general/get_status_responses.go similarity index 96% rename from internal/mapper/v016/client/general/get_status_responses.go rename to internal/mapper/v017/client/general/get_status_responses.go index ebdc60f00..9e0c5d396 100644 --- a/internal/mapper/v016/client/general/get_status_responses.go +++ b/internal/mapper/v017/client/general/get_status_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/prymitive/karma/internal/mapper/v016/models" + models "github.com/prymitive/karma/internal/mapper/v017/models" ) // GetStatusReader is a Reader for the GetStatus structure. diff --git a/internal/mapper/v016/client/receiver/get_receivers_parameters.go b/internal/mapper/v017/client/receiver/get_receivers_parameters.go similarity index 100% rename from internal/mapper/v016/client/receiver/get_receivers_parameters.go rename to internal/mapper/v017/client/receiver/get_receivers_parameters.go diff --git a/internal/mapper/v016/client/receiver/get_receivers_responses.go b/internal/mapper/v017/client/receiver/get_receivers_responses.go similarity index 96% rename from internal/mapper/v016/client/receiver/get_receivers_responses.go rename to internal/mapper/v017/client/receiver/get_receivers_responses.go index 522c4b3ff..cae9cfb0f 100644 --- a/internal/mapper/v016/client/receiver/get_receivers_responses.go +++ b/internal/mapper/v017/client/receiver/get_receivers_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/prymitive/karma/internal/mapper/v016/models" + models "github.com/prymitive/karma/internal/mapper/v017/models" ) // GetReceiversReader is a Reader for the GetReceivers structure. diff --git a/internal/mapper/v016/client/receiver/receiver_client.go b/internal/mapper/v017/client/receiver/receiver_client.go similarity index 100% rename from internal/mapper/v016/client/receiver/receiver_client.go rename to internal/mapper/v017/client/receiver/receiver_client.go diff --git a/internal/mapper/v016/client/silence/delete_silence_parameters.go b/internal/mapper/v017/client/silence/delete_silence_parameters.go similarity index 100% rename from internal/mapper/v016/client/silence/delete_silence_parameters.go rename to internal/mapper/v017/client/silence/delete_silence_parameters.go diff --git a/internal/mapper/v016/client/silence/delete_silence_responses.go b/internal/mapper/v017/client/silence/delete_silence_responses.go similarity index 100% rename from internal/mapper/v016/client/silence/delete_silence_responses.go rename to internal/mapper/v017/client/silence/delete_silence_responses.go diff --git a/internal/mapper/v016/client/silence/get_silence_parameters.go b/internal/mapper/v017/client/silence/get_silence_parameters.go similarity index 100% rename from internal/mapper/v016/client/silence/get_silence_parameters.go rename to internal/mapper/v017/client/silence/get_silence_parameters.go diff --git a/internal/mapper/v016/client/silence/get_silence_responses.go b/internal/mapper/v017/client/silence/get_silence_responses.go similarity index 98% rename from internal/mapper/v016/client/silence/get_silence_responses.go rename to internal/mapper/v017/client/silence/get_silence_responses.go index 46696f920..dd93c2ccf 100644 --- a/internal/mapper/v016/client/silence/get_silence_responses.go +++ b/internal/mapper/v017/client/silence/get_silence_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/prymitive/karma/internal/mapper/v016/models" + models "github.com/prymitive/karma/internal/mapper/v017/models" ) // GetSilenceReader is a Reader for the GetSilence structure. diff --git a/internal/mapper/v016/client/silence/get_silences_parameters.go b/internal/mapper/v017/client/silence/get_silences_parameters.go similarity index 100% rename from internal/mapper/v016/client/silence/get_silences_parameters.go rename to internal/mapper/v017/client/silence/get_silences_parameters.go diff --git a/internal/mapper/v016/client/silence/get_silences_responses.go b/internal/mapper/v017/client/silence/get_silences_responses.go similarity index 97% rename from internal/mapper/v016/client/silence/get_silences_responses.go rename to internal/mapper/v017/client/silence/get_silences_responses.go index f6fc5a636..37802ad09 100644 --- a/internal/mapper/v016/client/silence/get_silences_responses.go +++ b/internal/mapper/v017/client/silence/get_silences_responses.go @@ -13,7 +13,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/prymitive/karma/internal/mapper/v016/models" + models "github.com/prymitive/karma/internal/mapper/v017/models" ) // GetSilencesReader is a Reader for the GetSilences structure. diff --git a/internal/mapper/v016/client/silence/post_silences_parameters.go b/internal/mapper/v017/client/silence/post_silences_parameters.go similarity index 98% rename from internal/mapper/v016/client/silence/post_silences_parameters.go rename to internal/mapper/v017/client/silence/post_silences_parameters.go index e5ac58c8e..8b6e0789d 100644 --- a/internal/mapper/v016/client/silence/post_silences_parameters.go +++ b/internal/mapper/v017/client/silence/post_silences_parameters.go @@ -16,7 +16,7 @@ import ( strfmt "github.com/go-openapi/strfmt" - models "github.com/prymitive/karma/internal/mapper/v016/models" + models "github.com/prymitive/karma/internal/mapper/v017/models" ) // NewPostSilencesParams creates a new PostSilencesParams object diff --git a/internal/mapper/v016/client/silence/post_silences_responses.go b/internal/mapper/v017/client/silence/post_silences_responses.go similarity index 100% rename from internal/mapper/v016/client/silence/post_silences_responses.go rename to internal/mapper/v017/client/silence/post_silences_responses.go diff --git a/internal/mapper/v016/client/silence/silence_client.go b/internal/mapper/v017/client/silence/silence_client.go similarity index 100% rename from internal/mapper/v016/client/silence/silence_client.go rename to internal/mapper/v017/client/silence/silence_client.go diff --git a/internal/mapper/v016/models/alert.go b/internal/mapper/v017/models/alert.go similarity index 100% rename from internal/mapper/v016/models/alert.go rename to internal/mapper/v017/models/alert.go diff --git a/internal/mapper/v016/models/alert_group.go b/internal/mapper/v017/models/alert_group.go similarity index 87% rename from internal/mapper/v016/models/alert_group.go rename to internal/mapper/v017/models/alert_group.go index 567335607..3117f9d55 100644 --- a/internal/mapper/v016/models/alert_group.go +++ b/internal/mapper/v017/models/alert_group.go @@ -12,6 +12,7 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/swag" + "github.com/go-openapi/validate" ) // AlertGroup alert group @@ -19,13 +20,16 @@ import ( type AlertGroup struct { // alerts + // Required: true Alerts []*GettableAlert `json:"alerts"` // labels - Labels LabelSet `json:"labels,omitempty"` + // Required: true + Labels LabelSet `json:"labels"` // receiver - Receiver *Receiver `json:"receiver,omitempty"` + // Required: true + Receiver *Receiver `json:"receiver"` } // Validate validates this alert group @@ -52,8 +56,8 @@ func (m *AlertGroup) Validate(formats strfmt.Registry) error { func (m *AlertGroup) validateAlerts(formats strfmt.Registry) error { - if swag.IsZero(m.Alerts) { // not required - return nil + if err := validate.Required("alerts", "body", m.Alerts); err != nil { + return err } for i := 0; i < len(m.Alerts); i++ { @@ -77,10 +81,6 @@ func (m *AlertGroup) validateAlerts(formats strfmt.Registry) error { func (m *AlertGroup) validateLabels(formats strfmt.Registry) error { - if swag.IsZero(m.Labels) { // not required - return nil - } - if err := m.Labels.Validate(formats); err != nil { if ve, ok := err.(*errors.Validation); ok { return ve.ValidateName("labels") @@ -93,8 +93,8 @@ func (m *AlertGroup) validateLabels(formats strfmt.Registry) error { func (m *AlertGroup) validateReceiver(formats strfmt.Registry) error { - if swag.IsZero(m.Receiver) { // not required - return nil + if err := validate.Required("receiver", "body", m.Receiver); err != nil { + return err } if m.Receiver != nil { diff --git a/internal/mapper/v016/models/alert_groups.go b/internal/mapper/v017/models/alert_groups.go similarity index 100% rename from internal/mapper/v016/models/alert_groups.go rename to internal/mapper/v017/models/alert_groups.go diff --git a/internal/mapper/v016/models/alert_status.go b/internal/mapper/v017/models/alert_status.go similarity index 100% rename from internal/mapper/v016/models/alert_status.go rename to internal/mapper/v017/models/alert_status.go diff --git a/internal/mapper/v016/models/alertmanager_config.go b/internal/mapper/v017/models/alertmanager_config.go similarity index 100% rename from internal/mapper/v016/models/alertmanager_config.go rename to internal/mapper/v017/models/alertmanager_config.go diff --git a/internal/mapper/v016/models/alertmanager_status.go b/internal/mapper/v017/models/alertmanager_status.go similarity index 100% rename from internal/mapper/v016/models/alertmanager_status.go rename to internal/mapper/v017/models/alertmanager_status.go diff --git a/internal/mapper/v016/models/cluster_status.go b/internal/mapper/v017/models/cluster_status.go similarity index 100% rename from internal/mapper/v016/models/cluster_status.go rename to internal/mapper/v017/models/cluster_status.go diff --git a/internal/mapper/v016/models/gettable_alert.go b/internal/mapper/v017/models/gettable_alert.go similarity index 100% rename from internal/mapper/v016/models/gettable_alert.go rename to internal/mapper/v017/models/gettable_alert.go diff --git a/internal/mapper/v016/models/gettable_alerts.go b/internal/mapper/v017/models/gettable_alerts.go similarity index 100% rename from internal/mapper/v016/models/gettable_alerts.go rename to internal/mapper/v017/models/gettable_alerts.go diff --git a/internal/mapper/v016/models/gettable_silence.go b/internal/mapper/v017/models/gettable_silence.go similarity index 100% rename from internal/mapper/v016/models/gettable_silence.go rename to internal/mapper/v017/models/gettable_silence.go diff --git a/internal/mapper/v016/models/gettable_silences.go b/internal/mapper/v017/models/gettable_silences.go similarity index 100% rename from internal/mapper/v016/models/gettable_silences.go rename to internal/mapper/v017/models/gettable_silences.go diff --git a/internal/mapper/v016/models/label_set.go b/internal/mapper/v017/models/label_set.go similarity index 100% rename from internal/mapper/v016/models/label_set.go rename to internal/mapper/v017/models/label_set.go diff --git a/internal/mapper/v016/models/matcher.go b/internal/mapper/v017/models/matcher.go similarity index 100% rename from internal/mapper/v016/models/matcher.go rename to internal/mapper/v017/models/matcher.go diff --git a/internal/mapper/v016/models/matchers.go b/internal/mapper/v017/models/matchers.go similarity index 100% rename from internal/mapper/v016/models/matchers.go rename to internal/mapper/v017/models/matchers.go diff --git a/internal/mapper/v016/models/peer_status.go b/internal/mapper/v017/models/peer_status.go similarity index 100% rename from internal/mapper/v016/models/peer_status.go rename to internal/mapper/v017/models/peer_status.go diff --git a/internal/mapper/v016/models/postable_alert.go b/internal/mapper/v017/models/postable_alert.go similarity index 100% rename from internal/mapper/v016/models/postable_alert.go rename to internal/mapper/v017/models/postable_alert.go diff --git a/internal/mapper/v016/models/postable_alerts.go b/internal/mapper/v017/models/postable_alerts.go similarity index 100% rename from internal/mapper/v016/models/postable_alerts.go rename to internal/mapper/v017/models/postable_alerts.go diff --git a/internal/mapper/v016/models/postable_silence.go b/internal/mapper/v017/models/postable_silence.go similarity index 100% rename from internal/mapper/v016/models/postable_silence.go rename to internal/mapper/v017/models/postable_silence.go diff --git a/internal/mapper/v016/models/receiver.go b/internal/mapper/v017/models/receiver.go similarity index 100% rename from internal/mapper/v016/models/receiver.go rename to internal/mapper/v017/models/receiver.go diff --git a/internal/mapper/v016/models/silence.go b/internal/mapper/v017/models/silence.go similarity index 100% rename from internal/mapper/v016/models/silence.go rename to internal/mapper/v017/models/silence.go diff --git a/internal/mapper/v016/models/silence_status.go b/internal/mapper/v017/models/silence_status.go similarity index 100% rename from internal/mapper/v016/models/silence_status.go rename to internal/mapper/v017/models/silence_status.go diff --git a/internal/mapper/v016/models/version_info.go b/internal/mapper/v017/models/version_info.go similarity index 100% rename from internal/mapper/v016/models/version_info.go rename to internal/mapper/v017/models/version_info.go diff --git a/internal/mapper/v016/run.sh b/internal/mapper/v017/run.sh similarity index 100% rename from internal/mapper/v016/run.sh rename to internal/mapper/v017/run.sh diff --git a/internal/mapper/v016/silences.go b/internal/mapper/v017/silences.go similarity index 94% rename from internal/mapper/v016/silences.go rename to internal/mapper/v017/silences.go index e5e83fe22..772589185 100644 --- a/internal/mapper/v016/silences.go +++ b/internal/mapper/v017/silences.go @@ -1,4 +1,4 @@ -package v016 +package v017 import ( "net/http" @@ -27,7 +27,7 @@ func (m SilenceMapper) QueryArgs() string { // IsSupported returns true if given version string is supported func (m SilenceMapper) IsSupported(version string) bool { - versionRange := semver.MustParseRange(">=0.16.0") + versionRange := semver.MustParseRange(">=0.17.0") return versionRange(semver.MustParse(version)) }