Enable AutoMonitor only in AppSignals supported regions (#246)

Author: sky333999

.github/workflows/amazon-cloudwatch-observability-integration-test.yaml

@@ -40,7 +40,14 @@ jobs:
     strategy:
       matrix:
         # TODO: add webhooks-disabled
-        scenario: [default, appsignals-disabled, appsignals-disabled-multi-agents, appsignals-enabled-multi-agents, webhooks-partially-enabled, webhooks-configured]
+        scenario:
+          - default
+          - appsignals-disabled
+          - appsignals-disabled-multi-agents
+          - appsignals-enabled-multi-agents
+          - appsignals-unsupported
+          - webhooks-partially-enabled
+          - webhooks-configured
     steps:
       - uses: actions/checkout@v3
 

charts/amazon-cloudwatch-observability/templates/_helpers.tpl

@@ -19,6 +19,18 @@ tolerations:
 {{- end }}
 {{- end }}
 
+{{/*
+Helper function to determine monitorAllServices based on region
+*/}}
+{{- define "manager.monitorAllServices" -}}
+{{- $region := .Values.region | required ".Values.region is required." -}}
+{{- if regexMatch "ap-east-2|ap-southeast-6|cn-.*|.*-iso[a-z]*-.*" $region -}}
+false
+{{- else -}}
+true
+{{- end -}}
+{{- end -}}
+
 {{/*
 Helper function to modify auto-monitor config based on agent configurations
 */}}
@@ -37,6 +49,8 @@ Helper function to modify auto-monitor config based on agent configurations
 {{- end -}}
 {{- if not $hasAppSignals -}}
 {{- $_ := set $autoMonitorConfig "monitorAllServices" false -}}
+{{- else if not (hasKey $autoMonitorConfig "monitorAllServices") -}}
+{{- $_ := set $autoMonitorConfig "monitorAllServices" (include "manager.monitorAllServices" . | trim | eq "true") -}}
 {{- end -}}
 {{- $autoMonitorConfig | toJson -}}
 {{- end -}}

charts/amazon-cloudwatch-observability/values.yaml

@@ -1063,7 +1063,7 @@ manager:
       tag: v0.7.0
   applicationSignals:
     autoMonitor:
-      monitorAllServices: true
+      # monitorAllServices: true; Defaults to true for regions where AppSignals is supported, false otherwise
       languages:
         - java
         - python

integration-tests/amazon-cloudwatch-observability/terraform/minikube/scenarios/appsignals-unsupported/main.tf

@@ -0,0 +1,26 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+module "base" {
+  source           = "../.."
+  helm_values_file = "${path.module}/values.yaml"
+  helm_dir         = var.helm_dir
+}
+
+resource "null_resource" "validator" {
+  depends_on = [module.base.helm_release]
+
+  provisioner "local-exec" {
+    command = "go test ${var.test_dir} -v -run=TestAppSignalsUnsupported"
+  }
+}
+
+variable "test_dir" {
+  type    = string
+  default = "../../../../validations/minikube/scenarios"
+}
+
+variable "helm_dir" {
+  type    = string
+  default = "../../../../../../charts/amazon-cloudwatch-observability"
+}

integration-tests/amazon-cloudwatch-observability/terraform/minikube/scenarios/appsignals-unsupported/values.yaml

@@ -0,0 +1,2 @@
+region: ap-east-2
+clusterName: minikube

integration-tests/amazon-cloudwatch-observability/validations/minikube/scenarios/appsignals_unsupported_test.go

@@ -0,0 +1,32 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package scenarios
+
+import (
+	"testing"
+
+	"github.com/aws-observability/helm-charts/integration-tests/amazon-cloudwatch-observability/util"
+	"github.com/aws-observability/helm-charts/integration-tests/amazon-cloudwatch-observability/validations/minikube"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestAppSignalsUnsupported(t *testing.T) {
+	k8sClient, err := util.NewK8sClient()
+	assert.NoError(t, err)
+
+	// Validate operator deployment exists
+	exists, err := k8sClient.ValidateDeploymentExists(minikube.Namespace, "amazon-cloudwatch-observability-controller-manager")
+	assert.NoError(t, err)
+	assert.True(t, exists)
+
+	// Validate auto-monitor-config has monitorAllServices: false
+	// for ap-east-2 (unsupported region) even with AppSignals enabled
+	expectedConfig := map[string]interface{}{
+		"monitorAllServices": false,
+		"languages":          []interface{}{"java", "python", "dotnet", "nodejs"},
+	}
+	minikube.ValidateOperatorAutoMonitorConfig(t, expectedConfig)
+
+	t.Log("AppSignals unsupported region validation passed")
+}

integration-tests/amazon-cloudwatch-observability/validations/minikube/scenarios/default_test.go

@@ -26,7 +26,7 @@ func TestDefault(t *testing.T) {
 	assert.True(t, exists)
 
 	// Validate auto-monitor-config uses default values
-	// Default config has AppSignals enabled, so monitorAllServices should be true
+	// Default config has AppSignals enabled and us-west-2 is a supported region, so monitorAllServices should be true
 	expectedConfig := map[string]interface{}{
 		"monitorAllServices": true,
 		"languages":          []interface{}{"java", "python", "dotnet", "nodejs"},