Add support for severity options in AlertPolicy (#9544)

* Add support for severity options in AlertPolicy * Update description for severity options * Add update test for severity options * Format go changes --------- Co-authored-by: James Edouard <[email protected]>
GoogleCloudPlatform · Dec 11, 2023 · 42bac03 · 42bac03
1 parent c2f6cc6
commit 42bac03
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 5 deletions.
diff --git a/mmv1/products/monitoring/AlertPolicy.yaml b/mmv1/products/monitoring/AlertPolicy.yaml
@@ -957,6 +957,16 @@ properties:
       to 63 Unicode characters or 128 bytes, whichever is smaller. Labels and values
       can contain only lowercase letters, numerals, underscores, and dashes. Keys
       must begin with a letter.
+  - !ruby/object:Api::Type::Enum
+    name: severity
+    description: |
+      The severity of an alert policy indicates how important incidents generated
+      by that policy are. The severity level will be displayed on the Incident
+      detail page and in notifications.
+    values:
+      - :CRITICAL
+      - :ERROR
+      - :WARNING
   - !ruby/object:Api::Type::NestedObject
     name: documentation
     description: |

diff --git a/mmv1/third_party/terraform/services/monitoring/resource_monitoring_alert_policy_test.go b/mmv1/third_party/terraform/services/monitoring/resource_monitoring_alert_policy_test.go
@@ -48,7 +48,7 @@ func testAccMonitoringAlertPolicy_basic(t *testing.T) {
 		CheckDestroy:             testAccCheckAlertPolicyDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccMonitoringAlertPolicy_basicCfg(alertName, conditionName, "ALIGN_RATE", filter),
+				Config: testAccMonitoringAlertPolicy_basicCfg(alertName, conditionName, "ALIGN_RATE", filter, "WARNING"),
 			},
 			{
 				ResourceName:      "google_monitoring_alert_policy.basic",
@@ -65,24 +65,26 @@ func testAccMonitoringAlertPolicy_update(t *testing.T) {
 	conditionName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
 	filter1 := `metric.type=\"compute.googleapis.com/instance/disk/write_bytes_count\" AND resource.type=\"gce_instance\"`
 	aligner1 := "ALIGN_RATE"
+	severity1 := "WARNING"
 	filter2 := `metric.type=\"compute.googleapis.com/instance/cpu/utilization\" AND resource.type=\"gce_instance\"`
 	aligner2 := "ALIGN_MAX"
+	severity2 := "ERROR"
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccCheckAlertPolicyDestroyProducer(t),
 		Steps: []resource.TestStep{
 			{
-				Config: testAccMonitoringAlertPolicy_basicCfg(alertName, conditionName, aligner1, filter1),
+				Config: testAccMonitoringAlertPolicy_basicCfg(alertName, conditionName, aligner1, filter1, severity1),
 			},
 			{
 				ResourceName:      "google_monitoring_alert_policy.basic",
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
 			{
-				Config: testAccMonitoringAlertPolicy_basicCfg(alertName, conditionName, aligner2, filter2),
+				Config: testAccMonitoringAlertPolicy_basicCfg(alertName, conditionName, aligner2, filter2, severity2),
 			},
 			{
 				ResourceName:      "google_monitoring_alert_policy.basic",
@@ -233,7 +235,7 @@ func testAccMonitoringAlertPolicy_promql(t *testing.T) {
 	})
 }
 
-func testAccMonitoringAlertPolicy_basicCfg(alertName, conditionName, aligner, filter string) string {
+func testAccMonitoringAlertPolicy_basicCfg(alertName, conditionName, aligner, filter, severity string) string {
 	return fmt.Sprintf(`
 resource "google_monitoring_alert_policy" "basic" {
   display_name = "%s"
@@ -255,8 +257,10 @@ resource "google_monitoring_alert_policy" "basic" {
       threshold_value = "0.5"
     }
   }
+
+  severity = "%s"
 }
-`, alertName, conditionName, aligner, filter)
+`, alertName, conditionName, aligner, filter, severity)
 }
 
 func testAccMonitoringAlertPolicy_fullCfg(alertName, conditionName1, conditionName2 string) string {
@@ -319,6 +323,8 @@ resource "google_monitoring_alert_policy" "full" {
     }
   }
 
+  severity     = "WARNING"
+
   documentation {
     content   = "test content"
     mime_type = "text/markdown"
@@ -348,6 +354,8 @@ resource "google_monitoring_alert_policy" "mql" {
     }
   }
 
+  severity     = "WARNING"
+
   documentation {
     content   = "test content"
     mime_type = "text/markdown"
@@ -382,6 +390,8 @@ resource "google_monitoring_alert_policy" "log" {
     auto_close = "2000s"
   }
 
+  severity     = "WARNING"
+
   documentation {
     content   = "test content"
     mime_type = "text/markdown"
@@ -441,6 +451,8 @@ resource "google_monitoring_alert_policy" "promql" {
     }
   }
 
+  severity     = "WARNING"
+
   documentation {
     content   = "test content"
     mime_type = "text/markdown"