SUMO-213711 resolved conflicts

Author: jinkane

CHANGELOG.md

@@ -1,10 +1,15 @@
 ## 2.21.1 (Unreleased)
 FEATURES:
+* resource/sumologic_monitor: Added support for creating SLO Monitors with multiple burn rates (GH-499)
 * Add new optional `resolution_payload` field to connection resource and `resolution_payload_override` field to notifications section of monitor resource (GH-482)
 
 BUG FIXES:
 * Remove thresholdType field under searchSchedule in content resource (GH-483)
 
+DEPRECATIONS:
+
+* resource/sumologic_monitor: Deprecated `burn_rate_threshold` and time_range in favor of `burn_rate` inside `slo_burn_rate_condition` block (GH-499)
+
 ## 2.21.0 (February 27, 2023)
 FEATURES:
 * **New Resource:** sumologic_cse_first_seen_rule (GH-476)

website/docs/r/monitor.html.markdown

@@ -197,12 +197,20 @@ resource "sumologic_monitor" "tf_slo_monitor_2" {
   trigger_conditions {
     slo_burn_rate_condition {
       critical {
-        burn_rate_threshold =  10
-        time_range = "1d"
+        burn_rate {
+            burn_rate_threshold =  50
+            time_range = "1d"
+        }
       }
       warning {
-        burn_rate_threshold =  5
-        time_range = "1d"
+        burn_rate {
+            burn_rate_threshold =  30
+            time_range = "3d"
+        }
+        burn_rate {
+            burn_rate_threshold =  20
+            time_range = "4d"
+        }
       }
     }
   }
@@ -487,11 +495,17 @@ Here is a summary of arguments for each condition type (fields which are not mar
 
 #### slo_burn_rate_condition
   - `critical`
-    - `time_range` (Required) : The relative time range for the burn rate percentage evaluation.  Accepted format: Optional `-` sign followed by `<number>` followed by a `<time_unit>` character: `s` for seconds, `m` for minutes, `h` for hours, `d` for days. Examples: `30m`, `-12h`.
-    - `burn_rate_threshold` (Required) : The burn rate percentage threshold.
+    - `time_range` (Deprecated) : The relative time range for the burn rate percentage evaluation.  Accepted format: Optional `-` sign followed by `<number>` followed by a `<time_unit>` character: `s` for seconds, `m` for minutes, `h` for hours, `d` for days. Examples: `30m`, `-12h`.
+    - `burn_rate_threshold` (Deprecated) : The burn rate percentage threshold.
+    - `burn_rate` (Required if above two fields are not present): Block to specify burn rate threshold and time range for the condition. This field is in private beta and is not available until given access. To participate in the beta program, contact Sumo Logic support.
+      - `burn_rate_threshold` (Required): The burn rate percentage threshold.
+      - `time_range` (Required): The relative time range for the burn rate percentage evaluation.  Accepted format: Optional `-` sign followed by `<number>` followed by a `<time_unit>` character: `s` for seconds, `m` for minutes, `h` for hours, `d` for days. Examples: `30m`, `-12h`.
   - `warning`
-    - `time_range` (Required) :  Accepted format: Optional `-` sign followed by `<number>` followed by a `<time_unit>` character: `s` for seconds, `m` for minutes, `h` for hours, `d` for days. Examples: `30m`, `-12h`.
-    - `burn_rate_threshold` (Required)
+    - `time_range` (Deprecated) :  Accepted format: Optional `-` sign followed by `<number>` followed by a `<time_unit>` character: `s` for seconds, `m` for minutes, `h` for hours, `d` for days. Examples: `30m`, `-12h`.
+    - `burn_rate_threshold` (Deprecated)
+    - `burn_rate` (Required if above two fields are not present): Block to specify burn rate threshold and time range for the condition. This field is in private beta and is not available until given access. To participate in the beta program, contact Sumo Logic support.
+      - `burn_rate_threshold` (Required): The burn rate percentage threshold.
+      - `time_range` (Required): The relative time range for the burn rate percentage evaluation.  Accepted format: Optional `-` sign followed by `<number>` followed by a `<time_unit>` character: `s` for seconds, `m` for minutes, `h` for hours, `d` for days. Examples: `30m`, `-12h`.
 
 ## The `triggers` block
 The `triggers` block is deprecated. Please use `trigger_conditions` to specify notification conditions.