Merge pull request #60 from netdata/fix/notification-rsc

fix: rename attribute in the notification channels

Author: witalisoft

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.4.0
+
+BREAKING CHANGES:
+
+- resource/netdata_notification_discord_channel: renamed attribute from `alarms` to `notifications` with new values
+- resource/netdata_notification_pagerduty_channel: renamed attribute from `alarms` to `notifications` with new values
+- resource/netdata_notification_slack_channel: renamed attribute from `alarms` to `notifications` with new values
+
 ## 0.3.0
 
 FEATURES:

docs/resources/node_room_member.md

@@ -62,7 +62,7 @@ resource "netdata_node_room_member" "test" {
 
 Required:
 
-- `action` (String) Determines whether matching nodes will be included or excluded from the room. EXCLUDE action always takes precedence against INCLUDE. Valid values: INCLUDE or EXCLUDE.
+- `action` (String) Determines whether matching nodes will be included or excluded from the room. Valid values: INCLUDE or EXCLUDE. EXCLUDE action always takes precedence against INCLUDE.
 
 Optional:
 

docs/resources/notification_discord_channel.md

@@ -31,10 +31,10 @@ resource "netdata_notification_discord_channel" "test" {
 
 ### Required
 
-- `alarms` (String) The alarms setting to set the Discord notification. Valid values are: `ALARMS_SETTING_ALL`, `ALARMS_SETTING_CRITICAL`, `ALARMS_SETTING_ALL_BUT_UNREACHABLE`, `ALARMS_SETTING_UNREACHABLE`
 - `channel_type` (String) Discord channel type. Valid values are: `text`, `forum`
 - `enabled` (Boolean) The enabled status of the Discord notification
 - `name` (String) The name of the Discord notification
+- `notifications` (List of String) The notification options for the Discord. Valid values are: `CRITICAL`, `WARNING`, `CLEAR`, `REACHABLE`, `UNREACHABLE`
 - `space_id` (String) The ID of the space for the Discord notification
 - `webhook_url` (String, Sensitive) Discord webhook URL
 

docs/resources/notification_pagerduty_channel.md

@@ -31,11 +31,11 @@ resource "netdata_notification_pagerduty_channel" "test" {
 
 ### Required
 
-- `alarms` (String) The alarms setting to set the Pagerduty notification. Valid values are: `ALARMS_SETTING_ALL`, `ALARMS_SETTING_CRITICAL`, `ALARMS_SETTING_ALL_BUT_UNREACHABLE`, `ALARMS_SETTING_UNREACHABLE`
 - `alert_events_url` (String) URL for alert events
 - `enabled` (Boolean) The enabled status of the Pagerduty notification
 - `integration_key` (String, Sensitive) Integration key
 - `name` (String) The name of the Pagerduty notification
+- `notifications` (List of String) The notification options for the Pagerduty. Valid values are: `CRITICAL`, `WARNING`, `CLEAR`, `REACHABLE`, `UNREACHABLE`
 - `space_id` (String) The ID of the space for the Pagerduty notification
 
 ### Optional

docs/resources/notification_slack_channel.md

@@ -30,9 +30,9 @@ resource "netdata_notification_slack_channel" "test" {
 
 ### Required
 
-- `alarms` (String) The alarms setting to set the Slack notification. Valid values are: `ALARMS_SETTING_ALL`, `ALARMS_SETTING_CRITICAL`, `ALARMS_SETTING_ALL_BUT_UNREACHABLE`, `ALARMS_SETTING_UNREACHABLE`
 - `enabled` (Boolean) The enabled status of the Slack notification
 - `name` (String) The name of the Slack notification
+- `notifications` (List of String) The notification options for the Slack. Valid values are: `CRITICAL`, `WARNING`, `CLEAR`, `REACHABLE`, `UNREACHABLE`
 - `space_id` (String) The ID of the space for the Slack notification
 - `webhook_url` (String, Sensitive) Slack webhook URL
 

internal/client/models.go

@@ -37,7 +37,7 @@ type NotificationChannel struct {
 	Enabled                  bool                    `json:"enabled"`
 	Name                     string                  `json:"name"`
 	Integration              NotificationIntegration `json:"integration"`
-	Alarms                   string                  `json:"alarms"`
+	NotificationOptions      []string                `json:"notification_options"`
 	Rooms                    []string                `json:"rooms"`
 	Secrets                  json.RawMessage         `json:"secrets"`
 	RepeatNotificationMinute int64                   `json:"repeat_notification_min,omitempty"`
@@ -68,7 +68,7 @@ type NotificationPagerdutyChannel struct {
 type notificationRequestPayload struct {
 	Name                     string          `json:"name"`
 	IntegrationID            string          `json:"integrationID"`
-	Alarms                   string          `json:"alarms"`
+	NotificationOptions      []string        `json:"notification_options"`
 	Rooms                    []string        `json:"rooms"`
 	Secrets                  json.RawMessage `json:"secrets"`
 	RepeatNotificationMinute int64           `json:"repeat_notification_min,omitempty"`

internal/client/notification_discord.go

@@ -17,7 +17,7 @@ func (c *Client) CreateDiscordChannel(spaceID string, commonParams NotificationC
 		Name:                     commonParams.Name,
 		IntegrationID:            commonParams.Integration.ID,
 		Rooms:                    commonParams.Rooms,
-		Alarms:                   commonParams.Alarms,
+		NotificationOptions:      commonParams.NotificationOptions,
 		RepeatNotificationMinute: commonParams.RepeatNotificationMinute,
 	}
 
@@ -73,7 +73,7 @@ func (c *Client) UpdateDiscordChannelByID(spaceID string, commonParams Notificat
 	reqBody := notificationRequestPayload{
 		Name:                     commonParams.Name,
 		Rooms:                    commonParams.Rooms,
-		Alarms:                   commonParams.Alarms,
+		NotificationOptions:      commonParams.NotificationOptions,
 		RepeatNotificationMinute: commonParams.RepeatNotificationMinute,
 	}
 

internal/client/notification_pagerduty.go

@@ -17,7 +17,7 @@ func (c *Client) CreatePagerdutyChannel(spaceID string, commonParams Notificatio
 		Name:                     commonParams.Name,
 		IntegrationID:            commonParams.Integration.ID,
 		Rooms:                    commonParams.Rooms,
-		Alarms:                   commonParams.Alarms,
+		NotificationOptions:      commonParams.NotificationOptions,
 		RepeatNotificationMinute: commonParams.RepeatNotificationMinute,
 	}
 
@@ -72,7 +72,7 @@ func (c *Client) UpdatePagerdutyChannelByID(spaceID string, commonParams Notific
 	reqBody := notificationRequestPayload{
 		Name:                     commonParams.Name,
 		Rooms:                    commonParams.Rooms,
-		Alarms:                   commonParams.Alarms,
+		NotificationOptions:      commonParams.NotificationOptions,
 		RepeatNotificationMinute: commonParams.RepeatNotificationMinute,
 	}
 

internal/client/notification_slack.go

@@ -17,7 +17,7 @@ func (c *Client) CreateSlackChannel(spaceID string, commonParams NotificationCha
 		Name:                     commonParams.Name,
 		IntegrationID:            commonParams.Integration.ID,
 		Rooms:                    commonParams.Rooms,
-		Alarms:                   commonParams.Alarms,
+		NotificationOptions:      commonParams.NotificationOptions,
 		RepeatNotificationMinute: commonParams.RepeatNotificationMinute,
 	}
 
@@ -71,7 +71,7 @@ func (c *Client) UpdateSlackChannelByID(spaceID string, commonParams Notificatio
 	reqBody := notificationRequestPayload{
 		Name:                     commonParams.Name,
 		Rooms:                    commonParams.Rooms,
-		Alarms:                   commonParams.Alarms,
+		NotificationOptions:      commonParams.NotificationOptions,
 		RepeatNotificationMinute: commonParams.RepeatNotificationMinute,
 	}
 	secretsJson, err := json.Marshal(slackParams)

internal/provider/node_room_member.go

@@ -103,7 +103,7 @@ There are two options to add nodes to the room:
 							},
 						},
 						"action": schema.StringAttribute{
-							Description: "Determines whether matching nodes will be included or excluded from the room. EXCLUDE action always takes precedence against INCLUDE. Valid values: INCLUDE or EXCLUDE.",
+							Description: "Determines whether matching nodes will be included or excluded from the room. Valid values: INCLUDE or EXCLUDE. EXCLUDE action always takes precedence against INCLUDE.",
 							Required:    true,
 							Validators: []validator.String{
 								stringvalidator.OneOf([]string{"INCLUDE", "EXCLUDE"}...),