Merge pull request #238 from bkabrda/mute-monitor-scopes

Make it possible to mute/unmute specific monitor scopes

datadog-accessors.go

@@ -10213,6 +10213,68 @@ func (m *Monitor) SetType(v string) {
 	m.Type = &v
 }
 
+// GetEnd returns the End field if non-nil, zero value otherwise.
+func (m *MuteMonitorScope) GetEnd() int {
+	if m == nil || m.End == nil {
+		return 0
+	}
+	return *m.End
+}
+
+// GetEndOk returns a tuple with the End field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (m *MuteMonitorScope) GetEndOk() (int, bool) {
+	if m == nil || m.End == nil {
+		return 0, false
+	}
+	return *m.End, true
+}
+
+// HasEnd returns a boolean if a field has been set.
+func (m *MuteMonitorScope) HasEnd() bool {
+	if m != nil && m.End != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetEnd allocates a new m.End and returns the pointer to it.
+func (m *MuteMonitorScope) SetEnd(v int) {
+	m.End = &v
+}
+
+// GetScope returns the Scope field if non-nil, zero value otherwise.
+func (m *MuteMonitorScope) GetScope() string {
+	if m == nil || m.Scope == nil {
+		return ""
+	}
+	return *m.Scope
+}
+
+// GetScopeOk returns a tuple with the Scope field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (m *MuteMonitorScope) GetScopeOk() (string, bool) {
+	if m == nil || m.Scope == nil {
+		return "", false
+	}
+	return *m.Scope, true
+}
+
+// HasScope returns a boolean if a field has been set.
+func (m *MuteMonitorScope) HasScope() bool {
+	if m != nil && m.Scope != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetScope allocates a new m.Scope and returns the pointer to it.
+func (m *MuteMonitorScope) SetScope(v string) {
+	m.Scope = &v
+}
+
 // GetBackgroundColor returns the BackgroundColor field if non-nil, zero value otherwise.
 func (n *NoteDefinition) GetBackgroundColor() string {
 	if n == nil || n.BackgroundColor == nil {
@@ -17901,6 +17963,68 @@ func (t *TriggeringValue) SetValue(v int) {
 	t.Value = &v
 }
 
+// GetAllScopes returns the AllScopes field if non-nil, zero value otherwise.
+func (u *UnmuteMonitorScopes) GetAllScopes() bool {
+	if u == nil || u.AllScopes == nil {
+		return false
+	}
+	return *u.AllScopes
+}
+
+// GetAllScopesOk returns a tuple with the AllScopes field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (u *UnmuteMonitorScopes) GetAllScopesOk() (bool, bool) {
+	if u == nil || u.AllScopes == nil {
+		return false, false
+	}
+	return *u.AllScopes, true
+}
+
+// HasAllScopes returns a boolean if a field has been set.
+func (u *UnmuteMonitorScopes) HasAllScopes() bool {
+	if u != nil && u.AllScopes != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetAllScopes allocates a new u.AllScopes and returns the pointer to it.
+func (u *UnmuteMonitorScopes) SetAllScopes(v bool) {
+	u.AllScopes = &v
+}
+
+// GetScope returns the Scope field if non-nil, zero value otherwise.
+func (u *UnmuteMonitorScopes) GetScope() string {
+	if u == nil || u.Scope == nil {
+		return ""
+	}
+	return *u.Scope
+}
+
+// GetScopeOk returns a tuple with the Scope field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (u *UnmuteMonitorScopes) GetScopeOk() (string, bool) {
+	if u == nil || u.Scope == nil {
+		return "", false
+	}
+	return *u.Scope, true
+}
+
+// HasScope returns a boolean if a field has been set.
+func (u *UnmuteMonitorScopes) HasScope() bool {
+	if u != nil && u.Scope != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetScope allocates a new u.Scope and returns the pointer to it.
+func (u *UnmuteMonitorScopes) SetScope(v string) {
+	u.Scope = &v
+}
+
 // GetAccessRole returns the AccessRole field if non-nil, zero value otherwise.
 func (u *User) GetAccessRole() string {
 	if u == nil || u.AccessRole == nil {

integration/monitors_test.go

@@ -141,6 +141,47 @@ func TestMonitorMuteUnmute(t *testing.T) {
 	assert.Equal(t, 0, len(monitor.Options.Silenced))
 }
 
+func TestMonitorMuteUnmuteScopes(t *testing.T) {
+	monitor := createTestMonitor(t)
+	err := client.MuteMonitorScope(*monitor.Id, &datadog.MuteMonitorScope{Scope: datadog.String("host:foo")})
+	if err != nil {
+		t.Fatalf("Failed to mute monitor scope host:foo: %s", err)
+	}
+
+	err = client.MuteMonitorScope(*monitor.Id, &datadog.MuteMonitorScope{Scope: datadog.String("host:bar")})
+	if err != nil {
+		t.Fatalf("Failed to mute monitor scope host:bar: %s", err)
+	}
+
+	monitor, err = client.GetMonitor(*monitor.Id)
+	if err != nil {
+		t.Fatalf("Retrieving monitor failed when it shouldn't: %s", err)
+	}
+	assert.Equal(t, monitor.Options.Silenced, map[string]int{"host:foo": 0, "host:bar": 0})
+
+	err = client.UnmuteMonitorScopes(*monitor.Id, &datadog.UnmuteMonitorScopes{Scope: datadog.String("host:foo")})
+	if err != nil {
+		t.Fatalf("Failed to unmute monitor scope host:foo: %s", err)
+	}
+
+	monitor, err = client.GetMonitor(*monitor.Id)
+	if err != nil {
+		t.Fatalf("Retrieving monitor failed when it shouldn't: %s", err)
+	}
+	assert.Equal(t, monitor.Options.Silenced, map[string]int{"host:bar": 0})
+
+	err = client.UnmuteMonitorScopes(*monitor.Id, &datadog.UnmuteMonitorScopes{AllScopes: datadog.Bool(true)})
+	if err != nil {
+		t.Fatalf("Failed to unmute all monitor scopes: %s", err)
+	}
+
+	monitor, err = client.GetMonitor(*monitor.Id)
+	if err != nil {
+		t.Fatalf("Retrieving monitor failed when it shouldn't: %s", err)
+	}
+	assert.Equal(t, monitor.Options.Silenced, map[string]int{})
+}
+
 /*
 	Testing of global mute and unmuting has not been added for following reasons:
 	* Disabling and enabling of global monitoring does an @all mention which is noisy

monitors.go

@@ -137,6 +137,18 @@ type Creator struct {
 	Name   *string `json:"name,omitempty"`
 }
 
+// MuteMonitorScope specifies which scope to mute and when to end the mute
+type MuteMonitorScope struct {
+	Scope *string `json:"scope,omitempty"`
+	End   *int    `json:"end,omitempty"`
+}
+
+// UnmuteMonitorScopes specifies which scope(s) to unmute
+type UnmuteMonitorScopes struct {
+	Scope     *string `json:"scope,omitempty"`
+	AllScopes *bool   `json:"all_scopes,omitempty"`
+}
+
 // reqMonitors receives a slice of all monitors
 type reqMonitors struct {
 	Monitors []Monitor `json:"monitors,omitempty"`
@@ -229,7 +241,17 @@ func (client *Client) MuteMonitor(id int) error {
 	return client.doJsonRequest("POST", fmt.Sprintf("/v1/monitor/%d/mute", id), nil, nil)
 }
 
+// MuteMonitorScope turns off monitoring notifications for a monitor for a given scope
+func (client *Client) MuteMonitorScope(id int, muteMonitorScope *MuteMonitorScope) error {
+	return client.doJsonRequest("POST", fmt.Sprintf("/v1/monitor/%d/mute", id), muteMonitorScope, nil)
+}
+
 // UnmuteMonitor turns on monitoring notifications for a monitor
 func (client *Client) UnmuteMonitor(id int) error {
 	return client.doJsonRequest("POST", fmt.Sprintf("/v1/monitor/%d/unmute", id), nil, nil)
 }
+
+// UnmuteMonitorScopes is similar to UnmuteMonitor, but provides finer-grained control to unmuting
+func (client *Client) UnmuteMonitorScopes(id int, unmuteMonitorScopes *UnmuteMonitorScopes) error {
+	return client.doJsonRequest("POST", fmt.Sprintf("/v1/monitor/%d/unmute", id), unmuteMonitorScopes, nil)
+}