Merge branch 'main' into feat/golden_state

dynatrace-oss · Sep 6, 2024 · 07711fd · 07711fd
2 parents be40ae0 + a7a304b
commit 07711fd
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 13 deletions.
diff --git a/dynatrace/api/app/dynatrace/kubernetes/connector/connection/schema.json b/dynatrace/api/app/dynatrace/kubernetes/connector/connection/schema.json
@@ -16,7 +16,7 @@
 	"enums": {},
 	"maxObjects": 100,
 	"metadata": {
-		"appName": "Kubernetes Automation for Workflows"
+		"appName": "Kubernetes Automation (Preview)"
 	},
 	"multiObject": true,
 	"ordered": false,
@@ -135,5 +135,5 @@
 			]
 		}
 	},
-	"version": "0.1.8"
+	"version": "0.1.9"
 }
diff --git a/dynatrace/api/app/dynatrace/kubernetes/connector/connection/service.go b/dynatrace/api/app/dynatrace/kubernetes/connector/connection/service.go
@@ -23,7 +23,7 @@ import (
 	"github.com/dynatrace-oss/terraform-provider-dynatrace/dynatrace/settings/services/settings20"
 )
 
-const SchemaVersion = "0.1.8"
+const SchemaVersion = "0.1.9"
 const SchemaID = "app:dynatrace.kubernetes.connector:connection"
 
 func Service(credentials *settings.Credentials) settings.CRUDService[*connection.Settings] {

diff --git a/dynatrace/api/v1/config/customservices/settings/enums.go b/dynatrace/api/v1/config/customservices/settings/enums.go
@@ -26,6 +26,7 @@ func (me QueueEntryPointType) Ref() *QueueEntryPointType {
 
 // QueueEntryPointTypes offers the known enum values
 var QueueEntryPointTypes = struct {
+	AWSSQS          QueueEntryPointType
 	IBMMQ           QueueEntryPointType
 	Jms             QueueEntryPointType
 	Kafka           QueueEntryPointType
@@ -34,6 +35,7 @@ var QueueEntryPointTypes = struct {
 	AzureServiceBus QueueEntryPointType
 	Values          func() []string
 }{
+	"AWS_SQS",
 	"IBM_MQ",
 	"JMS",
 	"KAFKA",

diff --git a/dynatrace/api/v1/config/entityruleengine/condition/attribute.go b/dynatrace/api/v1/config/entityruleengine/condition/attribute.go
@@ -164,6 +164,8 @@ var Attributes = struct {
 	MobileApplicationPlatform                 Attribute
 	MobileApplicationTags                     Attribute
 	NameOfComputeNode                         Attribute
+	NetworkAvailabilityMonitorName            Attribute
+	NetworkAvailabilityMonitorTags            Attribute
 	OpenStackAccountName                      Attribute
 	OpenStackAccountProjectName               Attribute
 	OpenStackAvailabilityZoneName             Attribute
@@ -364,6 +366,8 @@ var Attributes = struct {
 	"MOBILE_APPLICATION_PLATFORM",
 	"MOBILE_APPLICATION_TAGS",
 	"NAME_OF_COMPUTE_NODE",
+	"NETWORK_AVAILABILITY_MONITOR_NAME",
+	"NETWORK_AVAILABILITY_MONITOR_TAGS",
 	"OPENSTACK_ACCOUNT_NAME",
 	"OPENSTACK_ACCOUNT_PROJECT_NAME",
 	"OPENSTACK_AVAILABILITY_ZONE_NAME",

diff --git a/dynatrace/api/v1/config/requestattributes/settings/enums.go b/dynatrace/api/v1/config/requestattributes/settings/enums.go
@@ -104,6 +104,7 @@ type Source string
 
 // Sources offers the known enum values
 var Sources = struct {
+	CICSPathName            Source
 	CICSSdk                 Source
 	CICSSystemId            Source
 	CICSTaskId              Source
@@ -135,6 +136,7 @@ var Sources = struct {
 	WebserviceMethod        Source
 	WebserviceName          Source
 }{
+	"CICS_PATH_NAME",
 	"CICS_SDK",
 	"CICS_SYSTEM_ID",
 	"CICS_TASK_ID",
@@ -472,6 +474,8 @@ var ServiceTechnologys = struct {
 	AWSLambda                            ServiceTechnology
 	AWSRds                               ServiceTechnology
 	AWSService                           ServiceTechnology
+	AWSSNSClient                         ServiceTechnology
+	AWSSQS                               ServiceTechnology
 	Axis                                 ServiceTechnology
 	AzureFunctions                       ServiceTechnology
 	AzureServiceBus                      ServiceTechnology
@@ -575,6 +579,8 @@ var ServiceTechnologys = struct {
 	Micronaut                            ServiceTechnology
 	MicrosoftSQLServer                   ServiceTechnology
 	Mongodb                              ServiceTechnology
+	MongodbClient                        ServiceTechnology
+	MongodbClientDotNet                  ServiceTechnology
 	MSSQLClient                          ServiceTechnology
 	MuleEsb                              ServiceTechnology
 	MySQL                                ServiceTechnology
@@ -626,6 +632,7 @@ var ServiceTechnologys = struct {
 	SAPMaxdb                             ServiceTechnology
 	SAPSybase                            ServiceTechnology
 	Scala                                ServiceTechnology
+	SecuritySoftware                     ServiceTechnology
 	Selinux                              ServiceTechnology
 	Sharepoint                           ServiceTechnology
 	Shell                                ServiceTechnology
@@ -686,6 +693,8 @@ var ServiceTechnologys = struct {
 	"AWS_LAMBDA",
 	"AWS_RDS",
 	"AWS_SERVICE",
+	"AWS_SNS_CLIENT",
+	"AWS_SQS",
 	"AXIS",
 	"AZURE_FUNCTIONS",
 	"AZURE_SERVICE_BUS",
@@ -789,6 +798,8 @@ var ServiceTechnologys = struct {
 	"MICRONAUT",
 	"MICROSOFT_SQL_SERVER",
 	"MONGODB",
+	"MONGODB_CLIENT",
+	"MONGODB_CLIENT_DOTNET",
 	"MSSQL_CLIENT",
 	"MULE_ESB",
 	"MYSQL",
@@ -840,6 +851,7 @@ var ServiceTechnologys = struct {
 	"SAP_MAXDB",
 	"SAP_SYBASE",
 	"SCALA",
+	"SECURITY_SOFTWARE",
 	"SELINUX",
 	"SHAREPOINT",
 	"SHELL",

diff --git a/dynatrace/api/v1/config/synthetic/monitors/http/settings/synthetic_monitor.go b/dynatrace/api/v1/config/synthetic/monitors/http/settings/synthetic_monitor.go
@@ -196,15 +196,24 @@ func (me *SyntheticMonitor) UnmarshalHCL(decoder hcl.Decoder) error {
 	if value, ok := decoder.GetOk("enabled"); ok {
 		me.Enabled = value.(bool)
 	}
-	if _, ok := decoder.GetOk("tags.#"); ok {
-		me.Tags = monitors.TagsWithSourceInfo{}
-		if err := me.Tags.UnmarshalHCL(hcl.NewDecoder(decoder, "tags", 0)); err != nil {
-			return err
-		}
-	}
 	if err := decoder.Decode("tags", &me.Tags); err != nil {
 		return err
 	}
+	if me.Tags != nil {
+		// bug in terraform forces us to filter out "empty" entries
+		var finalTags monitors.TagsWithSourceInfo
+		for _, tag := range me.Tags {
+			if tag == nil {
+				continue
+			}
+			if len(tag.Context) == 0 && len(tag.Key) == 0 && (tag.Source == nil || len(*tag.Source) == 0) && (tag.Value == nil || len(*tag.Value) == 0) {
+				continue
+			}
+			finalTags = append(finalTags, tag)
+		}
+		me.Tags = finalTags
+	}
+
 	if err := decoder.Decode("anomaly_detection", &me.AnomalyDetection); err != nil {
 		return err
 	}

diff --git a/dynatrace/export/dependencies.go b/dynatrace/export/dependencies.go
@@ -806,7 +806,7 @@ func (me *entityds) Replace(environment *Environment, s string, replacingIn Reso
 	s = m1.ReplaceAllStringFunc(s, func(id string) string {
 		dataSource := environment.Module(replacingIn).DataSource(id, DataSourceKindEntity)
 		if dataSource == nil {
-			return s
+			return id
 		}
 		found = true
 		if me.Coalesce {

diff --git a/dynatrace/export/environment.go b/dynatrace/export/environment.go
@@ -312,9 +312,14 @@ func (me *Environment) InitialDownload() error {
 
 			keys := me.ResArgs[sResourceType]
 			module := me.Module(ResourceType(sResourceType))
-			if err := module.Download(parallel, keys...); err != nil {
-				return err
-			}
+			// removed error check here
+			// when downloading non-parallel returning an error
+			// just because one of the modules is failing
+			// exits the export too early
+			//
+			// the multithreaded export also just flags failed
+			// modules as erronneous but doesn't exit
+			module.Download(parallel, keys...)
 		}
 	}