Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set GKE Stackdriver defaults to GKE Stackdriver Monitoring #2471

Merged
merged 1 commit into from
Oct 16, 2019
Merged

Set GKE Stackdriver defaults to GKE Stackdriver Monitoring #2471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions third_party/terraform/resources/resource_container_cluster.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ func resourceContainerCluster() *schema.Resource {
"logging_service": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Default: "logging.googleapis.com/kubernetes",
ValidateFunc: validation.StringInSlice([]string{"logging.googleapis.com", "logging.googleapis.com/kubernetes", "none"}, false),
},

Expand Down Expand Up @@ -475,7 +475,7 @@ func resourceContainerCluster() *schema.Resource {
"monitoring_service": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Default: "monitoring.googleapis.com/kubernetes",
ValidateFunc: validation.StringInSlice([]string{"monitoring.googleapis.com", "monitoring.googleapis.com/kubernetes", "none"}, false),
},

Expand Down
4 changes: 2 additions & 2 deletions third_party/terraform/tests/resource_container_cluster_test.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1789,8 +1789,8 @@ resource "google_container_cluster" "primary" {
enable_kubernetes_alpha = true
enable_legacy_abac = true

logging_service = "logging.googleapis.com/kubernetes"
monitoring_service = "monitoring.googleapis.com/kubernetes"
logging_service = "logging.googleapis.com"
monitoring_service = "monitoring.googleapis.com"

resource_labels = {
created-by = "terraform"
Expand Down
8 changes: 4 additions & 4 deletions third_party/terraform/website/docs/r/container_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ set this to a value of at least `1`, alongside setting

* `logging_service` - (Optional) The logging service that the cluster should
write logs to. Available options include `logging.googleapis.com`,
`logging.googleapis.com/kubernetes`, and `none`. Defaults to `logging.googleapis.com`
`logging.googleapis.com/kubernetes`, and `none`. Defaults to `logging.googleapis.com/kubernetes`

* `maintenance_policy` - (Optional) The maintenance policy to use for the cluster. Structure is
documented below.
Expand Down Expand Up @@ -223,7 +223,7 @@ region are guaranteed to support the same version.
VM metrics will be collected by Google Compute Engine regardless of this setting
Available options include
`monitoring.googleapis.com`, `monitoring.googleapis.com/kubernetes`, and `none`.
Defaults to `monitoring.googleapis.com`
Defaults to `monitoring.googleapis.com/kubernetes`

* `network` - (Optional) The name or self_link of the Google Compute Engine
network to which the cluster is connected. For Shared VPC, set this to the self link of the
Expand Down Expand Up @@ -519,9 +519,9 @@ The `node_config` block supports:
Note this will grant read access to ALL GCS content unless you also
specify a custom role. See https://cloud.google.com/kubernetes-engine/docs/how-to/access-scopes
* `logging-write` (`https://www.googleapis.com/auth/logging.write`),
if `logging_service` points to Google
if `logging_service` is not `none`.
* `monitoring` (`https://www.googleapis.com/auth/monitoring`),
if `monitoring_service` points to Google
if `monitoring_service` is not `none`.

* `preemptible` - (Optional) A boolean that represents whether or not the underlying node VMs
are preemptible. See the [official documentation](https://cloud.google.com/container-engine/docs/preemptible-vm)
Expand Down