Merge pull request #419 from nickspizzas/statuscake_findstring

feat: adding findstring option to statuscake monitor

Author: LilShah

api/v1alpha1/endpointmonitor_types.go

@@ -212,6 +212,10 @@ type StatusCakeConfig struct {
 	// Enable Real Browser
 	// +optional
 	RealBrowser bool `json:"realBrowser,omitempty"`
+
+	// String to look for within the response. Considered down if not found
+	// +optional
+	FindString string `json:"findString,omitempty"`
 }
 
 // PingdomConfig defines the configuration for Pingdom Monitor Provider

charts/ingressmonitorcontroller/crds/endpointmonitor.stakater.com_endpointmonitors.yaml

@@ -139,6 +139,10 @@ spec:
                   enableSslAlert:
                     description: Enable SSL Alert
                     type: boolean
+                  findString:
+                    description: String to look for within the response. Considered
+                      down if not found
+                    type: string
                   followRedirect:
                     description: Enable ingress redirects
                     type: boolean

config/crd/bases/endpointmonitor.stakater.com_endpointmonitors.yaml

@@ -139,6 +139,10 @@ spec:
                   enableSslAlert:
                     description: Enable SSL Alert
                     type: boolean
+                  findString:
+                    description: String to look for within the response. Considered
+                      down if not found
+                    type: string
                   followRedirect:
                     description: Enable ingress redirects
                     type: boolean

docs/statuscake-configuration.md

@@ -23,6 +23,7 @@ Currently additional Statuscake configurations can be added through these fields
 | TriggerRate             | Minutes to wait before sending an alert          |
 | ContactGroup            | Contact Group to be alerted.                     |
 | TestTags                | Comma separated list of tags                     |
+| FindString              | String to look for within the response           |
 | BasicAuthUser          | Required for [basic-authenticationchecks](#basic-auth-checks)  |
 
 

pkg/monitors/statuscake/statuscake-monitor.go

@@ -193,6 +193,9 @@ func buildUpsertForm(m models.Monitor, cgroup string) url.Values {
 	if providerConfig != nil && providerConfig.Confirmation > 0 {
 		f.Add("confirmation", strconv.Itoa(providerConfig.Confirmation))
 	}
+	if providerConfig != nil {
+		f.Add("find_string", providerConfig.FindString)
+	}
 	return f
 }
 

pkg/monitors/statuscake/statuscake-monitor_test.go

@@ -105,6 +105,7 @@ func TestBuildUpsertForm(t *testing.T) {
 		BasicAuthUser:  "testuser",
 		Confirmation:   2,
 		EnableSSLAlert: true,
+		FindString:     "",
 
 		// changed to string array type on statuscake api
 		// TODO: release new apiVersion to cater new type in apiVersion struct
@@ -125,6 +126,7 @@ func TestBuildUpsertForm(t *testing.T) {
 	assert.Equal(t, "2", vals.Get("confirmation"))
 	assert.Equal(t, "123456,654321", convertUrlValuesToString(vals, "contact_groups[]"))
 	assert.Equal(t, "1", vals.Get("enable_ssl_alert"))
+	assert.Equal(t, "", vals.Get("find_string"))
 	assert.Equal(t, "1", vals.Get("follow_redirects"))
 	assert.Equal(t, "1", vals.Get("paused"))
 	assert.Equal(t, "", vals.Get("ping_url"))