Merge branch 'main' of github.com:grafana/amixr-api-go-client

Author: joeyorlando

escalation_policy.go

@@ -42,6 +42,7 @@ type Escalation struct {
 	Important                *bool     `json:"important"`
 	NotifyIfTimeFrom         *string   `json:"notify_if_time_from"`
 	NotifyIfTimeTo           *string   `json:"notify_if_time_to"`
+	Severity                 *string   `json:"severity"`
 }
 
 // Empty struct is here in case we want to add request params to ListEscalations.
@@ -107,6 +108,7 @@ type CreateEscalationOptions struct {
 	Important                   *bool     `json:"important,omitempty"`
 	NotifyIfTimeFrom            string    `json:"notify_if_time_from,omitempty"`
 	NotifyIfTimeTo              string    `json:"notify_if_time_to,omitempty"`
+	Severity                    string    `json:"severity,omitempty"`
 }
 
 // CreateEscalation creates an  escalation
@@ -145,6 +147,7 @@ type UpdateEscalationOptions struct {
 	Important                *bool     `json:"important,omitempty"`
 	NotifyIfTimeFrom         string    `json:"notify_if_time_from,omitempty"`
 	NotifyIfTimeTo           string    `json:"notify_if_time_to,omitempty"`
+	Severity                 string    `json:"severity,omitempty"`
 }
 
 // UpdateEscalation updates an escalation with new templates and/or name. At least one field in template is required

on_call_shift.go

@@ -34,6 +34,7 @@ type OnCallShift struct {
 	Level                      int         `json:"level"`
 	Start                      string      `json:"start"`
 	Duration                   int         `json:"duration"`
+	Until                      *string     `json:"until"`
 	Frequency                  *string     `json:"frequency"`
 	Users                      *[]string   `json:"users"`
 	Interval                   *int        `json:"interval"`
@@ -102,6 +103,7 @@ type CreateOnCallShiftOptions struct {
 	Level                      *int        `json:"level,omitempty"`
 	Start                      string      `json:"start"`
 	Duration                   int         `json:"duration"`
+	Until                      *string     `json:"until"`
 	Frequency                  *string     `json:"frequency"`
 	Users                      *[]string   `json:"users"`
 	Interval                   *int        `json:"interval"`
@@ -143,6 +145,7 @@ type UpdateOnCallShiftOptions struct {
 	Level                      *int        `json:"level,omitempty"`
 	Start                      string      `json:"start"`
 	Duration                   int         `json:"duration"`
+	Until                      *string     `json:"until"`
 	Frequency                  *string     `json:"frequency"`
 	Users                      *[]string   `json:"users"`
 	Interval                   *int        `json:"interval"`

on_call_shift_test.go

@@ -19,6 +19,7 @@ var testOnCallShift = &OnCallShift{
 	Name:      "Test On-Call Shift",
 	Type:      "recurrent_event",
 	Start:     "2020-09-04T13:00:00",
+	Until:     "2020-09-05T13:00:00",
 	Level:     0,
 	Duration:  7200,
 	Frequency: &frequency,
@@ -35,6 +36,7 @@ var testOnCallShiftBody = `{
 	"schedule_id" : "SBM7DV7BKFUYU",
 	"type" : "recurrent_event",
 	"start" : "2020-09-04T13:00:00",
+	"until" : "2020-09-05T13:00:00",
 	"level" : 0,
 	"duration" : 7200,
 	"frequency" : "weekly",