[sc-119944] add logging query to monitor (#98)

https://buildkite.com/chronosphere/terraform-provider-scenarios-tests-oss/builds/27#_
chronosphereio · Jan 27, 2025 · b25feef · b25feef
1 parent 9e2b2e3
commit b25feef
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 1.7.0
+
+Added:
+* Adds support for logging query in the `chronosphere_monitor` resource.
+
 ## 1.6.2
 
 Added:

diff --git a/chronosphere/intschema/monitor.go b/chronosphere/intschema/monitor.go
diff --git a/chronosphere/resource_monitor.go b/chronosphere/resource_monitor.go
@@ -136,6 +136,7 @@ func (monitorConverter) toModel(
 		SeriesConditions:       seriesConditions,
 		SignalGrouping:         monitorSignalGroupingToModel(m.SignalGrouping),
 		Slug:                   m.Slug,
+		LoggingQuery:           m.Query.LoggingExpr,
 	}, nil
 }
 
@@ -155,6 +156,7 @@ func (monitorConverter) fromModel(
 		Query: intschema.MonitorQuery{
 			GraphiteExpr:   m.GraphiteQuery,
 			PrometheusExpr: m.PrometheusQuery,
+			LoggingExpr:    m.LoggingQuery,
 		},
 		SeriesConditions: monitorSeriesConditionsFromModel(m.SeriesConditions),
 		Annotations:      m.Annotations,

diff --git a/chronosphere/tfschema/monitor.go b/chronosphere/tfschema/monitor.go
@@ -80,6 +80,10 @@ var Monitor = map[string]*schema.Schema{
 					Type:     schema.TypeString,
 					Optional: true,
 				},
+				"logging_expr": {
+					Type:     schema.TypeString,
+					Optional: true,
+				},
 			},
 		},
 	},

diff --git a/examples/monitors-logging/collection.tf b/examples/monitors-logging/collection.tf
@@ -0,0 +1 @@
+../collection-notification-policy/main.tf
diff --git a/examples/monitors-logging/email.tf b/examples/monitors-logging/email.tf
@@ -0,0 +1 @@
+../notifiers/email.tf
diff --git a/examples/monitors-logging/main.tf b/examples/monitors-logging/main.tf
@@ -0,0 +1,16 @@
+resource "chronosphere_monitor" "monitor_with_logging_query" {
+  name      = "Monitor With Logging Query"
+  collection_id = chronosphere_collection.infra.id
+  query {
+    logging_expr = <<-EOF
+      service = "nginx" | make-series by chronosphere_namespace
+    EOF
+  }
+  series_conditions {
+    condition {
+      severity = "warn"
+      value    = 20
+      op       = "GT"
+    }
+  }
+}
diff --git a/examples/monitors-logging/team.tf b/examples/monitors-logging/team.tf
@@ -0,0 +1 @@
+../collection/teams.tf
diff --git a/examples/monitors-logging/version.tf b/examples/monitors-logging/version.tf
@@ -0,0 +1 @@
+../version.tf