Skip to content

Commit 48b2be7

Browse files
ericyzericyz
committed
fix: make promethus configurable
1 parent 3ccb19a commit 48b2be7

File tree

8 files changed

+40
-104
lines changed

8 files changed

+40
-104
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,13 @@ resource "google_container_cluster" "primary" {
112112
{% else %}
113113
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
114114
{% endif %}
115-
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-
}
127-
}
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
128119
}
129120
}
121+
130122
cluster_autoscaling {
131123
enabled = var.cluster_autoscaling.enabled
132124
dynamic "auto_provisioning_defaults" {

‎cluster.tf

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,13 @@ resource "google_container_cluster" "primary" {
8181
}
8282
}
8383
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
84-
dynamic "monitoring_config" {
85-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
86-
87-
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-
}
96-
}
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
9788
}
9889
}
90+
9991
cluster_autoscaling {
10092
enabled = var.cluster_autoscaling.enabled
10193
dynamic "auto_provisioning_defaults" {

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,13 @@ 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-
dynamic "monitoring_config" {
97-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
98-
99-
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-
}
108-
}
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
109100
}
110101
}
102+
111103
cluster_autoscaling {
112104
enabled = var.cluster_autoscaling.enabled
113105
dynamic "auto_provisioning_defaults" {

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,13 @@ 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-
dynamic "monitoring_config" {
97-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
98-
99-
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-
}
108-
}
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
109100
}
110101
}
102+
111103
cluster_autoscaling {
112104
enabled = var.cluster_autoscaling.enabled
113105
dynamic "auto_provisioning_defaults" {

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,13 @@ 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-
dynamic "monitoring_config" {
97-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
98-
99-
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-
}
108-
}
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
109100
}
110101
}
102+
111103
cluster_autoscaling {
112104
enabled = var.cluster_autoscaling.enabled
113105
dynamic "auto_provisioning_defaults" {

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,13 @@ 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-
dynamic "monitoring_config" {
97-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
98-
99-
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-
}
108-
}
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
109100
}
110101
}
102+
111103
cluster_autoscaling {
112104
enabled = var.cluster_autoscaling.enabled
113105
dynamic "auto_provisioning_defaults" {

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,13 @@ resource "google_container_cluster" "primary" {
8181
}
8282
}
8383
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
84-
dynamic "monitoring_config" {
85-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
86-
87-
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-
}
96-
}
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
9788
}
9889
}
90+
9991
cluster_autoscaling {
10092
enabled = var.cluster_autoscaling.enabled
10193
dynamic "auto_provisioning_defaults" {

‎modules/private-cluster/cluster.tf

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,21 +81,13 @@ resource "google_container_cluster" "primary" {
8181
}
8282
}
8383
monitoring_service = local.logmon_config_is_set ? null : var.monitoring_service
84-
dynamic "monitoring_config" {
85-
for_each = length(var.monitoring_enabled_components) > 0 || var.monitoring_enable_managed_prometheus ? [1] : []
86-
87-
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-
}
96-
}
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
9788
}
9889
}
90+
9991
cluster_autoscaling {
10092
enabled = var.cluster_autoscaling.enabled
10193
dynamic "auto_provisioning_defaults" {

0 commit comments

Comments
 (0)