Support for Unified agent - Added to logging

Clean up

Author: srishtipmishra

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Support for publisher maps for service connector
 - Support to attach and detach instances to `oci_core_instance_pool` 
 - Support for GoldenGate service
+- Support for unified agent configuration added to `oci_logging` service
 
 ## 4.16.0 (March 03, 2021)
 

examples/logging/log_agent_configuration.tf

@@ -0,0 +1,222 @@
+// Copyright (c) 2017, 2021, 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" {
+  default = "value"
+}
+
+variable "unified_agent_configuration_description" {
+  default = "description2"
+}
+
+variable "unified_agent_configuration_display_name" {
+  default = "displayName2"
+}
+
+variable "unified_agent_configuration_freeform_tags" {
+  default = { "Department" = "Finance" }
+}
+
+variable "unified_agent_configuration_group_association_group_list" {
+  default = [""]
+}
+
+variable "unified_agent_configuration_is_compartment_id_in_subtree" {
+  default = false
+}
+
+variable "unified_agent_configuration_is_enabled" {
+  default = true
+}
+
+variable "unified_agent_configuration_service_configuration_configuration_type" {
+  default = "LOGGING"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_channels" {
+  default = ["Security"]
+}
+
+variable "unified_agent_configuration_service_configuration_sources_name" {
+  default = "name"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_delimiter" {
+  default = "delimiter"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_expression" {
+  default = "expression"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_field_time_key" {
+  default = "fieldTimeKey"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_format" {
+  default = []
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_format_firstline" {
+  default = "formatFirstline"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_grok_failure_key" {
+  default = "grokFailureKey"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_grok_name_key" {
+  default = "grokNameKey"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_is_estimate_current_event" {
+  default = false
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_is_keep_time_key" {
+  default = false
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_is_null_empty_string" {
+  default = false
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_is_support_colonless_ident" {
+  default = false
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_is_with_priority" {
+  default = false
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_keys" {
+  default = []
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_message_format" {
+  default = "RFC3164"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_message_key" {
+  default = "messageKey"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_multi_line_start_regexp" {
+  default = "multiLineStartRegexp"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_null_value_pattern" {
+  default = "nullValuePattern"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_parser_type" {
+  default = "AUDITD"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_patterns_field_time_format" {
+  default = "fieldTimeFormat"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_patterns_field_time_key" {
+  default = "fieldTimeKey"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_patterns_field_time_zone" {
+  default = "fieldTimeZone"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_patterns_name" {
+  default = "name"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_patterns_pattern" {
+  default = "pattern"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_rfc5424time_format" {
+  default = "rfc5424TimeFormat"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_syslog_parser_type" {
+  default = "STRING"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_time_format" {
+  default = "timeFormat"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_time_type" {
+  default = "FLOAT"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_timeout_in_milliseconds" {
+  default = 10
+}
+
+variable "unified_agent_configuration_service_configuration_sources_parser_types" {
+  default = "types"
+}
+
+variable "unified_agent_configuration_service_configuration_sources_paths" {
+  default = []
+}
+
+variable "unified_agent_configuration_service_configuration_sources_source_type" {
+  default = "WINDOWS_EVENT_LOG"
+}
+
+variable "unified_agent_configuration_state" {
+  default = "AVAILABLE"
+}
+
+resource "oci_logging_unified_agent_configuration" "test_unified_agent_configuration" {
+  #Required
+  compartment_id = var.compartment_id
+  is_enabled     = var.unified_agent_configuration_is_enabled
+  service_configuration {
+    #Required
+    configuration_type = var.unified_agent_configuration_service_configuration_configuration_type
+
+    #Optional
+    destination {
+      #Required
+      log_object_id = "${oci_logging_log.test_log.id}"
+    }
+    sources {
+      #Required
+      source_type = var.unified_agent_configuration_service_configuration_sources_source_type
+
+      #Optional
+      channels = var.unified_agent_configuration_service_configuration_sources_channels
+      name     = var.unified_agent_configuration_service_configuration_sources_name
+    }
+  }
+
+  #Optional
+  defined_tags = {
+    "${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.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
+  group_association {
+
+    #Optional
+    group_list = ["${oci_logging_log_group.test_log_group.id}"]
+  }
+}
+
+data "oci_logging_unified_agent_configurations" "test_unified_agent_configurations" {
+  #Required
+  compartment_id = var.compartment_id
+
+  #Optional
+  display_name                 = var.unified_agent_configuration_display_name
+  group_id                     = "${oci_logging_log_group.test_log_group.id}"
+  is_compartment_id_in_subtree = var.unified_agent_configuration_is_compartment_id_in_subtree
+  log_id                       = "${oci_logging_log.test_log.id}"
+  state                        = var.unified_agent_configuration_state
+}
+

oci/export_definitions.go

@@ -1528,6 +1528,15 @@ var exportLoadBalancerRuleSetHints = &TerraformResourceHints{
 	resourceAbbreviation: "rule_set",
 }
 
+var exportLoggingUnifiedAgentConfigurationHints = &TerraformResourceHints{
+	resourceClass:          "oci_logging_unified_agent_configuration",
+	datasourceClass:        "oci_logging_unified_agent_configurations",
+	datasourceItemsAttr:    "unified_agent_configuration_collection",
+	isDatasourceCollection: true,
+	resourceAbbreviation:   "unified_agent_configuration",
+	requireResourceRefresh: true,
+}
+
 var exportManagementAgentManagementAgentHints = &TerraformResourceHints{
 	resourceClass:        "oci_management_agent_management_agent",
 	datasourceClass:      "oci_management_agent_management_agents",

oci/export_graphs.go

@@ -674,6 +674,7 @@ var loadBalancerResourceGraph = TerraformResourceGraph{
 var loggingResourceGraph = TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportLoggingLogGroupHints},
+		{TerraformResourceHints: exportLoggingUnifiedAgentConfigurationHints},
 	},
 	"oci_logging_log_group": {
 		{

oci/helpers.go

@@ -158,6 +158,16 @@ func objectMapToStringMap(rm map[string]interface{}) map[string]string {
 	return result
 }
 
+func StringMapToObjectMap(sm map[string]string) map[string]interface{} {
+	var result = make(map[string]interface{})
+	if len(sm) > 0 {
+		for types, v := range sm {
+			result[types] = v
+		}
+	}
+	return result
+}
+
 func validateInt64TypeString(v interface{}, k string) (ws []string, errors []error) {
 	value := v.(string)
 

oci/logging_unified_agent_configuration_data_source.go

@@ -0,0 +1,121 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	oci_logging "github.com/oracle/oci-go-sdk/v36/logging"
+)
+
+func init() {
+	RegisterDatasource("oci_logging_unified_agent_configuration", LoggingUnifiedAgentConfigurationDataSource())
+}
+
+func LoggingUnifiedAgentConfigurationDataSource() *schema.Resource {
+	fieldMap := make(map[string]*schema.Schema)
+	fieldMap["unified_agent_configuration_id"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	return GetSingularDataSourceItemSchema(LoggingUnifiedAgentConfigurationResource(), fieldMap, readSingularLoggingUnifiedAgentConfiguration)
+}
+
+func readSingularLoggingUnifiedAgentConfiguration(d *schema.ResourceData, m interface{}) error {
+	sync := &LoggingUnifiedAgentConfigurationDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).loggingManagementClient()
+
+	return ReadResource(sync)
+}
+
+type LoggingUnifiedAgentConfigurationDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_logging.LoggingManagementClient
+	Res    *oci_logging.GetUnifiedAgentConfigurationResponse
+}
+
+func (s *LoggingUnifiedAgentConfigurationDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *LoggingUnifiedAgentConfigurationDataSourceCrud) Get() error {
+	request := oci_logging.GetUnifiedAgentConfigurationRequest{}
+
+	if unifiedAgentConfigurationId, ok := s.D.GetOkExists("unified_agent_configuration_id"); ok {
+		tmp := unifiedAgentConfigurationId.(string)
+		request.UnifiedAgentConfigurationId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "logging")
+
+	response, err := s.Client.GetUnifiedAgentConfiguration(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *LoggingUnifiedAgentConfigurationDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(*s.Res.Id)
+
+	if s.Res.CompartmentId != nil {
+		s.D.Set("compartment_id", *s.Res.CompartmentId)
+	}
+
+	s.D.Set("configuration_state", s.Res.ConfigurationState)
+
+	if s.Res.DefinedTags != nil {
+		s.D.Set("defined_tags", definedTagsToMap(s.Res.DefinedTags))
+	}
+
+	if s.Res.Description != nil {
+		s.D.Set("description", *s.Res.Description)
+	}
+
+	if s.Res.DisplayName != nil {
+		s.D.Set("display_name", *s.Res.DisplayName)
+	}
+
+	s.D.Set("freeform_tags", s.Res.FreeformTags)
+
+	if s.Res.GroupAssociation != nil {
+		s.D.Set("group_association", []interface{}{GroupAssociationDetailsToMap(s.Res.GroupAssociation)})
+	} else {
+		s.D.Set("group_association", nil)
+	}
+
+	if s.Res.IsEnabled != nil {
+		s.D.Set("is_enabled", *s.Res.IsEnabled)
+	}
+
+	if s.Res.ServiceConfiguration != nil {
+		serviceConfigurationArray := []interface{}{}
+		if serviceConfigurationMap := UnifiedAgentServiceConfigurationDetailsToMap(&s.Res.ServiceConfiguration); serviceConfigurationMap != nil {
+			serviceConfigurationArray = append(serviceConfigurationArray, serviceConfigurationMap)
+		}
+		s.D.Set("service_configuration", serviceConfigurationArray)
+	} else {
+		s.D.Set("service_configuration", nil)
+	}
+
+	s.D.Set("state", s.Res.LifecycleState)
+
+	if s.Res.TimeCreated != nil {
+		s.D.Set("time_created", s.Res.TimeCreated.String())
+	}
+
+	if s.Res.TimeLastModified != nil {
+		s.D.Set("time_last_modified", s.Res.TimeLastModified.String())
+	}
+
+	return nil
+}