Add retries parameter to checks

Aidaho12 · Aidaho12 · commit fa1e4a2d94e0 · 2025-02-02T12:02:52.000+03:00
Introduced a `retries` field in multiple resource checks to define the number of retries before marking a check as down. Updated both the schema definitions and corresponding documentation to support this change. This ensures enhanced flexibility and robustness in monitoring configurations.
diff --git a/bin/terraform-provider-rmon b/bin/terraform-provider-rmon
diff --git a/docs/resources/check_dns.md b/docs/resources/check_dns.md
@@ -52,6 +52,7 @@ resource "rmon_check_dns" "example" {
 - `description` (String) Description of the CheckDns.
 - `enabled` (Boolean) Enabled state of the Check DNS.
 - `interval` (Number) Interval in seconds between checks.
+- `retries`: (Number) Number of retries before check is marked down.
 - `ip` (String) IP address or domain name for check.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `pd_channel_id` (Number) PagerDuty channel ID for alerts.
diff --git a/docs/resources/check_http.md b/docs/resources/check_http.md
@@ -60,6 +60,7 @@ EOF
 - `header_req` (String) Send headers to server. In JSON.
 - `ignore_ssl_error` (Boolean) Ignore TLS/SSL error.
 - `interval` (Number) Interval in seconds between checks.
+- `retries`: (Number) Number of retries before check is marked down.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `pd_channel_id` (Number) PagerDuty channel ID for alerts.
 - `slack_channel_id` (Number) Slack channel ID for alerts.
diff --git a/docs/resources/check_ping.md b/docs/resources/check_ping.md
@@ -49,6 +49,7 @@ resource "rmon_check_ping" "example" {
 - `description` (String) Description of the Check Ping.
 - `enabled` (Boolean) Enabled state of the Check Ping.
 - `interval` (Number) Interval in seconds between checks.
+- `retries`: (Number) Number of retries before check is marked down.
 - `ip` (String) IP address or domain name for Ping check.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `packet_size` (Number) Packet size in bytes.
diff --git a/docs/resources/check_rabbitmq.md b/docs/resources/check_rabbitmq.md
@@ -56,6 +56,7 @@ resource "rmon_check_rabbitmq" "example" {
 - `description` (String) Description of the Check RabbitMQ.
 - `enabled` (Boolean) Enabled state of the Check RabbitMQ.
 - `interval` (Number) Interval in seconds between checks.
+- `retries`: (Number) Number of retries before check is marked down.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `pd_channel_id` (Number) PagerDuty channel ID for alerts.
 - `port` (Number) RabbitMQ server port.
diff --git a/docs/resources/check_smtp.md b/docs/resources/check_smtp.md
@@ -56,6 +56,7 @@ resource "rmon_check_smtp" "example" {
 - `enabled` (Boolean) Enabled state of the Check SMTP.
 - `ignore_ssl_error` (Boolean) Ignore TLS/SSL error.
 - `interval` (Number) Interval in seconds between checks.
+- `retries`: (Number) Number of retries before check is marked down.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `pd_channel_id` (Number) PagerDuty channel ID for alerts.
 - `port` (Number) SMTP server port.
diff --git a/docs/resources/check_tcp.md b/docs/resources/check_tcp.md
@@ -51,6 +51,7 @@ resource "rmon_check_tcp" "example" {
 - `check_timeout` (Number) Answer timeout in seconds.
 - `description` (String) Description of the Check TCP.
 - `enabled` (Boolean) Enabled state of the Check TCP.
+- `retries`: (Number) Number of retries before check is marked down.
 - `interval` (Number) Interval in seconds between checks.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `pd_channel_id` (Number) PagerDuty channel ID for alerts.
diff --git a/rmon/check_fields.go b/rmon/check_fields.go
@@ -22,4 +22,5 @@ const (
 	UrlField                 = "url"
 	UserNameField            = "username"
 	VhostField               = "vhost"
+	RetriesField             = "retries"
 )
diff --git a/rmon/resource_rmon_check_dns.go b/rmon/resource_rmon_check_dns.go
@@ -134,6 +134,13 @@ func resourceCheckDns() *schema.Resource {
 					"txt",
 				}, false),
 			},
+			RetriesField: {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Description:  "Number of retries before check is marked down.",
+				ValidateFunc: validation.IntAtLeast(0),
+				Default:      3,
+			},
 		},
 	}
 }
@@ -162,6 +169,7 @@ func resourceCheckDnsCreate(ctx context.Context, d *schema.ResourceData, m inter
 		IPField:           d.Get(IPField),
 		ResolverField:     d.Get(ResolverField),
 		RecordTypeField:   d.Get(RecordTypeField),
+		RetriesField:      d.Get(RetriesField).(int),
 	}
 
 	resp, err := client.doRequest("POST", "/api/v1.0/rmon/check/dns", server)
@@ -220,6 +228,7 @@ func resourceCheckDnsRead(ctx context.Context, d *schema.ResourceData, m interfa
 	d.Set(IPField, result[IPField])
 	d.Set(ResolverField, result[ResolverField])
 	d.Set(RecordTypeField, result[RecordTypeField])
+	d.Set(RetriesField, result[RetriesField])
 
 	return nil
 }
@@ -249,6 +258,7 @@ func resourceCheckDnsUpdate(ctx context.Context, d *schema.ResourceData, m inter
 		IPField:           d.Get(IPField),
 		ResolverField:     d.Get(ResolverField),
 		RecordTypeField:   d.Get(RecordTypeField),
+		RetriesField:      d.Get(RetriesField).(int),
 	}
 
 	_, err := client.doRequest("PUT", fmt.Sprintf("/api/v1.0/rmon/check/dns/%s", id), server)
diff --git a/rmon/resource_rmon_check_http.go b/rmon/resource_rmon_check_http.go
@@ -148,6 +148,13 @@ func resourceCheckHttp() *schema.Resource {
 				Description:  "Send headers to server. In JSON.",
 				ValidateFunc: validation.StringIsJSON,
 			},
+			RetriesField: {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Description:  "Number of retries before check is marked down.",
+				ValidateFunc: validation.IntAtLeast(0),
+				Default:      3,
+			},
 		},
 	}
 }
@@ -179,6 +186,7 @@ func resourceCheckHttpCreate(ctx context.Context, d *schema.ResourceData, m inte
 		BodyField:                d.Get(BodyField),
 		BodyRequestField:         d.Get(BodyRequestField),
 		HeaderRequestField:       d.Get(HeaderRequestField),
+		RetriesField:             d.Get(RetriesField).(int),
 	}
 
 	resp, err := client.doRequest("POST", "/api/v1.0/rmon/check/http", server)
@@ -240,6 +248,7 @@ func resourceCheckHttpRead(ctx context.Context, d *schema.ResourceData, m interf
 	d.Set(BodyField, result[BodyField])
 	d.Set(BodyRequestField, result[BodyRequestField])
 	d.Set(HeaderRequestField, result[HeaderRequestField])
+	d.Set(RetriesField, result[RetriesField])
 
 	return nil
 }
@@ -272,6 +281,7 @@ func resourceCheckHttpUpdate(ctx context.Context, d *schema.ResourceData, m inte
 		BodyField:                d.Get(BodyField),
 		BodyRequestField:         d.Get(BodyRequestField),
 		HeaderRequestField:       d.Get(HeaderRequestField),
+		RetriesField:             d.Get(RetriesField).(int),
 	}
 
 	if d.HasChange(PortField) {
diff --git a/rmon/resource_rmon_check_ping.go b/rmon/resource_rmon_check_ping.go
@@ -112,6 +112,13 @@ func resourceCheckPing() *schema.Resource {
 				Description:  "Packet size in bytes.",
 				ValidateFunc: validation.IntAtLeast(17),
 			},
+			RetriesField: {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Description:  "Number of retries before check is marked down.",
+				ValidateFunc: validation.IntAtLeast(0),
+				Default:      3,
+			},
 		},
 	}
 }
@@ -138,6 +145,7 @@ func resourceCheckPingCreate(ctx context.Context, d *schema.ResourceData, m inte
 		PDField:           d.Get(PDField).(int),
 		PacketSizeField:   d.Get(PacketSizeField).(int),
 		IPField:           d.Get(IPField),
+		RetriesField:      d.Get(RetriesField).(int),
 	}
 
 	resp, err := client.doRequest("POST", "/api/v1.0/rmon/check/ping", server)
@@ -194,6 +202,7 @@ func resourceCheckPingRead(ctx context.Context, d *schema.ResourceData, m interf
 	d.Set(PDField, result[PDField])
 	d.Set(PacketSizeField, result[PacketSizeField])
 	d.Set(IPField, result[IPField])
+	d.Set(RetriesField, result[RetriesField])
 
 	return nil
 }
@@ -221,6 +230,7 @@ func resourceCheckPingUpdate(ctx context.Context, d *schema.ResourceData, m inte
 		PDField:           d.Get(PDField).(int),
 		PacketSizeField:   d.Get(PacketSizeField).(int),
 		IPField:           d.Get(IPField),
+		RetriesField:      d.Get(RetriesField).(int),
 	}
 
 	if d.HasChange(PortField) {
diff --git a/rmon/resource_rmon_check_rabbitmq.go b/rmon/resource_rmon_check_rabbitmq.go
@@ -128,6 +128,13 @@ func resourceCheckRabbitmq() *schema.Resource {
 				Required:    true,
 				Description: "Virtual host to RabbitMQ server.",
 			},
+			RetriesField: {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Description:  "Number of retries before check is marked down.",
+				ValidateFunc: validation.IntAtLeast(0),
+				Default:      3,
+			},
 		},
 	}
 }
@@ -157,6 +164,7 @@ func resourceCheckRabbitmqCreate(ctx context.Context, d *schema.ResourceData, m
 		UserNameField:     d.Get(UserNameField),
 		PasswordField:     d.Get(PasswordField),
 		VhostField:        d.Get(VhostField),
+		RetriesField:      d.Get(RetriesField).(int),
 	}
 
 	resp, err := client.doRequest("POST", "/api/v1.0/rmon/check/rabbitmq", server)
@@ -216,6 +224,7 @@ func resourceCheckRabbitmqRead(ctx context.Context, d *schema.ResourceData, m in
 	d.Set(UserNameField, result[UserNameField])
 	d.Set(PasswordField, result[PasswordField])
 	d.Set(VhostField, result[VhostField])
+	d.Set(RetriesField, result[RetriesField])
 
 	return nil
 }
@@ -246,6 +255,7 @@ func resourceCheckRabbitmqUpdate(ctx context.Context, d *schema.ResourceData, m
 		UserNameField:     d.Get(UserNameField),
 		PasswordField:     d.Get(PasswordField),
 		VhostField:        d.Get(VhostField),
+		RetriesField:      d.Get(RetriesField).(int),
 	}
 
 	_, err := client.doRequest("PUT", fmt.Sprintf("/api/v1.0/rmon/check/rabbitmq/%s", id), server)
diff --git a/rmon/resource_rmon_check_smtp.go b/rmon/resource_rmon_check_smtp.go
@@ -129,6 +129,13 @@ func resourceCheckSmtp() *schema.Resource {
 				Sensitive:   true,
 				Description: "Password for authenticating to SMTP server.",
 			},
+			RetriesField: {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Description:  "Number of retries before check is marked down.",
+				ValidateFunc: validation.IntAtLeast(0),
+				Default:      3,
+			},
 		},
 	}
 }
@@ -158,6 +165,7 @@ func resourceCheckSmtpCreate(ctx context.Context, d *schema.ResourceData, m inte
 		IgnoreSslErrorField: boolToInt(d.Get(IgnoreSslErrorField).(bool)),
 		UserNameField:       d.Get(UserNameField),
 		PasswordField:       d.Get(PasswordField),
+		RetriesField:        d.Get(RetriesField).(int),
 	}
 
 	resp, err := client.doRequest("POST", "/api/v1.0/rmon/check/smtp", server)
@@ -217,6 +225,7 @@ func resourceCheckSmtpRead(ctx context.Context, d *schema.ResourceData, m interf
 	d.Set(UserNameField, result[UserNameField])
 	d.Set(PasswordField, result[PasswordField])
 	d.Set(IgnoreSslErrorField, intToBool(result[IgnoreSslErrorField].(float64)))
+	d.Set(RetriesField, result[RetriesField])
 
 	return nil
 }
@@ -247,6 +256,7 @@ func resourceCheckSmtpUpdate(ctx context.Context, d *schema.ResourceData, m inte
 		IgnoreSslErrorField: boolToInt(d.Get(IgnoreSslErrorField).(bool)),
 		UserNameField:       d.Get(UserNameField),
 		PasswordField:       d.Get(PasswordField),
+		RetriesField:        d.Get(RetriesField).(int),
 	}
 
 	_, err := client.doRequest("PUT", fmt.Sprintf("/api/v1.0/rmon/check/smtp/%s", id), server)
diff --git a/rmon/resource_rmon_check_tcp.go b/rmon/resource_rmon_check_tcp.go
@@ -112,6 +112,13 @@ func resourceCheckTcp() *schema.Resource {
 				Description:  "Port for check.",
 				ValidateFunc: validation.IsPortNumber,
 			},
+			RetriesField: {
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Description:  "Number of retries before check is marked down.",
+				ValidateFunc: validation.IntAtLeast(0),
+				Default:      3,
+			},
 		},
 	}
 }
@@ -137,6 +144,7 @@ func resourceCheckTcpCreate(ctx context.Context, d *schema.ResourceData, m inter
 		MMField:           d.Get(MMField).(int),
 		PDField:           d.Get(PDField).(int),
 		PortField:         d.Get(PortField).(int),
+		RetriesField:      d.Get(RetriesField).(int),
 		IPField:           d.Get(IPField),
 	}
 
@@ -194,6 +202,7 @@ func resourceCheckTcpRead(ctx context.Context, d *schema.ResourceData, m interfa
 	d.Set(PDField, result[PDField])
 	d.Set(PortField, result[PortField])
 	d.Set(IPField, result[IPField])
+	d.Set(RetriesField, result[RetriesField])
 
 	return nil
 }
@@ -220,6 +229,7 @@ func resourceCheckTcpUpdate(ctx context.Context, d *schema.ResourceData, m inter
 		MMField:           d.Get(MMField).(int),
 		PDField:           d.Get(PDField).(int),
 		PortField:         d.Get(PortField).(int),
+		RetriesField:      d.Get(RetriesField).(int),
 		IPField:           d.Get(IPField),
 	}
 
diff --git a/templates/resources/check_dns.md.tmpl b/templates/resources/check_dns.md.tmpl
@@ -31,6 +31,7 @@ This resource manages DNS check in RMON.
 - `description` (String) Description of the CheckDns.
 - `enabled` (Boolean) Enabled state of the Check DNS.
 - `interval` (Number) Interval in seconds between checks.
+- `retries`: (Number) Number of retries before check is marked down.
 - `ip` (String) IP address or domain name for check.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `pd_channel_id` (Number) PagerDuty channel ID for alerts.
diff --git a/templates/resources/check_http.md.tmpl b/templates/resources/check_http.md.tmpl
@@ -38,6 +38,7 @@ This resource manages HTTP(s) check in RMON.
 - `header_req` (String) Send headers to server. In JSON.
 - `ignore_ssl_error` (Boolean) Ignore TLS/SSL error.
 - `interval` (Number) Interval in seconds between checks.
+- `retries`: (Number) Number of retries before check is marked down.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `pd_channel_id` (Number) PagerDuty channel ID for alerts.
 - `slack_channel_id` (Number) Slack channel ID for alerts.
diff --git a/templates/resources/check_ping.md.tmpl b/templates/resources/check_ping.md.tmpl
@@ -31,6 +31,7 @@ This resource manages Ping check in RMON.
 - `description` (String) Description of the Check Ping.
 - `enabled` (Boolean) Enabled state of the Check Ping.
 - `interval` (Number) Interval in seconds between checks.
+- `retries`: (Number) Number of retries before check is marked down.
 - `ip` (String) IP address or domain name for Ping check.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `packet_size` (Number) Packet size in bytes.
diff --git a/templates/resources/check_rabbitmq.md.tmpl b/templates/resources/check_rabbitmq.md.tmpl
@@ -35,6 +35,7 @@ This resource manages RabbitMQ check in RMON.
 - `description` (String) Description of the Check RabbitMQ.
 - `enabled` (Boolean) Enabled state of the Check RabbitMQ.
 - `interval` (Number) Interval in seconds between checks.
+- `retries`: (Number) Number of retries before check is marked down.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `pd_channel_id` (Number) PagerDuty channel ID for alerts.
 - `port` (Number) RabbitMQ server port.
diff --git a/templates/resources/check_smtp.md.tmpl b/templates/resources/check_smtp.md.tmpl
@@ -35,6 +35,7 @@ This resource manages SMTP check in RMON.
 - `enabled` (Boolean) Enabled state of the Check SMTP.
 - `ignore_ssl_error` (Boolean) Ignore TLS/SSL error.
 - `interval` (Number) Interval in seconds between checks.
+- `retries`: (Number) Number of retries before check is marked down.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `pd_channel_id` (Number) PagerDuty channel ID for alerts.
 - `port` (Number) SMTP server port.
diff --git a/templates/resources/check_tcp.md.tmpl b/templates/resources/check_tcp.md.tmpl
@@ -32,6 +32,7 @@ This resource manages TCP check in RMON.
 - `check_timeout` (Number) Answer timeout in seconds.
 - `description` (String) Description of the Check TCP.
 - `enabled` (Boolean) Enabled state of the Check TCP.
+- `retries`: (Number) Number of retries before check is marked down.
 - `interval` (Number) Interval in seconds between checks.
 - `mm_channel_id` (Number) Mattermost channel ID for alerts.
 - `pd_channel_id` (Number) PagerDuty channel ID for alerts.

Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,5 @@ const (`
`22`	`22`	`UrlField = "url"`
`23`	`23`	`UserNameField = "username"`
`24`	`24`	`VhostField = "vhost"`
	`25`	`+ RetriesField = "retries"`
`25`	`26`	`)`