Skip to content

Commit 6aec917

Browse files
ericyzericyz
committed
fix: the monitoring config
1 parent 48b2be7 commit 6aec917

File tree

22 files changed

+187
-42
lines changed

22 files changed

+187
-42
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,45 @@ resource "google_container_cluster" "primary" {
109109
}
110110
{% if beta_cluster %}
111111
monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
112+
dynamic "monitoring_config" {
113+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
114+
content{
115+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
116+
dynamic "managed_prometheus" {
117+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
118+
content {
119+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
120+
dynamic "managed_prometheus" {
121+
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
122+
content {
123+
enabled = var.monitoring_enable_managed_prometheus
124+
}
125+
}
126+
}
127+
}
128+
}
129+
}
112130
{% else %}
113131
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
114-
{% endif %}
115-
monitoring_config {
116-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
117-
managed_prometheus {
118-
enabled = var.monitoring_enable_managed_prometheus
132+
dynamic "monitoring_config" {
133+
for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [1] : []
134+
content{
135+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
136+
dynamic "managed_prometheus" {
137+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
138+
content {
139+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
140+
dynamic "managed_prometheus" {
141+
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
142+
content {
143+
enabled = var.monitoring_enable_managed_prometheus
144+
}
145+
}
146+
}
147+
}
119148
}
120149
}
121-
150+
{% endif %}
122151
cluster_autoscaling {
123152
enabled = var.cluster_autoscaling.enabled
124153
dynamic "auto_provisioning_defaults" {

‎cluster.tf

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,24 @@ resource "google_container_cluster" "primary" {
8181
}
8282
}
8383
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
84-
monitoring_config {
85-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
86-
managed_prometheus {
87-
enabled = var.monitoring_enable_managed_prometheus
84+
dynamic "monitoring_config" {
85+
for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [1] : []
86+
content {
87+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
88+
dynamic "managed_prometheus" {
89+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
90+
content {
91+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
92+
dynamic "managed_prometheus" {
93+
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
94+
content {
95+
enabled = var.monitoring_enable_managed_prometheus
96+
}
97+
}
98+
}
99+
}
88100
}
89101
}
90-
91102
cluster_autoscaling {
92103
enabled = var.cluster_autoscaling.enabled
93104
dynamic "auto_provisioning_defaults" {

‎modules/beta-private-cluster-update-variant/cluster.tf

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,24 @@ resource "google_container_cluster" "primary" {
9393
}
9494
}
9595
monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
96-
monitoring_config {
97-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
98-
managed_prometheus {
99-
enabled = var.monitoring_enable_managed_prometheus
96+
dynamic "monitoring_config" {
97+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
98+
content {
99+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
100+
dynamic "managed_prometheus" {
101+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
102+
content {
103+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
104+
dynamic "managed_prometheus" {
105+
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
106+
content {
107+
enabled = var.monitoring_enable_managed_prometheus
108+
}
109+
}
110+
}
111+
}
100112
}
101113
}
102-
103114
cluster_autoscaling {
104115
enabled = var.cluster_autoscaling.enabled
105116
dynamic "auto_provisioning_defaults" {

‎modules/beta-private-cluster/cluster.tf

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,24 @@ resource "google_container_cluster" "primary" {
9393
}
9494
}
9595
monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
96-
monitoring_config {
97-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
98-
managed_prometheus {
99-
enabled = var.monitoring_enable_managed_prometheus
96+
dynamic "monitoring_config" {
97+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
98+
content {
99+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
100+
dynamic "managed_prometheus" {
101+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
102+
content {
103+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
104+
dynamic "managed_prometheus" {
105+
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
106+
content {
107+
enabled = var.monitoring_enable_managed_prometheus
108+
}
109+
}
110+
}
111+
}
100112
}
101113
}
102-
103114
cluster_autoscaling {
104115
enabled = var.cluster_autoscaling.enabled
105116
dynamic "auto_provisioning_defaults" {

‎modules/beta-public-cluster-update-variant/cluster.tf

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,24 @@ resource "google_container_cluster" "primary" {
9393
}
9494
}
9595
monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
96-
monitoring_config {
97-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
98-
managed_prometheus {
99-
enabled = var.monitoring_enable_managed_prometheus
96+
dynamic "monitoring_config" {
97+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
98+
content {
99+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
100+
dynamic "managed_prometheus" {
101+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
102+
content {
103+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
104+
dynamic "managed_prometheus" {
105+
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
106+
content {
107+
enabled = var.monitoring_enable_managed_prometheus
108+
}
109+
}
110+
}
111+
}
100112
}
101113
}
102-
103114
cluster_autoscaling {
104115
enabled = var.cluster_autoscaling.enabled
105116
dynamic "auto_provisioning_defaults" {

‎modules/beta-public-cluster/cluster.tf

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,24 @@ resource "google_container_cluster" "primary" {
9393
}
9494
}
9595
monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
96-
monitoring_config {
97-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
98-
managed_prometheus {
99-
enabled = var.monitoring_enable_managed_prometheus
96+
dynamic "monitoring_config" {
97+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
98+
content {
99+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
100+
dynamic "managed_prometheus" {
101+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
102+
content {
103+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
104+
dynamic "managed_prometheus" {
105+
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
106+
content {
107+
enabled = var.monitoring_enable_managed_prometheus
108+
}
109+
}
110+
}
111+
}
100112
}
101113
}
102-
103114
cluster_autoscaling {
104115
enabled = var.cluster_autoscaling.enabled
105116
dynamic "auto_provisioning_defaults" {

‎modules/private-cluster-update-variant/cluster.tf

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,24 @@ resource "google_container_cluster" "primary" {
8181
}
8282
}
8383
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
84-
monitoring_config {
85-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
86-
managed_prometheus {
87-
enabled = var.monitoring_enable_managed_prometheus
84+
dynamic "monitoring_config" {
85+
for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [1] : []
86+
content {
87+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
88+
dynamic "managed_prometheus" {
89+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
90+
content {
91+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
92+
dynamic "managed_prometheus" {
93+
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
94+
content {
95+
enabled = var.monitoring_enable_managed_prometheus
96+
}
97+
}
98+
}
99+
}
88100
}
89101
}
90-
91102
cluster_autoscaling {
92103
enabled = var.cluster_autoscaling.enabled
93104
dynamic "auto_provisioning_defaults" {

‎modules/private-cluster/cluster.tf

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,24 @@ resource "google_container_cluster" "primary" {
8181
}
8282
}
8383
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
84-
monitoring_config {
85-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
86-
managed_prometheus {
87-
enabled = var.monitoring_enable_managed_prometheus
84+
dynamic "monitoring_config" {
85+
for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [1] : []
86+
content {
87+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
88+
dynamic "managed_prometheus" {
89+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
90+
content {
91+
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
92+
dynamic "managed_prometheus" {
93+
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
94+
content {
95+
enabled = var.monitoring_enable_managed_prometheus
96+
}
97+
}
98+
}
99+
}
88100
}
89101
}
90-
91102
cluster_autoscaling {
92103
enabled = var.cluster_autoscaling.enabled
93104
dynamic "auto_provisioning_defaults" {

‎test/integration/beta_cluster/testdata/TestBetaCluster.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
]
109109
},
110110
"managedPrometheusConfig": {
111-
"enabled": true
111+
"enabled": false
112112
}
113113
},
114114
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/disable_client_cert/testdata/TestDisableClientCert.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@
8989
"enableComponents": [
9090
"SYSTEM_COMPONENTS"
9191
]
92+
},
93+
"managedPrometheusConfig": {
94+
"enabled": false
9295
}
9396
},
9497
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@
8989
"enableComponents": [
9090
"SYSTEM_COMPONENTS"
9191
]
92+
},
93+
"managedPrometheusConfig": {
94+
"enabled": false
9295
}
9396
},
9497
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/safer_cluster/testdata/TestSaferCluster.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@
9595
"enableComponents": [
9696
"SYSTEM_COMPONENTS"
9797
]
98+
},
99+
"managedPrometheusConfig": {
100+
"enabled": false
98101
}
99102
},
100103
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/sandbox_enabled/testdata/TestSandboxEnabled.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@
8989
"enableComponents": [
9090
"SYSTEM_COMPONENTS"
9191
]
92+
},
93+
"managedPrometheusConfig": {
94+
"enabled": false
9295
}
9396
},
9497
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/simple_autopilot_private/testdata/TestSimpleAutopilotPrivate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@
136136
"enableComponents": [
137137
"SYSTEM_COMPONENTS"
138138
]
139+
},
140+
"managedPrometheusConfig": {
141+
"enabled": false
139142
}
140143
},
141144
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/simple_autopilot_public/testdata/TestSimpleAutopilotPublic.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@
130130
"enableComponents": [
131131
"SYSTEM_COMPONENTS"
132132
]
133+
},
134+
"managedPrometheusConfig": {
135+
"enabled": false
133136
}
134137
},
135138
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/simple_regional/testdata/TestSimpleRegional.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@
9595
"enableComponents": [
9696
"SYSTEM_COMPONENTS"
9797
]
98+
},
99+
"managedPrometheusConfig": {
100+
"enabled": false
98101
}
99102
},
100103
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/simple_regional_private/testdata/TestSimpleRegionalPrivate.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
"enableComponents": [
9393
"SYSTEM_COMPONENTS"
9494
]
95+
},
96+
"managedPrometheusConfig": {
97+
"enabled": false
9598
}
9699
},
97100
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/simple_regional_with_kubeconfig/testdata/TestSimpleRegionalWithKubeConfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@
8989
"enableComponents": [
9090
"SYSTEM_COMPONENTS"
9191
]
92+
},
93+
"managedPrometheusConfig": {
94+
"enabled": false
9295
}
9396
},
9497
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/simple_regional_with_networking/testdata/TestSimpleRegionalWithNetworking.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,9 @@
8989
"enableComponents": [
9090
"SYSTEM_COMPONENTS"
9191
]
92+
},
93+
"managedPrometheusConfig": {
94+
"enabled": false
9295
}
9396
},
9497
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/simple_windows_node_pool/testdata/TestSimpleWindowsNodePool.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@
9494
"enableComponents": [
9595
"SYSTEM_COMPONENTS"
9696
]
97+
},
98+
"managedPrometheusConfig": {
99+
"enabled": false
97100
}
98101
},
99102
"monitoringService": "monitoring.googleapis.com/kubernetes",

‎test/integration/simple_zonal/testdata/TestSimpleZonal.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@
8484
"enableComponents": [
8585
"SYSTEM_COMPONENTS"
8686
]
87+
},
88+
"managedPrometheusConfig": {
89+
"enabled": false
8790
}
8891
},
8992
"monitoringService": "monitoring.googleapis.com/kubernetes",

0 commit comments

Comments
 (0)