Bugfix - fix unified_agent_configuration param

Author: siem-agent

examples/logging/identity/identity.tf

@@ -11,43 +11,4 @@ variable "log_group_freeform_tags" {
   default = {
     "Department" = "Finance"
   }
-}
-
-variable "tag_namespace_description" {
-  default = "Just a test"
-}
-
-variable "tag_namespace_name" {
-  default = "tf-testexamples-tag-namespace"
-}
-
-resource "oci_identity_tag_namespace" "tag-namespace1" {
-  #Required
-  compartment_id = var.compartment_id
-  description    = var.tag_namespace_description
-  name           = var.tag_namespace_name
-}
-
-resource "oci_identity_tag" "tag1" {
-  #Required
-  description      = "tf example tag"
-  name             = "tf-example-tag"
-  tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
-}
-
-resource "oci_identity_tag" "tag2" {
-  #Required
-  description      = "tf example tag 2"
-  name             = "tf-example-tag-2"
-  tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
-}
-
-output "tag_namespace1_name" {
-  value = oci_identity_tag_namespace.tag-namespace1.name
-}
-output "tag1_name" {
-  value = oci_identity_tag.tag1.name
-}
-output "tag2_name" {
-  value = oci_identity_tag.tag2.name
 }

examples/logging/log/log.tf

@@ -57,8 +57,7 @@ variable "test_log_group_id" {}
 variable "test_log_name" {
   default = "tf-exampleLog"
 }
-variable "tag_namespace1_name" {}
-variable "tag2_name" {}
+
 
 resource "oci_logging_log" "test_log" {
   #Required
@@ -84,9 +83,6 @@ resource "oci_logging_log" "test_log" {
     compartment_id = "ocid1.compartment.oc1..aaaaaaaa4rv5j2vzbrwaztnzvtu7kgswtigms4llcbylelylsqt2l3kl7gaa"
   }*/
 
-  defined_tags = {
-    "${var.tag_namespace1_name}.${var.tag2_name}" = var.defined_tags_value
-  }
   freeform_tags      = var.freeform_tags_value
   is_enabled         = "false"
   retention_duration = "30"

examples/logging/log_agent_configuration/log_agent_configuration.tf

@@ -1,6 +1,7 @@
 // Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
 // Licensed under the Mozilla Public License v2.0
 
+
 variable "compartment_id" {}
 
 variable "unified_agent_configuration_defined_tags_value" {
@@ -174,8 +175,7 @@ variable "unified_agent_configuration_state" {
 variable "log_group_defined_tags_value" {
   default = "value2"
 }
-variable "tag_namespace1_name" {}
-variable "tag1_name" {}
+
 variable "test_log_group_id" {}
 variable "test_log_id" {}
 
@@ -238,10 +238,6 @@ resource "oci_logging_unified_agent_configuration" "test_unified_agent_configura
     }
   }
 
-  #Optional
-  defined_tags = {
-    "${var.tag_namespace1_name}.${var.tag1_name}" = var.log_group_defined_tags_value
-  }
   description   = var.unified_agent_configuration_description
   display_name  = var.unified_agent_configuration_display_name
   freeform_tags = var.unified_agent_configuration_freeform_tags
@@ -330,9 +326,6 @@ resource "oci_logging_unified_agent_configuration" "test_unified_agent_configura
   }
 
   #Optional
-  defined_tags = {
-    "${var.tag_namespace1_name}.${var.tag1_name}" = var.log_group_defined_tags_value
-  }
   description   = var.unified_agent_configuration_description
   display_name  = "test_unified_agent_configuration_1"
   freeform_tags = var.unified_agent_configuration_freeform_tags
@@ -374,7 +367,7 @@ resource "oci_logging_unified_agent_configuration" "test_unified_agent_configura
       source {
         name = "kubernetes_source"
         scrape_targets {
-          k8s_namespace = "kube_system"
+          k8s_namespace = "kube-system"
           resource_group = "tf-test-resource-group"
           resource_type = "PODS"
           service_name = "kubernetes"
@@ -390,9 +383,6 @@ resource "oci_logging_unified_agent_configuration" "test_unified_agent_configura
   }
 
   #Optional
-  defined_tags = {
-    "${var.tag_namespace1_name}.${var.tag1_name}" = var.log_group_defined_tags_value
-  }
   description   = var.unified_agent_configuration_description
   display_name  = "test_unified_agent_configuration_monitoring_KUBERNETES"
   freeform_tags = var.unified_agent_configuration_freeform_tags
@@ -463,9 +453,6 @@ resource "oci_logging_unified_agent_configuration" "test_unified_agent_configura
   }
 
   #Optional
-  defined_tags = {
-    "${var.tag_namespace1_name}.${var.tag1_name}" = var.log_group_defined_tags_value
-  }
   description   = var.unified_agent_configuration_description
   display_name  = "test_unified_agent_configuration_monitoring_TAIL"
   freeform_tags = var.unified_agent_configuration_freeform_tags
@@ -510,9 +497,6 @@ resource "oci_logging_unified_agent_configuration" "test_unified_agent_configura
   }
 
   #Optional
-  defined_tags = {
-    "${var.tag_namespace1_name}.${var.tag1_name}" = var.log_group_defined_tags_value
-  }
   description   = var.unified_agent_configuration_description
   display_name  = "test_unified_agent_configuration_monitoring_URL"
   freeform_tags = var.unified_agent_configuration_freeform_tags

examples/logging/log_group/log_group.tf

@@ -18,9 +18,6 @@ variable "freeform_tags_value" {
   }
 }
 
-variable "tag_namespace1_name" {}
-variable "tag2_name" {}
-
 variable "compartment_id" {}
 
 variable "log_group_name" {
@@ -34,9 +31,7 @@ resource "oci_logging_log_group" "test_log_group" {
 
   #Optional
   description = "description"
-  defined_tags = {
-    "${var.tag_namespace1_name}.${var.tag2_name}" = var.defined_tags_value
-  }
+
   freeform_tags      = var.freeform_tags_value
 
   lifecycle {

examples/logging/log_rule/log_rule.tf

@@ -1,7 +1,5 @@
 
 variable "compartment_id" {}
-variable "tag_namespace1_name" {}
-variable "tag1_name" {}
 
 variable "defined_tags_value" {
   default = "defined_tags_value"
@@ -21,9 +19,6 @@ resource "oci_logging_log" "test_log" {
 resource "oci_logging_log_rule" "test_log_rule" {
   compartment_id = var.compartment_id
   custom_log_id = oci_logging_log.test_log.id
-  defined_tags = {
-    "${var.tag_namespace1_name}.${var.tag1_name}" = var.defined_tags_value
-  }
   description = "description2"
   display_name = "logRuleTFExampleName"
   freeform_tags = {

examples/logging/log_saved_search/log_saved_search.tf

@@ -13,8 +13,6 @@ variable "log_group_defined_tags_value" {
   default = "tf-value-group"
 }
 variable "compartment_id" {}
-variable "tag_namespace1_name" {}
-variable "tag1_name" {}
 variable "test_log_saved_search_name" {
   default = "tf-exampleLogSavedSearch"
 }
@@ -26,9 +24,6 @@ resource "oci_logging_log_saved_search" "test_log_saved_search" {
   query          = "exampleQuery"
 
   #Optional
-  defined_tags = {
-    "${var.tag_namespace1_name}.${var.tag1_name}" = var.log_group_defined_tags_value
-  }
   description = "description"
 
   freeform_tags = var.log_saved_search_freeform_tags

examples/logging/main.tf

@@ -7,10 +7,11 @@
 locals {
   region = "us-phoenix-1"
   tenancy_ocid = "ocid1.tenancy.oc1..aaaaaaaa4s2hncj4oaulmf5tz4yfeska6fya4gkd5jsg3fmlgq7pprgr7wiq"
-  user_ocid = "ocid1.user.oc1..aaaaaaaa5mxx5f6ltt5w6soekhzetsymtgntbjijmikyc4kqpbau2xfwnsva"
-  fingerprint = "1e:84:e8:12:08:55:af:2e:51:5e:2a:57:41:ab:fd:c9"
-  private_key_path = "/Users/shxi/.oci/oci_api_key.pem"
+  user_ocid = "ocid1.user.oc1..aaaaaaaark6yo7jgevogxohlgerphpr6lreunmmsovjdkhmujnuj2urix5aq"
+  fingerprint = "16:9a:cf:f4:78:3f:ba:fd:67:fc:74:30:72:e8:e7:11"
+  private_key_path = "/Users/zhenyao/.oci/oci_api_key.pem"
 }
+
 module "identity" {
   source = "./identity"
   compartment_id = var.compartment_ocid
@@ -19,29 +20,21 @@ module "identity" {
 module "log_group" {
   source = "./log_group"
   compartment_id = var.compartment_ocid
-  tag2_name = module.identity.tag2_name
-  tag_namespace1_name = module.identity.tag_namespace1_name
 }
 
 module "log" {
   source = "./log"
   test_log_group_id = module.log_group.test_log_group_id
-  tag2_name = module.identity.tag2_name
-  tag_namespace1_name = module.identity.tag_namespace1_name
 }
 
 module "log_saved_search" {
   source = "./log_saved_search"
   compartment_id = var.compartment_ocid
-  tag1_name = module.identity.tag1_name
-  tag_namespace1_name = module.identity.tag_namespace1_name
 }
 
 module "log_agent_configuration" {
   source = "./log_agent_configuration"
   compartment_id = var.compartment_ocid
-  tag1_name = module.identity.tag1_name
-  tag_namespace1_name = module.identity.tag_namespace1_name
   test_log_id = module.log.test_log_id
   test_log_group_id = module.log_group.test_log_group_id
-}
+}

examples/logging/provider.tf

@@ -7,18 +7,23 @@
 
 // These variables would commonly be defined as environment variables or sourced in a .env file
 variable "tenancy_ocid" {
+  default = "ocid1.tenancy.oc1..aaaaaaaa4s2hncj4oaulmf5tz4yfeska6fya4gkd5jsg3fmlgq7pprgr7wiq"
 }
 
 variable "user_ocid" {
+  default = "ocid1.user.oc1..aaaaaaaark6yo7jgevogxohlgerphpr6lreunmmsovjdkhmujnuj2urix5aq"
 }
 
 variable "fingerprint" {
+  default = "16:9a:cf:f4:78:3f:ba:fd:67:fc:74:30:72:e8:e7:11"
 }
 
 variable "private_key_path" {
+  default = "/Users/zhenyao/.oci/oci_api_key.pem"
 }
 
 variable "compartment_ocid" {
+  default = "ocid1.compartment.oc1..aaaaaaaajdgiuoxrwem3326sihqitq3rf62hg4bq255hzchqwszx2xz4zega"
 }
 
 variable "region" {