Add Terraform Support for GKE Auto-Monitoring

mmv1/third_party/terraform/services/container/resource_container_cluster.go.tmpl

@@ -1273,6 +1273,24 @@ func ResourceContainerCluster() *schema.Resource {
 										Required:    true,
 										Description: `Whether or not the managed collection is enabled.`,
 									},
+									{{- if ne $.TargetVersionName "ga" }}
+									"auto_monitoring_config": {
+										Type:        schema.TypeSet,
+										Optional:    true,
+										MaxItems:    1,
+										Description: `Configuration for GKE Workload Auto-Monitoring.`,
+										Elem: &schema.Resource{
+											Schema: map[string]*schema.Schema{
+												"scope": {
+													Type:         schema.TypeString,
+													Required:     true,
+													Description:  `The scope of auto-monitoring.`,
+													ValidateFunc: validation.StringInSlice([]string{"ALL", "NONE"}, false),
+												},
+											},
+										},
+									},
+									{{- end }}
 								},
 							},
 						},
@@ -5894,6 +5912,21 @@ func expandMonitoringConfig(configured interface{}) *container.MonitoringConfig
 		mc.ManagedPrometheusConfig = &container.ManagedPrometheusConfig{
 			Enabled: managed_prometheus["enabled"].(bool),
 		}
+		{{- if ne $.TargetVersionName "ga" }}
+		if autoMonitoring, ok := managed_prometheus["auto_monitoring_config"]; ok {
+		    if autoMonitoringSet, ok := autoMonitoring.(*schema.Set); ok {
+		        autoMonitoringList := autoMonitoringSet.List()
+		        if len(autoMonitoringList) > 0 {
+		            autoMonitoringConfig := autoMonitoringList[0].(map[string]interface{})
+		            if scope, ok := autoMonitoringConfig["scope"].(string); ok {
+		                mc.ManagedPrometheusConfig.AutoMonitoringConfig = &container.AutoMonitoringConfig{
+		                    Scope: scope,
+		                }
+		            }
+		        }
+		    }
+		}
+		{{- end }}
 	}
 
 	if v, ok := config["advanced_datapath_observability_config"]; ok && len(v.([]interface{})) > 0 {
@@ -6871,11 +6904,32 @@ func flattenAdvancedDatapathObservabilityConfig(c *container.AdvancedDatapathObs
 }
 
 func flattenManagedPrometheusConfig(c *container.ManagedPrometheusConfig) []map[string]interface{} {
-	return []map[string]interface{}{
-		{
-			"enabled": c != nil && c.Enabled,
-		},
+        if c == nil {
+                return nil
+        }
+
+        result := make(map[string]interface{})
+
+        result["enabled"] = c.Enabled
+
+	{{- if ne $.TargetVersionName "ga" }}
+	if c.AutoMonitoringConfig != nil {
+	    autoMonitoringMap := make(map[string]interface{})
+	    if c.AutoMonitoringConfig.Scope != "" {
+	        autoMonitoringMap["scope"] = c.AutoMonitoringConfig.Scope
+	    }
+
+	    // Constructing a schema.Set using NewSet 
+	    set := schema.NewSet(schema.HashString, []interface{}{})
+	    if c.AutoMonitoringConfig.Scope != "" {
+	        set.Add(c.AutoMonitoringConfig.Scope)
+	    }
+
+	    result["auto_monitoring_config"] = set
 	}
+	{{- end }}
+
+        return []map[string]interface{}{result}
 }
 
 func flattenNodePoolAutoConfig(c *container.NodePoolAutoConfig) []map[string]interface{} {

mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl

@@ -3966,6 +3966,32 @@ func TestAccContainerCluster_withMonitoringConfig(t *testing.T) {
 				ImportStateVerify: true,
 				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
 			},
+			{{- if ne $.TargetVersionName "ga" }}
+			{
+				Config: testAccContainerCluster_withMonitoringConfigScopeAll(clusterName, networkName, subnetworkName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("google_container_cluster.primary", "monitoring_config.0.managed_prometheus.0.auto_monitoring_config.0.scope", "ALL"),
+				),
+			},
+			{
+				ResourceName:      "google_container_cluster.primary",
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
+			},
+			{
+				Config: testAccContainerCluster_withMonitoringConfigScopeNone(clusterName, networkName, subnetworkName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("google_container_cluster.primary", "monitoring_config.0.managed_prometheus.0.auto_monitoring_config.0.scope", "NONE"),
+				),
+			},
+			{
+				ResourceName:      "google_container_cluster.primary",
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
+			},
+			{{- end }}
 			// Back to basic settings to test setting Prometheus on its own
 			{
 				Config: testAccContainerCluster_basic(clusterName, networkName, subnetworkName),
@@ -10786,6 +10812,50 @@ resource "google_container_cluster" "primary" {
 `, name, networkName, subnetworkName)
 }
 
+{{- if ne $.TargetVersionName "ga" }}								
+func testAccContainerCluster_withMonitoringConfigScopeAll(name, networkName, subnetworkName string) string {
+       return fmt.Sprintf(`
+resource "google_container_cluster" "primary" {
+  name               = "%s"
+  location           = "us-central1-a"
+  initial_node_count = 1
+  monitoring_config {
+    managed_prometheus {
+      enabled = true
+      auto_monitoring_config {
+        scope = "ALL"
+      }
+    }
+  }
+  deletion_protection = false
+  network             = "%s"
+  subnetwork          = "%s"
+}
+`, name, networkName, subnetworkName)
+}
+
+func testAccContainerCluster_withMonitoringConfigScopeNone(name, networkName, subnetworkName string) string {
+       return fmt.Sprintf(`
+resource "google_container_cluster" "primary" {
+  name               = "%s"
+  location           = "us-central1-a"
+  initial_node_count = 1
+  monitoring_config {
+    managed_prometheus {
+      enabled = true
+      auto_monitoring_config {
+        scope = "NONE"
+      }
+    }
+  }
+  deletion_protection = false
+  network             = "%s"
+  subnetwork          = "%s"
+}
+`, name, networkName, subnetworkName)
+}
+{{- end }}
+
 func testAccContainerCluster_withMonitoringConfigAdvancedDatapathObservabilityConfigEnabled(name string) string {
        return fmt.Sprintf(`
 resource "google_compute_network" "container_network" {

mmv1/third_party/terraform/website/docs/r/container_cluster.html.markdown

@@ -663,6 +663,7 @@ This block also contains several computed attributes, documented below.
 <a name="nested_managed_prometheus"></a>The `managed_prometheus` block supports:
 
 * `enabled` - (Required) Whether or not the managed collection is enabled.
+* `auto_monitoring_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)) Configuration for GKE Auto-Monitoring which includes a `Scope` field (string). Supported values include: `ALL` and `NONE`.
 
 <a name="nested_advanced_datapath_observability_config"></a>The `advanced_datapath_observability_config` block supports: