address code review comments

chronosphere/intschema/generateintschema/main.go

@@ -57,7 +57,7 @@ var sharedSchemaTypeNames = map[*schema.Schema]string{
 	tfschema.TraceTagFilterSchema:         "TraceTagFilter",
 	tfschema.ValueMappingsSchema:          "ValueMappings",
 	tfschema.SLOAdditionalPromQLFilters:   "SLOAdditionalPromQLFilters",
-	tfschema.MonitorSignalGrouping:        "MonitorSignalGrouping",
+	tfschema.SignalGrouping:               "SignalGrouping",
 }
 
 // Add shared element references here to generate shared types. Usually we

chronosphere/resource_monitor.go

@@ -415,7 +415,7 @@ func monitorConditionsFromModel(
 }
 
 func monitorSignalGroupingToModel(
-	g *intschema.MonitorSignalGrouping,
+	g *intschema.SignalGrouping,
 ) *models.MonitorSignalGrouping {
 	if g == nil {
 		return nil
@@ -428,11 +428,11 @@ func monitorSignalGroupingToModel(
 
 func monitorSignalGroupingFromModel(
 	g *models.MonitorSignalGrouping,
-) *intschema.MonitorSignalGrouping {
+) *intschema.SignalGrouping {
 	if g == nil {
 		return nil
 	}
-	return &intschema.MonitorSignalGrouping{
+	return &intschema.SignalGrouping{
 		LabelNames:      g.LabelNames,
 		SignalPerSeries: g.SignalPerSeries,
 	}

chronosphere/resource_slo.go

@@ -227,7 +227,7 @@ func reportingWindowsFromModel(windows []*models.DefinitionTimeWindow) []intsche
 
 // TODO: once SLOs have been promoted to v1 this can be removed and monitorSignalGroupingToModel can be used.
 func unstableMonitorSignalGroupingToModel(
-	g *intschema.MonitorSignalGrouping,
+	g *intschema.SignalGrouping,
 ) *models.MonitorSignalGrouping {
 	if g == nil {
 		return nil
@@ -241,11 +241,11 @@ func unstableMonitorSignalGroupingToModel(
 // TODO: once SLOs have been promoted to v1 this can be removed and monitorSignalGroupingFromModel can be used.
 func unstableMonitorSignalGroupingFromModel(
 	g *models.MonitorSignalGrouping,
-) *intschema.MonitorSignalGrouping {
+) *intschema.SignalGrouping {
 	if g == nil {
 		return nil
 	}
-	return &intschema.MonitorSignalGrouping{
+	return &intschema.SignalGrouping{
 		LabelNames:      g.LabelNames,
 		SignalPerSeries: g.SignalPerSeries,
 	}

chronosphere/tfschema/common.go

@@ -42,7 +42,7 @@ var MatcherListSchema = &schema.Schema{
 }
 
 // Used by both Monitor and SLO
-var MonitorSignalGrouping = &schema.Schema{
+var SignalGrouping = &schema.Schema{
 	Type:     schema.TypeList,
 	Optional: true,
 	MaxItems: 1,

chronosphere/tfschema/monitor.go

@@ -83,7 +83,7 @@ var Monitor = map[string]*schema.Schema{
 			},
 		},
 	},
-	"signal_grouping": MonitorSignalGrouping,
+	"signal_grouping": SignalGrouping,
 	"series_conditions": {
 		Type:     schema.TypeList,
 		Required: true,

chronosphere/tfschema/slo.go

@@ -64,7 +64,7 @@ var Slo = map[string]*schema.Schema{
 			Schema: SloDefinition,
 		},
 	},
-	"signal_grouping": MonitorSignalGrouping,
+	"signal_grouping": SignalGrouping,
 	"annotations": {
 		Type:     schema.TypeMap,
 		Optional: true,

examples/slo/main.tf

@@ -43,13 +43,12 @@ resource "chronosphere_slo" "slo" {
   }
 }
 
-resource "chronosphere_slo" "slo_with_signal_grouping" {
-  name                   = "SLO With Signal Grouping"
+resource "chronosphere_slo" "slo_with_signal_grouping_signal_per_series" {
+  name                   = "SLO With Signal Grouping (Signal per series)"
   collection_id          = chronosphere_collection.c.id
   notification_policy_id = chronosphere_notification_policy.np.id
 
   signal_grouping {
-    label_names       = ["label1", "label2"]
     signal_per_series = true
   }
 
@@ -67,3 +66,27 @@ resource "chronosphere_slo" "slo_with_signal_grouping" {
     }
   }
 }
+
+resource "chronosphere_slo" "slo_with_signal_grouping_labels" {
+  name                   = "SLO With Signal Grouping (Labels"
+  collection_id          = chronosphere_collection.c.id
+  notification_policy_id = chronosphere_notification_policy.np.id
+
+  signal_grouping {
+    label_names = ["label1", "label2"]
+  }
+
+  definition {
+    objective = 99.95
+    reporting_windows {
+      duration = "28d"
+    }
+  }
+
+  sli {
+    custom_indicator {
+      bad_query_template   = "sum(rate(http_request_duration_seconds_count{error=\"true\"}[{{ .Window }}]))"
+      total_query_template = "sum(rate(http_request_duration_seconds_count[{{ .Window }}]))"
+    }
+  }
+}