Bug Fix - support for metric extraction in Scheduled task and is_enabled field in object collection rule

Author: Terraform Team Automation

examples/log_analytics/object_collection_rule/object_collection_rule.tf

@@ -80,6 +80,9 @@ variable "object_collection_rule_log_set_key" {
 variable "object_collection_rule_timezone" {
   default = "Asia/Dhaka"
 }
+variable "object_collection_rule_is_enabled" {
+  default = "true"
+}
 
 # Create a object collection rule with required parameters
 resource "oci_log_analytics_log_analytics_object_collection_rule" "objectCollectionRuleRequired" {
@@ -130,6 +133,7 @@ resource "oci_log_analytics_log_analytics_object_collection_rule" "objectCollect
     property_value   = var.object_collection_rule_log_source_override_property_value
   }
   object_name_filters              = [var.object_collection_rule_object_name_filter]
+  is_enabled = var.object_collection_rule_is_enabled
 }
 
 # Get details of above created object collection rule with optional parameters

examples/log_analytics/scheduled_tasks/main.tf

@@ -12,6 +12,7 @@ variable "fingerprint" {}
 variable "private_key_path" {}
 variable "compartment_ocid" {}
 variable "region" {}
+variable "saved_search_id" {}
 
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
@@ -32,7 +33,7 @@ resource "oci_log_analytics_namespace_scheduled_task" "test_namespace_scheduled_
   namespace = data.oci_objectstorage_namespace.test_namespace.namespace
   kind = "STANDARD"
   task_type = "PURGE"
-  display_name = "tfPurgeTask"
+  display_name = "tfPurgeTask1"
 
   action {
     compartment_id_in_subtree = "false"
@@ -58,10 +59,37 @@ resource "oci_log_analytics_namespace_scheduled_task" "test_namespace_scheduled_
   }
 }
 
+resource "oci_log_analytics_namespace_scheduled_task" "test_namespace_scheduled_task_metric" {
+    compartment_id = var.compartment_ocid
+    namespace = data.oci_objectstorage_namespace.test_namespace.namespace
+    kind = "STANDARD"
+    task_type = "SAVED_SEARCH"
+    display_name = "tfPurgeTask2"
+
+    action {
+        metric_extraction {
+          compartment_id = var.compartment_ocid
+          namespace = "test_scheduled_task_metrics"
+          metric_name = "count"
+        }
+        type = "STREAM"
+        saved_search_id = var.saved_search_id
+    }
+
+    schedules {
+      schedule {
+         type = "FIXED_FREQUENCY"
+         misfire_policy = "RETRY_ONCE"
+         recurring_interval = "PT5M"
+         repeat_count = "10"
+       }
+    }
+} 
+
 # look up using the scheduled tasks data source
 data "oci_log_analytics_namespace_scheduled_tasks" "test_namespace_scheduled_tasks" {
   compartment_id = var.compartment_ocid
-  display_name = "tfPurgeTask2"
+  display_name = "tfPurgeTask3"
   filter {
     name = "id"
     values = ["${oci_log_analytics_namespace_scheduled_task.test_namespace_scheduled_task.id}"]

internal/integrationtest/log_analytics_log_analytics_object_collection_rule_test.go

@@ -69,6 +69,7 @@ var (
 		"description":         acctest.Representation{RepType: acctest.Optional, Create: `test terraform rule create`, Update: `test terraform rule update`},
 		"entity_id":           acctest.Representation{RepType: acctest.Optional, Create: `${oci_log_analytics_log_analytics_entity.test_log_analytics_entity.id}`},
 		"freeform_tags":       acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
+		"is_enabled":          acctest.Representation{RepType: acctest.Optional, Create: `true`, Update: nil},
 		"log_set":             acctest.Representation{RepType: acctest.Optional, Create: `logSet`, Update: `logSet2`},
 		"object_name_filters": acctest.Representation{RepType: acctest.Optional, Create: []string{`objectNameFilters`}, Update: []string{`objectNameFilters2`}},
 		"timezone":            acctest.Representation{RepType: acctest.Optional, Create: `Asia/Dhaka`, Update: `America/New_York`},
@@ -96,9 +97,6 @@ func TestLogAnalyticsLogAnalyticsObjectCollectionRuleResource_basic(t *testing.T
 	compartmentIdUVariableStr := fmt.Sprintf("variable \"compartment_id_for_update\" { default = \"%s\" }\n", compartmentIdU)
 
 	managementAgentId := utils.GetEnvSettingWithBlankDefault("managed_agent_id")
-	if managementAgentId == "" {
-		t.Skip("Manual install agent and set managed_agent_id to run this test")
-	}
 	managementAgentIdVariableStr := fmt.Sprintf("variable \"managed_agent_id\" { default = \"%s\" }\n", managementAgentId)
 
 	resourceName := "oci_log_analytics_log_analytics_object_collection_rule.test_log_analytics_object_collection_rule"
@@ -153,6 +151,7 @@ func TestLogAnalyticsLogAnalyticsObjectCollectionRuleResource_basic(t *testing.T
 				resource.TestCheckResourceAttr(resourceName, "log_source_name", "LinuxSyslogSource"),
 				resource.TestCheckResourceAttr(resourceName, "name", "test_terraform_rule"),
 				resource.TestCheckResourceAttrSet(resourceName, "namespace"),
+				resource.TestCheckResourceAttr(resourceName, "is_enabled", "true"),
 				resource.TestCheckResourceAttrSet(resourceName, "os_bucket_name"),
 				resource.TestCheckResourceAttrSet(resourceName, "os_namespace"),
 				resource.TestCheckResourceAttr(resourceName, "overrides.#", "1"),
@@ -198,6 +197,7 @@ func TestLogAnalyticsLogAnalyticsObjectCollectionRuleResource_basic(t *testing.T
 				resource.TestCheckResourceAttr(resourceName, "log_source_name", "LinuxSyslogSource"),
 				resource.TestCheckResourceAttr(resourceName, "name", "test_terraform_rule"),
 				resource.TestCheckResourceAttrSet(resourceName, "namespace"),
+				resource.TestCheckResourceAttr(resourceName, "is_enabled", "true"),
 				resource.TestCheckResourceAttrSet(resourceName, "os_bucket_name"),
 				resource.TestCheckResourceAttrSet(resourceName, "os_namespace"),
 				resource.TestCheckResourceAttr(resourceName, "overrides.#", "1"),
@@ -239,6 +239,7 @@ func TestLogAnalyticsLogAnalyticsObjectCollectionRuleResource_basic(t *testing.T
 				resource.TestCheckResourceAttr(resourceName, "log_source_name", "LinuxSyslogSource"),
 				resource.TestCheckResourceAttr(resourceName, "name", "test_terraform_rule"),
 				resource.TestCheckResourceAttrSet(resourceName, "namespace"),
+				resource.TestCheckResourceAttr(resourceName, "is_enabled", "true"),
 				resource.TestCheckResourceAttrSet(resourceName, "os_bucket_name"),
 				resource.TestCheckResourceAttrSet(resourceName, "os_namespace"),
 				resource.TestCheckResourceAttr(resourceName, "overrides.#", "1"),
@@ -275,6 +276,8 @@ func TestLogAnalyticsLogAnalyticsObjectCollectionRuleResource_basic(t *testing.T
 
 				resource.TestCheckResourceAttr(datasourceName, "log_analytics_object_collection_rule_collection.#", "1"),
 				resource.TestCheckResourceAttr(datasourceName, "log_analytics_object_collection_rule_collection.0.items.#", "1"),
+				resource.TestCheckResourceAttrSet(datasourceName, "log_analytics_object_collection_rule_collection.0.items.0.id"),
+				resource.TestCheckResourceAttr(datasourceName, "log_analytics_object_collection_rule_collection.0.items.0.is_enabled", "true"),
 			),
 		},
 		// verify singular datasource
@@ -292,6 +295,7 @@ func TestLogAnalyticsLogAnalyticsObjectCollectionRuleResource_basic(t *testing.T
 				resource.TestCheckResourceAttr(singularDatasourceName, "description", "test terraform rule update"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
 				resource.TestCheckResourceAttrSet(singularDatasourceName, "id"),
+				resource.TestCheckResourceAttr(singularDatasourceName, "is_enabled", "true"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "log_set", "logSet2"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "object_name_filters.#", "1"),
 				resource.TestCheckResourceAttr(singularDatasourceName, "log_source_name", "LinuxSyslogSource"),