Skip to content

Commit 2eeac3d

Browse files
add additional metric GKE components options (#8850) (#6198)
* feat: add additional metric components options * feat: remove validation Signed-off-by: Modular Magician <[email protected]>
1 parent fcfae3f commit 2eeac3d

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.changelog/8850.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
container: added additional options in `monitoring_config.enable_components`
3+
```

google-beta/services/container/resource_container_cluster.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,10 +1135,9 @@ func ResourceContainerCluster() *schema.Resource {
11351135
Type: schema.TypeList,
11361136
Optional: true,
11371137
Computed: true,
1138-
Description: `GKE components exposing metrics. Valid values include SYSTEM_COMPONENTS, APISERVER, CONTROLLER_MANAGER, SCHEDULER, and WORKLOADS.`,
1138+
Description: `GKE components exposing metrics. Valid values include SYSTEM_COMPONENTS, APISERVER, SCHEDULER, CONTROLLER_MANAGER, STORAGE, HPA, POD, DAEMONSET, DEPLOYMENT, STATEFULSET and WORKLOADS.`,
11391139
Elem: &schema.Schema{
1140-
Type: schema.TypeString,
1141-
ValidateFunc: validation.StringInSlice([]string{"SYSTEM_COMPONENTS", "APISERVER", "CONTROLLER_MANAGER", "SCHEDULER", "WORKLOADS"}, false),
1140+
Type: schema.TypeString,
11421141
},
11431142
},
11441143
"managed_prometheus": {

website/docs/r/container_cluster.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ This block also contains several computed attributes, documented below.
594594

595595
<a name="nested_monitoring_config"></a>The `monitoring_config` block supports:
596596

597-
* `enable_components` - (Optional) The GKE components exposing metrics. Supported values include: `SYSTEM_COMPONENTS`, `APISERVER`, `CONTROLLER_MANAGER`, and `SCHEDULER`. In beta provider, `WORKLOADS` is supported on top of those 4 values. (`WORKLOADS` is deprecated and removed in GKE 1.24.)
597+
* `enable_components` - (Optional) The GKE components exposing metrics. Supported values include: `SYSTEM_COMPONENTS`, `APISERVER`, `SCHEDULER`, `CONTROLLER_MANAGER`, `STORAGE`, `HPA`, `POD`, `DAEMONSET`, `DEPLOYMENT` and `STATEFULSET`. In beta provider, `WORKLOADS` is supported on top of those 10 values. (`WORKLOADS` is deprecated and removed in GKE 1.24.)
598598

599599
* `managed_prometheus` - (Optional) Configuration for Managed Service for Prometheus. Structure is [documented below](#nested_managed_prometheus).
600600

0 commit comments

Comments
 (0)