Skip to content

Commit ae26016

Browse files
ericyzericyz
authored
feat!: make promethus configurable (#1715)
1 parent 3a9b056 commit ae26016

File tree

22 files changed

+63
-93
lines changed

22 files changed

+63
-93
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,15 @@ resource "google_container_cluster" "primary" {
113113
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
114114
{% endif %}
115115
dynamic "monitoring_config" {
116-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
117-
118-
content {
119-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
120-
121-
dynamic "managed_prometheus" {
122-
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
123-
124-
content {
125-
enabled = var.monitoring_enable_managed_prometheus
126-
}
116+
{% if beta_cluster %}
117+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
118+
{% else %}
119+
for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [1] : []
120+
{% endif %}
121+
content{
122+
enable_components = var.monitoring_enabled_components
123+
managed_prometheus {
124+
enabled = var.monitoring_enable_managed_prometheus
127125
}
128126
}
129127
}

‎cluster.tf

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,11 @@ resource "google_container_cluster" "primary" {
8282
}
8383
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
8484
dynamic "monitoring_config" {
85-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
86-
85+
for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [1] : []
8786
content {
88-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
89-
90-
dynamic "managed_prometheus" {
91-
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
92-
93-
content {
94-
enabled = var.monitoring_enable_managed_prometheus
95-
}
87+
enable_components = var.monitoring_enabled_components
88+
managed_prometheus {
89+
enabled = var.monitoring_enable_managed_prometheus
9690
}
9791
}
9892
}

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,11 @@ resource "google_container_cluster" "primary" {
9494
}
9595
monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
9696
dynamic "monitoring_config" {
97-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
98-
97+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
9998
content {
100-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
101-
102-
dynamic "managed_prometheus" {
103-
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
104-
105-
content {
106-
enabled = var.monitoring_enable_managed_prometheus
107-
}
99+
enable_components = var.monitoring_enabled_components
100+
managed_prometheus {
101+
enabled = var.monitoring_enable_managed_prometheus
108102
}
109103
}
110104
}

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,11 @@ resource "google_container_cluster" "primary" {
9494
}
9595
monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
9696
dynamic "monitoring_config" {
97-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
98-
97+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
9998
content {
100-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
101-
102-
dynamic "managed_prometheus" {
103-
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
104-
105-
content {
106-
enabled = var.monitoring_enable_managed_prometheus
107-
}
99+
enable_components = var.monitoring_enabled_components
100+
managed_prometheus {
101+
enabled = var.monitoring_enable_managed_prometheus
108102
}
109103
}
110104
}

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,11 @@ resource "google_container_cluster" "primary" {
9494
}
9595
monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
9696
dynamic "monitoring_config" {
97-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
98-
97+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
9998
content {
100-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
101-
102-
dynamic "managed_prometheus" {
103-
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
104-
105-
content {
106-
enabled = var.monitoring_enable_managed_prometheus
107-
}
99+
enable_components = var.monitoring_enabled_components
100+
managed_prometheus {
101+
enabled = var.monitoring_enable_managed_prometheus
108102
}
109103
}
110104
}

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,11 @@ resource "google_container_cluster" "primary" {
9494
}
9595
monitoring_service = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? null : var.monitoring_service
9696
dynamic "monitoring_config" {
97-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
98-
97+
for_each = local.cluster_telemetry_type_is_set || local.logmon_config_is_set ? [1] : []
9998
content {
100-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
101-
102-
dynamic "managed_prometheus" {
103-
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
104-
105-
content {
106-
enabled = var.monitoring_enable_managed_prometheus
107-
}
99+
enable_components = var.monitoring_enabled_components
100+
managed_prometheus {
101+
enabled = var.monitoring_enable_managed_prometheus
108102
}
109103
}
110104
}

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,11 @@ resource "google_container_cluster" "primary" {
8282
}
8383
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
8484
dynamic "monitoring_config" {
85-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
86-
85+
for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [1] : []
8786
content {
88-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
89-
90-
dynamic "managed_prometheus" {
91-
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
92-
93-
content {
94-
enabled = var.monitoring_enable_managed_prometheus
95-
}
87+
enable_components = var.monitoring_enabled_components
88+
managed_prometheus {
89+
enabled = var.monitoring_enable_managed_prometheus
9690
}
9791
}
9892
}

‎modules/private-cluster/cluster.tf

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,11 @@ resource "google_container_cluster" "primary" {
8282
}
8383
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
8484
dynamic "monitoring_config" {
85-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
86-
85+
for_each = local.logmon_config_is_set || local.logmon_config_is_set ? [1] : []
8786
content {
88-
enable_components = length(var.monitoring_enabled_components) > 0 ? var.monitoring_enabled_components : []
89-
90-
dynamic "managed_prometheus" {
91-
for_each = var.monitoring_enable_managed_prometheus ? [1] : []
92-
93-
content {
94-
enabled = var.monitoring_enable_managed_prometheus
95-
}
87+
enable_components = var.monitoring_enabled_components
88+
managed_prometheus {
89+
enabled = var.monitoring_enable_managed_prometheus
9690
}
9791
}
9892
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@
107107
"SYSTEM_COMPONENTS"
108108
]
109109
},
110-
"managedPrometheusConfig": {
111-
"enabled": true
112-
}
110+
"managedPrometheusConfig": {}
113111
},
114112
"monitoringService": "monitoring.googleapis.com/kubernetes",
115113
"name": "CLUSTER_NAME",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
"enableComponents": [
9191
"SYSTEM_COMPONENTS"
9292
]
93-
}
93+
},
94+
"managedPrometheusConfig": {}
9495
},
9596
"monitoringService": "monitoring.googleapis.com/kubernetes",
9697
"name": "CLUSTER_NAME",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
"enableComponents": [
9191
"SYSTEM_COMPONENTS"
9292
]
93-
}
93+
},
94+
"managedPrometheusConfig": {}
9495
},
9596
"monitoringService": "monitoring.googleapis.com/kubernetes",
9697
"name": "CLUSTER_NAME",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@
9898
"enableComponents": [
9999
"SYSTEM_COMPONENTS"
100100
]
101-
}
101+
},
102+
"managedPrometheusConfig": {}
102103
},
103104
"monitoringService": "monitoring.googleapis.com/kubernetes",
104105
"name": "CLUSTER_NAME",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@
8989
"enableComponents": [
9090
"SYSTEM_COMPONENTS"
9191
]
92-
}
92+
},
93+
"managedPrometheusConfig": {}
9394
},
9495
"monitoringService": "monitoring.googleapis.com/kubernetes",
9596
"name": "CLUSTER_NAME",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@
136136
"enableComponents": [
137137
"SYSTEM_COMPONENTS"
138138
]
139+
},
140+
"managedPrometheusConfig": {
139141
}
140142
},
141143
"monitoringService": "monitoring.googleapis.com/kubernetes",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@
130130
"enableComponents": [
131131
"SYSTEM_COMPONENTS"
132132
]
133+
},
134+
"managedPrometheusConfig": {
133135
}
134136
},
135137
"monitoringService": "monitoring.googleapis.com/kubernetes",

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,7 @@
105105
"SYSTEM_COMPONENTS"
106106
]
107107
},
108-
"managedPrometheusConfig": {
109-
"enabled": true
110-
}
108+
"managedPrometheusConfig": {}
111109
},
112110
"monitoringService": "monitoring.googleapis.com/kubernetes",
113111
"name": "CLUSTER_NAME",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@
9292
"enableComponents": [
9393
"SYSTEM_COMPONENTS"
9494
]
95+
},
96+
"managedPrometheusConfig": {
9597
}
9698
},
9799
"monitoringService": "monitoring.googleapis.com/kubernetes",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
"enableComponents": [
9090
"SYSTEM_COMPONENTS"
9191
]
92+
},
93+
"managedPrometheusConfig": {
9294
}
9395
},
9496
"monitoringService": "monitoring.googleapis.com/kubernetes",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
"enableComponents": [
9090
"SYSTEM_COMPONENTS"
9191
]
92+
},
93+
"managedPrometheusConfig": {
9294
}
9395
},
9496
"monitoringService": "monitoring.googleapis.com/kubernetes",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@
9494
"enableComponents": [
9595
"SYSTEM_COMPONENTS"
9696
]
97+
},
98+
"managedPrometheusConfig": {
9799
}
98100
},
99101
"monitoringService": "monitoring.googleapis.com/kubernetes",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@
8484
"enableComponents": [
8585
"SYSTEM_COMPONENTS"
8686
]
87-
}
87+
},
88+
"managedPrometheusConfig": {}
8889
},
8990
"monitoringService": "monitoring.googleapis.com/kubernetes",
9091
"name": "CLUSTER_NAME",

‎test/integration/simple_zonal_private/testdata/TestSimpleZonalPrivate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@
8989
"enableComponents": [
9090
"SYSTEM_COMPONENTS"
9191
]
92-
}
92+
},
93+
"managedPrometheusConfig": {}
9394
},
9495
"monitoringService": "monitoring.googleapis.com/kubernetes",
9596
"name": "CLUSTER_NAME",

0 commit comments

Comments
 (0)