From b90d59438501c8dfa199617e45dda512ad45a7a3 Mon Sep 17 00:00:00 2001 From: upodroid Date: Tue, 5 Jan 2021 22:51:19 +0000 Subject: [PATCH 1/2] mark field as updatable Co-authored-by: upodroid --- products/pubsub/api.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/products/pubsub/api.yaml b/products/pubsub/api.yaml index ed1b608b1090..dd866d8a3a5e 100644 --- a/products/pubsub/api.yaml +++ b/products/pubsub/api.yaml @@ -57,7 +57,6 @@ objects: (`service-{{PROJECT_NUMBER}}@gcp-sa-pubsub.iam.gserviceaccount.com`) must have `roles/cloudkms.cryptoKeyEncrypterDecrypter` to use this feature. The expected format is `projects/*/locations/*/keyRings/*/cryptoKeys/*` - input: true - !ruby/object:Api::Type::KeyValuePairs name: 'labels' description: | From 724fb0377efffd7d48b60d956c18b7a2c31a775c Mon Sep 17 00:00:00 2001 From: upodroid Date: Mon, 1 Mar 2021 17:52:22 +0000 Subject: [PATCH 2/2] fix log sinks Co-authored-by: upodroid --- ...ng_billing_account_exclusion.html.markdown | 11 +++++----- ...logging_billing_account_sink.html.markdown | 16 ++++++++++++--- .../r/logging_folder_exclusion.html.markdown | 11 +++++----- .../docs/r/logging_folder_sink.html.markdown | 19 +++++++++++++----- ...gging_organization_exclusion.html.markdown | 11 +++++----- .../r/logging_organization_sink.html.markdown | 20 +++++++++++++------ .../r/logging_project_exclusion.html.markdown | 11 +++++----- .../docs/r/logging_project_sink.html.markdown | 12 ++++++----- 8 files changed, 72 insertions(+), 39 deletions(-) diff --git a/mmv1/third_party/terraform/website/docs/r/logging_billing_account_exclusion.html.markdown b/mmv1/third_party/terraform/website/docs/r/logging_billing_account_exclusion.html.markdown index e1ae396442d2..f9698ed60a3e 100644 --- a/mmv1/third_party/terraform/website/docs/r/logging_billing_account_exclusion.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/logging_billing_account_exclusion.html.markdown @@ -9,12 +9,13 @@ description: |- # google\_logging\_billing\_account\_exclusion -Manages a billing account logging exclusion. For more information see -[the official documentation](https://cloud.google.com/logging/docs/) and -[Excluding Logs](https://cloud.google.com/logging/docs/exclusions). +Manages a billing account logging exclusion. For more information see: -Note that you must have the "Logs Configuration Writer" IAM role (`roles/logging.configWriter`) -granted to the credentials used with Terraform. +* [API documentation](https://cloud.google.com/logging/docs/reference/v2/rest/v2/billingAccounts.exclusions) +* How-to Guides + * [Excluding Logs](https://cloud.google.com/logging/docs/exclusions) + +~> You can specify exclusions for log sinks created by terraform by using the exclusions field of `google_logging_billing_account_sink` ## Example Usage diff --git a/mmv1/third_party/terraform/website/docs/r/logging_billing_account_sink.html.markdown b/mmv1/third_party/terraform/website/docs/r/logging_billing_account_sink.html.markdown index 1049ec46fa75..74d16d0d201c 100644 --- a/mmv1/third_party/terraform/website/docs/r/logging_billing_account_sink.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/logging_billing_account_sink.html.markdown @@ -9,9 +9,9 @@ description: |- # google\_logging\_billing\_account\_sink -Manages a billing account logging sink. For more information see -[the official documentation](https://cloud.google.com/logging/docs/) and -[Exporting Logs in the API](https://cloud.google.com/logging/docs/api/tasks/exporting-logs). +* [API documentation](https://cloud.google.com/logging/docs/reference/v2/rest/v2/billingAccounts.sinks) +* How-to Guides + * [Exporting Logs](https://cloud.google.com/logging/docs/export) ~> **Note** You must have the "Logs Configuration Writer" IAM role (`roles/logging.configWriter`) [granted on the billing account](https://cloud.google.com/billing/reference/rest/v1/billingAccounts/getIamPolicy) to @@ -71,6 +71,8 @@ The following arguments are supported: * `bigquery_options` - (Optional) Options that affect sinks exporting data to BigQuery. Structure documented below. +* `exclusions` - (Optional) Log entries that match any of the exclusion filters will not be exported. If a log entry is matched by both filter and one of exclusion_filters it will not be exported. Can be repeated multiple times for multiple exclusions. Structure is documented below. + The `bigquery_options` block supports: * `use_partitioned_tables` - (Required) Whether to use [BigQuery's partition tables](https://cloud.google.com/bigquery/docs/partitioned-tables). @@ -78,6 +80,14 @@ The `bigquery_options` block supports: tables the date suffix is no longer present and [special query syntax](https://cloud.google.com/bigquery/docs/querying-partitioned-tables) has to be used instead. In both cases, tables are sharded based on UTC timezone. +The `exclusions` block support: + +* `name` - (Required) A client-assigned identifier, such as `load-balancer-exclusion`. Identifiers are limited to 100 characters and can include only letters, digits, underscores, hyphens, and periods. First character has to be alphanumeric. +* `description` - (Optional) A description of this exclusion. +* `filter` - (Required) An advanced logs filter that matches the log entries to be excluded. By using the sample function, you can exclude less than 100% of the matching log entries. See [Advanced Log Filters](https://cloud.google.com/logging/docs/view/advanced_filters) for information on how to + write a filter. +* `disabled` - (Optional) If set to True, then this exclusion is disabled and it does not exclude any log entries. + ## Attributes Reference In addition to the arguments listed above, the following computed attributes are diff --git a/mmv1/third_party/terraform/website/docs/r/logging_folder_exclusion.html.markdown b/mmv1/third_party/terraform/website/docs/r/logging_folder_exclusion.html.markdown index 8d6ceee78314..2a3b04faebde 100644 --- a/mmv1/third_party/terraform/website/docs/r/logging_folder_exclusion.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/logging_folder_exclusion.html.markdown @@ -9,12 +9,13 @@ description: |- # google\_logging\_folder\_exclusion -Manages a folder-level logging exclusion. For more information see -[the official documentation](https://cloud.google.com/logging/docs/) and -[Excluding Logs](https://cloud.google.com/logging/docs/exclusions). +Manages a folder-level logging exclusion. For more information see: -Note that you must have the "Logs Configuration Writer" IAM role (`roles/logging.configWriter`) -granted to the credentials used with Terraform. +* [API documentation](https://cloud.google.com/logging/docs/reference/v2/rest/v2/folders.exclusions) +* How-to Guides + * [Excluding Logs](https://cloud.google.com/logging/docs/exclusions) + +~> You can specify exclusions for log sinks created by terraform by using the exclusions field of `google_logging_folder_sink` ## Example Usage diff --git a/mmv1/third_party/terraform/website/docs/r/logging_folder_sink.html.markdown b/mmv1/third_party/terraform/website/docs/r/logging_folder_sink.html.markdown index b43d1bae3077..1c90f368b60b 100644 --- a/mmv1/third_party/terraform/website/docs/r/logging_folder_sink.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/logging_folder_sink.html.markdown @@ -9,12 +9,11 @@ description: |- # google\_logging\_folder\_sink -Manages a folder-level logging sink. For more information see -[the official documentation](https://cloud.google.com/logging/docs/) and -[Exporting Logs in the API](https://cloud.google.com/logging/docs/api/tasks/exporting-logs). +Manages a folder-level logging sink. For more information see: +* [API documentation](https://cloud.google.com/logging/docs/reference/v2/rest/v2/folders.sinks) +* How-to Guides + * [Exporting Logs](https://cloud.google.com/logging/docs/export) -Note that you must have the "Logs Configuration Writer" IAM role (`roles/logging.configWriter`) -granted to the credentials used with terraform. ## Example Usage @@ -81,6 +80,8 @@ The following arguments are supported: * `bigquery_options` - (Optional) Options that affect sinks exporting data to BigQuery. Structure documented below. +* `exclusions` - (Optional) Log entries that match any of the exclusion filters will not be exported. If a log entry is matched by both filter and one of exclusion_filters it will not be exported. Can be repeated multiple times for multiple exclusions. Structure is documented below. + The `bigquery_options` block supports: * `use_partitioned_tables` - (Required) Whether to use [BigQuery's partition tables](https://cloud.google.com/bigquery/docs/partitioned-tables). @@ -88,6 +89,14 @@ The `bigquery_options` block supports: tables the date suffix is no longer present and [special query syntax](https://cloud.google.com/bigquery/docs/querying-partitioned-tables) has to be used instead. In both cases, tables are sharded based on UTC timezone. +The `exclusions` block support: + +* `name` - (Required) A client-assigned identifier, such as `load-balancer-exclusion`. Identifiers are limited to 100 characters and can include only letters, digits, underscores, hyphens, and periods. First character has to be alphanumeric. +* `description` - (Optional) A description of this exclusion. +* `filter` - (Required) An advanced logs filter that matches the log entries to be excluded. By using the sample function, you can exclude less than 100% of the matching log entries. See [Advanced Log Filters](https://cloud.google.com/logging/docs/view/advanced_filters) for information on how to + write a filter. +* `disabled` - (Optional) If set to True, then this exclusion is disabled and it does not exclude any log entries. + ## Attributes Reference In addition to the arguments listed above, the following computed attributes are diff --git a/mmv1/third_party/terraform/website/docs/r/logging_organization_exclusion.html.markdown b/mmv1/third_party/terraform/website/docs/r/logging_organization_exclusion.html.markdown index bb628b504f6a..19ae5c67f399 100644 --- a/mmv1/third_party/terraform/website/docs/r/logging_organization_exclusion.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/logging_organization_exclusion.html.markdown @@ -9,12 +9,13 @@ description: |- # google\_logging\_organization\_exclusion -Manages an organization-level logging exclusion. For more information see -[the official documentation](https://cloud.google.com/logging/docs/) and -[Excluding Logs](https://cloud.google.com/logging/docs/exclusions). +Manages an organization-level logging exclusion. For more information see: -Note that you must have the "Logs Configuration Writer" IAM role (`roles/logging.configWriter`) -granted to the credentials used with Terraform. +* [API documentation](https://cloud.google.com/logging/docs/reference/v2/rest/v2/organizations.exclusions) +* How-to Guides + * [Excluding Logs](https://cloud.google.com/logging/docs/exclusions) + +~> You can specify exclusions for log sinks created by terraform by using the exclusions field of `google_logging_organization_sink` ## Example Usage diff --git a/mmv1/third_party/terraform/website/docs/r/logging_organization_sink.html.markdown b/mmv1/third_party/terraform/website/docs/r/logging_organization_sink.html.markdown index 556f5132e27e..a194f039ed52 100644 --- a/mmv1/third_party/terraform/website/docs/r/logging_organization_sink.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/logging_organization_sink.html.markdown @@ -9,12 +9,10 @@ description: |- # google\_logging\_organization\_sink -Manages a organization-level logging sink. For more information see -[the official documentation](https://cloud.google.com/logging/docs/) and -[Exporting Logs in the API](https://cloud.google.com/logging/docs/api/tasks/exporting-logs). - -Note that you must have the "Logs Configuration Writer" IAM role (`roles/logging.configWriter`) -granted to the credentials used with terraform. +Manages a organization-level logging sink. For more information see: +* [API documentation](https://cloud.google.com/logging/docs/reference/v2/rest/v2/organizations.sinks) +* How-to Guides + * [Exporting Logs](https://cloud.google.com/logging/docs/export) ## Example Usage @@ -73,6 +71,8 @@ The following arguments are supported: * `bigquery_options` - (Optional) Options that affect sinks exporting data to BigQuery. Structure documented below. +* `exclusions` - (Optional) Log entries that match any of the exclusion filters will not be exported. If a log entry is matched by both filter and one of exclusion_filters it will not be exported. Can be repeated multiple times for multiple exclusions. Structure is documented below. + The `bigquery_options` block supports: * `use_partitioned_tables` - (Required) Whether to use [BigQuery's partition tables](https://cloud.google.com/bigquery/docs/partitioned-tables). @@ -80,6 +80,14 @@ The `bigquery_options` block supports: tables the date suffix is no longer present and [special query syntax](https://cloud.google.com/bigquery/docs/querying-partitioned-tables) has to be used instead. In both cases, tables are sharded based on UTC timezone. +The `exclusions` block support: + +* `name` - (Required) A client-assigned identifier, such as `load-balancer-exclusion`. Identifiers are limited to 100 characters and can include only letters, digits, underscores, hyphens, and periods. First character has to be alphanumeric. +* `description` - (Optional) A description of this exclusion. +* `filter` - (Required) An advanced logs filter that matches the log entries to be excluded. By using the sample function, you can exclude less than 100% of the matching log entries. See [Advanced Log Filters](https://cloud.google.com/logging/docs/view/advanced_filters) for information on how to + write a filter. +* `disabled` - (Optional) If set to True, then this exclusion is disabled and it does not exclude any log entries. + ## Attributes Reference In addition to the arguments listed above, the following computed attributes are diff --git a/mmv1/third_party/terraform/website/docs/r/logging_project_exclusion.html.markdown b/mmv1/third_party/terraform/website/docs/r/logging_project_exclusion.html.markdown index 5fcbb9a66804..8af778b373e9 100644 --- a/mmv1/third_party/terraform/website/docs/r/logging_project_exclusion.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/logging_project_exclusion.html.markdown @@ -9,12 +9,13 @@ description: |- # google\_logging\_project\_exclusion -Manages a project-level logging exclusion. For more information see -[the official documentation](https://cloud.google.com/logging/docs/) and -[Excluding Logs](https://cloud.google.com/logging/docs/exclusions). +Manages a project-level logging exclusion. For more information see: -Note that you must have the "Logs Configuration Writer" IAM role (`roles/logging.configWriter`) -granted to the credentials used with Terraform. +* [API documentation](https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.exclusions) +* How-to Guides + * [Excluding Logs](https://cloud.google.com/logging/docs/exclusions) + +~> You can specify exclusions for log sinks created by terraform by using the exclusions field of `google_logging_project_sink` ## Example Usage diff --git a/mmv1/third_party/terraform/website/docs/r/logging_project_sink.html.markdown b/mmv1/third_party/terraform/website/docs/r/logging_project_sink.html.markdown index b1ebd700ad90..1297edccc6a3 100644 --- a/mmv1/third_party/terraform/website/docs/r/logging_project_sink.html.markdown +++ b/mmv1/third_party/terraform/website/docs/r/logging_project_sink.html.markdown @@ -9,11 +9,13 @@ description: |- # google\_logging\_project\_sink -Manages a project-level logging sink. For more information see -[the official documentation](https://cloud.google.com/logging/docs/), -[Exporting Logs in the API](https://cloud.google.com/logging/docs/api/tasks/exporting-logs) -and -[API](https://cloud.google.com/logging/docs/reference/v2/rest/). +Manages a project-level logging sink. For more information see: + +* [API documentation](https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.sinks) +* How-to Guides + * [Exporting Logs](https://cloud.google.com/logging/docs/export) + +~> You can specify exclusions for log sinks created by terraform by using the exclusions field of `google_logging_folder_sink` ~> **Note:** You must have [granted the "Logs Configuration Writer"](https://cloud.google.com/logging/docs/access-control) IAM role (`roles/logging.configWriter`) to the credentials used with terraform.