From 17202ad739438e9f64a12dfee40edd180326c62f Mon Sep 17 00:00:00 2001 From: Aleksander Zaruczewski Date: Tue, 13 Feb 2024 14:18:52 +0200 Subject: [PATCH 1/3] docs: remove influxdb mentions --- Makefile | 2 + docs/data-sources/influxdb.md | 174 --------------- docs/data-sources/influxdb_database.md | 27 --- docs/data-sources/influxdb_user.md | 38 ---- docs/data-sources/service_integration.md | 5 +- docs/resources/influxdb.md | 211 ------------------ docs/resources/influxdb_database.md | 42 ---- docs/resources/influxdb_user.md | 62 ----- docs/resources/service_integration.md | 6 +- sample_project/outputs.tf | 31 ++- sample_project/sample.tf | 20 +- .../data-sources/service_integration.md.tmpl | 5 +- .../resources/service_integration.md.tmpl | 6 +- 13 files changed, 39 insertions(+), 590 deletions(-) delete mode 100644 docs/data-sources/influxdb.md delete mode 100644 docs/data-sources/influxdb_database.md delete mode 100644 docs/data-sources/influxdb_user.md delete mode 100644 docs/resources/influxdb.md delete mode 100644 docs/resources/influxdb_database.md delete mode 100644 docs/resources/influxdb_user.md diff --git a/Makefile b/Makefile index 365f9f349..82b4f4acd 100644 --- a/Makefile +++ b/Makefile @@ -176,6 +176,8 @@ gen-go: docs: $(TFPLUGINDOCS) PROVIDER_AIVEN_ENABLE_BETA=true $(TFPLUGINDOCS) generate + rm -f docs/data-sources/influxdb*.md + rm -f docs/resources/influxdb*.md ################################################# # CI diff --git a/docs/data-sources/influxdb.md b/docs/data-sources/influxdb.md deleted file mode 100644 index eeefce1a3..000000000 --- a/docs/data-sources/influxdb.md +++ /dev/null @@ -1,174 +0,0 @@ ---- -# generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "aiven_influxdb Data Source - terraform-provider-aiven" -subcategory: "" -description: |- - The InfluxDB data source provides information about the existing Aiven InfluxDB service. ---- - -# aiven_influxdb (Data Source) - -The InfluxDB data source provides information about the existing Aiven InfluxDB service. - -## Example Usage - -```terraform -data "aiven_influxdb" "inf1" { - project = data.aiven_project.pr1.project - service_name = "my-inf1" -} -``` - - -## Schema - -### Required - -- `project` (String) Identifies the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. -- `service_name` (String) Specifies the actual name of the service. The name cannot be changed later without destroying and re-creating the service so name should be picked based on intended service usage rather than current attributes. - -### Read-Only - -- `additional_disk_space` (String) Additional disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing. -- `cloud_name` (String) Defines where the cloud provider and region where the service is hosted in. This can be changed freely after service is created. Changing the value will trigger a potentially lengthy migration process for the service. Format is cloud provider name (`aws`, `azure`, `do` `google`, `upcloud`, etc.), dash, and the cloud provider specific region name. These are documented on each Cloud provider's own support articles, like [here for Google](https://cloud.google.com/compute/docs/regions-zones/) and [here for AWS](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.RegionsAndAvailabilityZones.html). -- `components` (List of Object) Service component information objects (see [below for nested schema](#nestedatt--components)) -- `disk_space` (String) Service disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing. -- `disk_space_cap` (String) The maximum disk space of the service, possible values depend on the service type, the cloud provider and the project. -- `disk_space_default` (String) The default disk space of the service, possible values depend on the service type, the cloud provider and the project. Its also the minimum value for `disk_space` -- `disk_space_step` (String) The default disk space step of the service, possible values depend on the service type, the cloud provider and the project. `disk_space` needs to increment from `disk_space_default` by increments of this size. -- `disk_space_used` (String) Disk space that service is currently using -- `id` (String) The ID of this resource. -- `influxdb` (List of Object) InfluxDB server provided values (see [below for nested schema](#nestedatt--influxdb)) -- `influxdb_user_config` (List of Object) Influxdb user configurable settings (see [below for nested schema](#nestedatt--influxdb_user_config)) -- `maintenance_window_dow` (String) Day of week when maintenance operations should be performed. One monday, tuesday, wednesday, etc. -- `maintenance_window_time` (String) Time of day when maintenance operations should be performed. UTC time in HH:mm:ss format. -- `plan` (String) Defines what kind of computing resources are allocated for the service. It can be changed after creation, though there are some restrictions when going to a smaller plan such as the new plan must have sufficient amount of disk space to store all current data and switching to a plan with fewer nodes might not be supported. The basic plan names are `hobbyist`, `startup-x`, `business-x` and `premium-x` where `x` is (roughly) the amount of memory on each node (also other attributes like number of CPUs and amount of disk space varies but naming is based on memory). The available options can be seem from the [Aiven pricing page](https://aiven.io/pricing). -- `project_vpc_id` (String) Specifies the VPC the service should run in. If the value is not set the service is not run inside a VPC. When set, the value should be given as a reference to set up dependencies correctly and the VPC must be in the same cloud and region as the service itself. Project can be freely moved to and from VPC after creation but doing so triggers migration to new servers so the operation can take significant amount of time to complete if the service has a lot of data. -- `service_host` (String) The hostname of the service. -- `service_integrations` (List of Object) Service integrations to specify when creating a service. Not applied after initial service creation (see [below for nested schema](#nestedatt--service_integrations)) -- `service_password` (String, Sensitive) Password used for connecting to the service, if applicable -- `service_port` (Number) The port of the service -- `service_type` (String) Aiven internal service type code -- `service_uri` (String, Sensitive) URI for connecting to the service. Service specific info is under "kafka", "pg", etc. -- `service_username` (String) Username used for connecting to the service, if applicable -- `state` (String) Service state. One of `POWEROFF`, `REBALANCING`, `REBUILDING` or `RUNNING` -- `static_ips` (Set of String) Static IPs that are going to be associated with this service. Please assign a value using the 'toset' function. Once a static ip resource is in the 'assigned' state it cannot be unbound from the node again -- `tag` (Set of Object) Tags are key-value pairs that allow you to categorize services. (see [below for nested schema](#nestedatt--tag)) -- `tech_emails` (Set of Object) Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service instability. (see [below for nested schema](#nestedatt--tech_emails)) -- `termination_protection` (Boolean) Prevents the service from being deleted. It is recommended to set this to `true` for all production services to prevent unintentional service deletion. This does not shield against deleting databases or topics but for services with backups much of the content can at least be restored from backup in case accidental deletion is done. - - -### Nested Schema for `components` - -Read-Only: - -- `component` (String) -- `connection_uri` (String) -- `host` (String) -- `kafka_authentication_method` (String) -- `port` (Number) -- `route` (String) -- `ssl` (Boolean) -- `usage` (String) - - - -### Nested Schema for `influxdb` - -Read-Only: - -- `database_name` (String) - - - -### Nested Schema for `influxdb_user_config` - -Read-Only: - -- `additional_backup_regions` (List of String) -- `custom_domain` (String) -- `influxdb` (List of Object) (see [below for nested schema](#nestedobjatt--influxdb_user_config--influxdb)) -- `ip_filter` (Set of String) -- `ip_filter_object` (List of Object) (see [below for nested schema](#nestedobjatt--influxdb_user_config--ip_filter_object)) -- `ip_filter_string` (Set of String) -- `private_access` (List of Object) (see [below for nested schema](#nestedobjatt--influxdb_user_config--private_access)) -- `privatelink_access` (List of Object) (see [below for nested schema](#nestedobjatt--influxdb_user_config--privatelink_access)) -- `project_to_fork_from` (String) -- `public_access` (List of Object) (see [below for nested schema](#nestedobjatt--influxdb_user_config--public_access)) -- `recovery_basebackup_name` (String) -- `service_log` (Boolean) -- `service_to_fork_from` (String) -- `static_ips` (Boolean) - - -### Nested Schema for `influxdb_user_config.influxdb` - -Read-Only: - -- `log_queries_after` (Number) -- `max_connection_limit` (Number) -- `max_row_limit` (Number) -- `max_select_buckets` (Number) -- `max_select_point` (Number) -- `query_log_enabled` (Boolean) -- `query_timeout` (Number) - - - -### Nested Schema for `influxdb_user_config.ip_filter_object` - -Read-Only: - -- `description` (String) -- `network` (String) - - - -### Nested Schema for `influxdb_user_config.private_access` - -Read-Only: - -- `influxdb` (Boolean) - - - -### Nested Schema for `influxdb_user_config.privatelink_access` - -Read-Only: - -- `influxdb` (Boolean) - - - -### Nested Schema for `influxdb_user_config.public_access` - -Read-Only: - -- `influxdb` (Boolean) - - - - -### Nested Schema for `service_integrations` - -Read-Only: - -- `integration_type` (String) -- `source_service_name` (String) - - - -### Nested Schema for `tag` - -Read-Only: - -- `key` (String) -- `value` (String) - - - -### Nested Schema for `tech_emails` - -Read-Only: - -- `email` (String) diff --git a/docs/data-sources/influxdb_database.md b/docs/data-sources/influxdb_database.md deleted file mode 100644 index f13a52c1f..000000000 --- a/docs/data-sources/influxdb_database.md +++ /dev/null @@ -1,27 +0,0 @@ ---- -# generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "aiven_influxdb_database Data Source - terraform-provider-aiven" -subcategory: "" -description: |- - The InfluxDB Database data source provides information about the existing Aiven InfluxDB Database. ---- - -# aiven_influxdb_database (Data Source) - -The InfluxDB Database data source provides information about the existing Aiven InfluxDB Database. - - - - -## Schema - -### Required - -- `database_name` (String) The name of the service database. This property cannot be changed, doing so forces recreation of the resource. -- `project` (String) Identifies the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. -- `service_name` (String) Specifies the name of the service that this resource belongs to. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. - -### Read-Only - -- `id` (String) The ID of this resource. -- `termination_protection` (Boolean) It is a Terraform client-side deletion protections, which prevents the database from being deleted by Terraform. It is recommended to enable this for any production databases containing critical data. The default value is `false`. diff --git a/docs/data-sources/influxdb_user.md b/docs/data-sources/influxdb_user.md deleted file mode 100644 index cbcec150f..000000000 --- a/docs/data-sources/influxdb_user.md +++ /dev/null @@ -1,38 +0,0 @@ ---- -# generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "aiven_influxdb_user Data Source - terraform-provider-aiven" -subcategory: "" -description: |- - The InfluxDB User data source provides information about the existing Aiven InfluxDB User. ---- - -# aiven_influxdb_user (Data Source) - -The InfluxDB User data source provides information about the existing Aiven InfluxDB User. - -## Example Usage - -```terraform -data "aiven_influxdb_user" "user" { - service_name = "my-service" - project = "my-project" - username = "user1" -} -``` - - -## Schema - -### Required - -- `project` (String) Identifies the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. -- `service_name` (String) Specifies the name of the service that this resource belongs to. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. -- `username` (String) The actual name of the InfluxDB User. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. - -### Read-Only - -- `access_cert` (String, Sensitive) Access certificate for the user if applicable for the service in question -- `access_key` (String, Sensitive) Access certificate key for the user if applicable for the service in question -- `id` (String) The ID of this resource. -- `password` (String, Sensitive) The password of the InfluxDB User. -- `type` (String) Type of the user account. Tells whether the user is the primary account or a regular account. diff --git a/docs/data-sources/service_integration.md b/docs/data-sources/service_integration.md index 354e8152b..07991487e 100644 --- a/docs/data-sources/service_integration.md +++ b/docs/data-sources/service_integration.md @@ -7,7 +7,10 @@ description: |- # aiven_service_integration (Data Source) The Service Integration data source provides information about the existing Aiven Service Integration. -Service Integration defines an integration between two Aiven services or between Aiven service and an external integration endpoint. Integration could be for example sending metrics from Kafka service to an InfluxDB service, getting metrics from an InfluxDB service to a Grafana service to show dashboards, sending logs from any service to Elasticsearch, etc. +Service Integration defines an integration between two Aiven services or between Aiven service and an external +integration endpoint. Integration could be for example sending metrics from Kafka service to an M3DB service, +getting metrics from an M3Db service to a Grafana service to show dashboards, sending logs from any service to +OpenSearch, etc. ## Example Usage ```terraform diff --git a/docs/resources/influxdb.md b/docs/resources/influxdb.md deleted file mode 100644 index 9c6c903ca..000000000 --- a/docs/resources/influxdb.md +++ /dev/null @@ -1,211 +0,0 @@ ---- -# generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "aiven_influxdb Resource - terraform-provider-aiven" -subcategory: "" -description: |- - The InfluxDB resource allows the creation and management of Aiven InfluxDB services. ---- - -# aiven_influxdb (Resource) - -The InfluxDB resource allows the creation and management of Aiven InfluxDB services. - -## Example Usage - -```terraform -resource "aiven_influxdb" "inf1" { - project = data.aiven_project.pr1.project - cloud_name = "google-europe-west1" - plan = "startup-4" - service_name = "my-inf1" - maintenance_window_dow = "monday" - maintenance_window_time = "10:00:00" - - influxdb_user_config { - public_access { - influxdb = true - } - } -} -``` - - -## Schema - -### Required - -- `plan` (String) Defines what kind of computing resources are allocated for the service. It can be changed after creation, though there are some restrictions when going to a smaller plan such as the new plan must have sufficient amount of disk space to store all current data and switching to a plan with fewer nodes might not be supported. The basic plan names are `hobbyist`, `startup-x`, `business-x` and `premium-x` where `x` is (roughly) the amount of memory on each node (also other attributes like number of CPUs and amount of disk space varies but naming is based on memory). The available options can be seem from the [Aiven pricing page](https://aiven.io/pricing). -- `project` (String) Identifies the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. -- `service_name` (String) Specifies the actual name of the service. The name cannot be changed later without destroying and re-creating the service so name should be picked based on intended service usage rather than current attributes. - -### Optional - -- `additional_disk_space` (String) Additional disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing. -- `cloud_name` (String) Defines where the cloud provider and region where the service is hosted in. This can be changed freely after service is created. Changing the value will trigger a potentially lengthy migration process for the service. Format is cloud provider name (`aws`, `azure`, `do` `google`, `upcloud`, etc.), dash, and the cloud provider specific region name. These are documented on each Cloud provider's own support articles, like [here for Google](https://cloud.google.com/compute/docs/regions-zones/) and [here for AWS](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.RegionsAndAvailabilityZones.html). -- `disk_space` (String, Deprecated) Service disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing. -- `influxdb_user_config` (Block List, Max: 1) Influxdb user configurable settings (see [below for nested schema](#nestedblock--influxdb_user_config)) -- `maintenance_window_dow` (String) Day of week when maintenance operations should be performed. One monday, tuesday, wednesday, etc. -- `maintenance_window_time` (String) Time of day when maintenance operations should be performed. UTC time in HH:mm:ss format. -- `project_vpc_id` (String) Specifies the VPC the service should run in. If the value is not set the service is not run inside a VPC. When set, the value should be given as a reference to set up dependencies correctly and the VPC must be in the same cloud and region as the service itself. Project can be freely moved to and from VPC after creation but doing so triggers migration to new servers so the operation can take significant amount of time to complete if the service has a lot of data. -- `service_integrations` (Block List) Service integrations to specify when creating a service. Not applied after initial service creation (see [below for nested schema](#nestedblock--service_integrations)) -- `static_ips` (Set of String) Static IPs that are going to be associated with this service. Please assign a value using the 'toset' function. Once a static ip resource is in the 'assigned' state it cannot be unbound from the node again -- `tag` (Block Set) Tags are key-value pairs that allow you to categorize services. (see [below for nested schema](#nestedblock--tag)) -- `tech_emails` (Block Set) Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service instability. (see [below for nested schema](#nestedblock--tech_emails)) -- `termination_protection` (Boolean) Prevents the service from being deleted. It is recommended to set this to `true` for all production services to prevent unintentional service deletion. This does not shield against deleting databases or topics but for services with backups much of the content can at least be restored from backup in case accidental deletion is done. -- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts)) - -### Read-Only - -- `components` (List of Object) Service component information objects (see [below for nested schema](#nestedatt--components)) -- `disk_space_cap` (String) The maximum disk space of the service, possible values depend on the service type, the cloud provider and the project. -- `disk_space_default` (String) The default disk space of the service, possible values depend on the service type, the cloud provider and the project. Its also the minimum value for `disk_space` -- `disk_space_step` (String) The default disk space step of the service, possible values depend on the service type, the cloud provider and the project. `disk_space` needs to increment from `disk_space_default` by increments of this size. -- `disk_space_used` (String) Disk space that service is currently using -- `id` (String) The ID of this resource. -- `influxdb` (List of Object) InfluxDB server provided values (see [below for nested schema](#nestedatt--influxdb)) -- `service_host` (String) The hostname of the service. -- `service_password` (String, Sensitive) Password used for connecting to the service, if applicable -- `service_port` (Number) The port of the service -- `service_type` (String) Aiven internal service type code -- `service_uri` (String, Sensitive) URI for connecting to the service. Service specific info is under "kafka", "pg", etc. -- `service_username` (String) Username used for connecting to the service, if applicable -- `state` (String) Service state. One of `POWEROFF`, `REBALANCING`, `REBUILDING` or `RUNNING` - - -### Nested Schema for `influxdb_user_config` - -Optional: - -- `additional_backup_regions` (List of String, Deprecated) Additional Cloud Regions for Backup Replication. -- `custom_domain` (String) Serve the web frontend using a custom CNAME pointing to the Aiven DNS name. -- `influxdb` (Block List, Max: 1) influxdb.conf configuration values (see [below for nested schema](#nestedblock--influxdb_user_config--influxdb)) -- `ip_filter` (Set of String, Deprecated) Allow incoming connections from CIDR address block, e.g. '10.20.0.0/16'. -- `ip_filter_object` (Block List, Max: 1024) Allow incoming connections from CIDR address block, e.g. '10.20.0.0/16' (see [below for nested schema](#nestedblock--influxdb_user_config--ip_filter_object)) -- `ip_filter_string` (Set of String) Allow incoming connections from CIDR address block, e.g. '10.20.0.0/16'. -- `private_access` (Block List, Max: 1) Allow access to selected service ports from private networks (see [below for nested schema](#nestedblock--influxdb_user_config--private_access)) -- `privatelink_access` (Block List, Max: 1) Allow access to selected service components through Privatelink (see [below for nested schema](#nestedblock--influxdb_user_config--privatelink_access)) -- `project_to_fork_from` (String) Name of another project to fork a service from. This has effect only when a new service is being created. -- `public_access` (Block List, Max: 1) Allow access to selected service ports from the public Internet (see [below for nested schema](#nestedblock--influxdb_user_config--public_access)) -- `recovery_basebackup_name` (String) Name of the basebackup to restore in forked service. -- `service_log` (Boolean) Store logs for the service so that they are available in the HTTP API and console. -- `service_to_fork_from` (String) Name of another service to fork from. This has effect only when a new service is being created. -- `static_ips` (Boolean) Use static public IP addresses. - - -### Nested Schema for `influxdb_user_config.influxdb` - -Optional: - -- `log_queries_after` (Number) The maximum duration in seconds before a query is logged as a slow query. Setting this to 0 (the default) will never log slow queries. -- `max_connection_limit` (Number) Maximum number of connections to InfluxDB. Setting this to 0 (default) means no limit. If using max_connection_limit, it is recommended to set the value to be large enough in order to not block clients unnecessarily. -- `max_row_limit` (Number) The maximum number of rows returned in a non-chunked query. Setting this to 0 (the default) allows an unlimited number to be returned. -- `max_select_buckets` (Number) The maximum number of `GROUP BY time()` buckets that can be processed in a query. Setting this to 0 (the default) allows an unlimited number to be processed. -- `max_select_point` (Number) The maximum number of points that can be processed in a SELECT statement. Setting this to 0 (the default) allows an unlimited number to be processed. -- `query_log_enabled` (Boolean) Whether queries should be logged before execution. May log sensitive data contained within a query. -- `query_timeout` (Number) The maximum duration in seconds before a query is killed. Setting this to 0 (the default) will never kill slow queries. - - - -### Nested Schema for `influxdb_user_config.ip_filter_object` - -Required: - -- `network` (String) CIDR address block. - -Optional: - -- `description` (String) Description for IP filter list entry. - - - -### Nested Schema for `influxdb_user_config.private_access` - -Optional: - -- `influxdb` (Boolean) Allow clients to connect to influxdb with a DNS name that always resolves to the service's private IP addresses. Only available in certain network locations. - - - -### Nested Schema for `influxdb_user_config.privatelink_access` - -Optional: - -- `influxdb` (Boolean) Enable influxdb. - - - -### Nested Schema for `influxdb_user_config.public_access` - -Optional: - -- `influxdb` (Boolean) Allow clients to connect to influxdb from the public internet for service nodes that are in a project VPC or another type of private network. - - - - -### Nested Schema for `service_integrations` - -Required: - -- `integration_type` (String) Type of the service integration. The only supported value at the moment is `read_replica` -- `source_service_name` (String) Name of the source service - - - -### Nested Schema for `tag` - -Required: - -- `key` (String) Service tag key -- `value` (String) Service tag value - - - -### Nested Schema for `tech_emails` - -Required: - -- `email` (String) An email address to contact for technical issues - - - -### Nested Schema for `timeouts` - -Optional: - -- `create` (String) -- `default` (String) -- `delete` (String) -- `read` (String) -- `update` (String) - - - -### Nested Schema for `components` - -Read-Only: - -- `component` (String) -- `connection_uri` (String) -- `host` (String) -- `kafka_authentication_method` (String) -- `port` (Number) -- `route` (String) -- `ssl` (Boolean) -- `usage` (String) - - - -### Nested Schema for `influxdb` - -Read-Only: - -- `database_name` (String) - -## Import - -Import is supported using the following syntax: - -```shell -terraform import aiven_influxdb.inf1 project/service_name -``` diff --git a/docs/resources/influxdb_database.md b/docs/resources/influxdb_database.md deleted file mode 100644 index 80a8313b4..000000000 --- a/docs/resources/influxdb_database.md +++ /dev/null @@ -1,42 +0,0 @@ ---- -# generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "aiven_influxdb_database Resource - terraform-provider-aiven" -subcategory: "" -description: |- - The InfluxDB Database resource allows the creation and management of Aiven InfluxDB Databases. ---- - -# aiven_influxdb_database (Resource) - -The InfluxDB Database resource allows the creation and management of Aiven InfluxDB Databases. - - - - -## Schema - -### Required - -- `database_name` (String) The name of the service database. This property cannot be changed, doing so forces recreation of the resource. -- `project` (String) Identifies the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. -- `service_name` (String) Specifies the name of the service that this resource belongs to. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. - -### Optional - -- `termination_protection` (Boolean) It is a Terraform client-side deletion protections, which prevents the database from being deleted by Terraform. It is recommended to enable this for any production databases containing critical data. The default value is `false`. -- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts)) - -### Read-Only - -- `id` (String) The ID of this resource. - - -### Nested Schema for `timeouts` - -Optional: - -- `create` (String) -- `default` (String) -- `delete` (String) -- `read` (String) -- `update` (String) diff --git a/docs/resources/influxdb_user.md b/docs/resources/influxdb_user.md deleted file mode 100644 index e67e7f62e..000000000 --- a/docs/resources/influxdb_user.md +++ /dev/null @@ -1,62 +0,0 @@ ---- -# generated by https://github.com/hashicorp/terraform-plugin-docs -page_title: "aiven_influxdb_user Resource - terraform-provider-aiven" -subcategory: "" -description: |- - The InfluxDB User resource allows the creation and management of Aiven InfluxDB Users. ---- - -# aiven_influxdb_user (Resource) - -The InfluxDB User resource allows the creation and management of Aiven InfluxDB Users. - -## Example Usage - -```terraform -resource "aiven_influxdb_user" "foo" { - service_name = aiven_influxdb.bar.service_name - project = "my-project" - username = "user-1" - password = "Test$1234" -} -``` - - -## Schema - -### Required - -- `project` (String) Identifies the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. -- `service_name` (String) Specifies the name of the service that this resource belongs to. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. -- `username` (String) The actual name of the InfluxDB User. To set up proper dependencies please refer to this variable as a reference. This property cannot be changed, doing so forces recreation of the resource. - -### Optional - -- `password` (String, Sensitive) The password of the InfluxDB User. -- `timeouts` (Block, Optional) (see [below for nested schema](#nestedblock--timeouts)) - -### Read-Only - -- `access_cert` (String, Sensitive) Access certificate for the user if applicable for the service in question -- `access_key` (String, Sensitive) Access certificate key for the user if applicable for the service in question -- `id` (String) The ID of this resource. -- `type` (String) Type of the user account. Tells whether the user is the primary account or a regular account. - - -### Nested Schema for `timeouts` - -Optional: - -- `create` (String) -- `default` (String) -- `delete` (String) -- `read` (String) -- `update` (String) - -## Import - -Import is supported using the following syntax: - -```shell -terraform import aiven_influxdb_user.foo project/service_name/username -``` diff --git a/docs/resources/service_integration.md b/docs/resources/service_integration.md index e8bef4aed..7e9323920 100644 --- a/docs/resources/service_integration.md +++ b/docs/resources/service_integration.md @@ -10,9 +10,9 @@ The Service Integration resource allows the creation and management of Aiven Ser **Note** For services running on `hobbyist` plan service integrations are not supported. Service Integration defines an integration between two Aiven services or between Aiven service and an external -integration endpoint. Integration could be for example sending metrics from Kafka service to an InfluxDB service, -getting metrics from an InfluxDB service to a Grafana service to show dashboards, sending logs from any service to -Elasticsearch, etc. +integration endpoint. Integration could be for example sending metrics from Kafka service to an M3DB service, +getting metrics from an M3DB service to a Grafana service to show dashboards, sending logs from any service to +OpenSearch, etc. ## Example Usage ```terraform diff --git a/sample_project/outputs.tf b/sample_project/outputs.tf index 780448e68..3576edd03 100644 --- a/sample_project/outputs.tf +++ b/sample_project/outputs.tf @@ -116,40 +116,35 @@ output "sample_acl_id" { description = "Resource's Terraform identifier." } -# InfluxDB service -output "sampleinflux_id" { - value = aiven_influxdb.sampleinflux.id +# M3DB service +output "samplem3db_id" { + value = aiven_m3db.samplem3db.id description = "Resource's Terraform identifier." } -output "sampleinflux_service_uri" { - value = aiven_influxdb.sampleinflux.service_uri +output "samplem3db_service_uri" { + value = aiven_m3db.samplem3db.service_uri description = "URI for connecting to the service." sensitive = true } -output "sampleinflux_service_host" { - value = aiven_influxdb.sampleinflux.service_host +output "samplem3db_service_host" { + value = aiven_m3db.samplem3db.service_host description = "The hostname of the service." } -output "sampleinflux_service_port" { - value = aiven_influxdb.sampleinflux.service_port +output "samplem3db_service_port" { + value = aiven_m3db.samplem3db.service_port description = "The port of the service." } -output "sampleinflux_database_name" { - value = aiven_influxdb.sampleinflux.influxdb[0].database_name - description = "Name of the default InfluxDB database." -} - -output "sampleinflux_service_username" { - value = aiven_influxdb.sampleinflux.service_username +output "samplem3db_service_username" { + value = aiven_m3db.samplem3db.service_username description = "Username used for connecting to the service." } -output "sampleinflux_service_password" { - value = aiven_influxdb.sampleinflux.service_password +output "samplem3db_service_password" { + value = aiven_m3db.samplem3db.service_password description = "Password used for connecting to the service." sensitive = true } diff --git a/sample_project/sample.tf b/sample_project/sample.tf index a1ce01b4e..999011810 100644 --- a/sample_project/sample.tf +++ b/sample_project/sample.tf @@ -69,27 +69,27 @@ resource "aiven_kafka_acl" "sample_acl" { topic = "*" } -# InfluxDB service -resource "aiven_influxdb" "sampleinflux" { +# M3DB service +resource "aiven_m3db" "samplem3db" { project = data.aiven_project.sample.project cloud_name = "google-europe-west1" - plan = "startup-4" - service_name = "sampleinflux" + plan = "startup-8" + service_name = "samplem3db" maintenance_window_dow = "monday" maintenance_window_time = "11:00:00" - influxdb_user_config { + m3db_user_config { ip_filter_object { network = "0.0.0.0/0" } } } -# Send metrics from Kafka to InfluxDB +# Send metrics from Kafka to M3DB resource "aiven_service_integration" "samplekafka_metrics" { project = data.aiven_project.sample.project integration_type = "metrics" source_service_name = aiven_kafka.samplekafka.service_name - destination_service_name = aiven_influxdb.sampleinflux.service_name + destination_service_name = aiven_m3db.samplem3db.service_name } # PostgreSQL service @@ -107,12 +107,12 @@ resource "aiven_pg" "samplepg" { } } -# Send metrics from PostgreSQL to InfluxDB +# Send metrics from PostgreSQL to M3DB resource "aiven_service_integration" "samplepg_metrics" { project = data.aiven_project.sample.project integration_type = "metrics" source_service_name = aiven_pg.samplepg.service_name - destination_service_name = aiven_influxdb.sampleinflux.service_name + destination_service_name = aiven_m3db.samplem3db.service_name } # PostgreSQL database @@ -160,5 +160,5 @@ resource "aiven_service_integration" "samplegrafana_dashboards" { project = data.aiven_project.sample.project integration_type = "dashboard" source_service_name = aiven_grafana.samplegrafana.service_name - destination_service_name = aiven_influxdb.sampleinflux.service_name + destination_service_name = aiven_m3db.samplem3db.service_name } diff --git a/templates/data-sources/service_integration.md.tmpl b/templates/data-sources/service_integration.md.tmpl index abc1cf454..2927f4e5d 100644 --- a/templates/data-sources/service_integration.md.tmpl +++ b/templates/data-sources/service_integration.md.tmpl @@ -7,7 +7,10 @@ description: |- # {{.Name}} ({{.Type}}) {{ .Description | trimspace }} -Service Integration defines an integration between two Aiven services or between Aiven service and an external integration endpoint. Integration could be for example sending metrics from Kafka service to an InfluxDB service, getting metrics from an InfluxDB service to a Grafana service to show dashboards, sending logs from any service to Elasticsearch, etc. +Service Integration defines an integration between two Aiven services or between Aiven service and an external +integration endpoint. Integration could be for example sending metrics from Kafka service to an M3DB service, +getting metrics from an M3Db service to a Grafana service to show dashboards, sending logs from any service to +OpenSearch, etc. {{ if .HasExample -}} ## Example Usage diff --git a/templates/resources/service_integration.md.tmpl b/templates/resources/service_integration.md.tmpl index ae15ff046..7192b1bae 100644 --- a/templates/resources/service_integration.md.tmpl +++ b/templates/resources/service_integration.md.tmpl @@ -10,9 +10,9 @@ description: |- **Note** For services running on `hobbyist` plan service integrations are not supported. Service Integration defines an integration between two Aiven services or between Aiven service and an external -integration endpoint. Integration could be for example sending metrics from Kafka service to an InfluxDB service, -getting metrics from an InfluxDB service to a Grafana service to show dashboards, sending logs from any service to -Elasticsearch, etc. +integration endpoint. Integration could be for example sending metrics from Kafka service to an M3DB service, +getting metrics from an M3DB service to a Grafana service to show dashboards, sending logs from any service to +OpenSearch, etc. {{ if .HasExample -}} ## Example Usage From 7fb20d072635d5a086aeca7d41e56417f48f1ae5 Mon Sep 17 00:00:00 2001 From: Aleksander Zaruczewski Date: Tue, 13 Feb 2024 14:19:11 +0200 Subject: [PATCH 2/3] docs: remove elasticsearch mentions --- docs/guides/examples.md | 6 +++--- docs/guides/syslog-service-integration.md | 2 +- docs/resources/kafka_connector.md | 2 +- examples/gcp_marketplace/main.tf | 4 ++-- examples/resources/aiven_kafka_connector/resource.tf | 2 +- .../service_integration_endpoint_test.go | 8 ++++---- templates/guides/examples.md | 6 +++--- templates/guides/syslog-service-integration.md | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/guides/examples.md b/docs/guides/examples.md index dc49f0b6d..6f2794a9c 100644 --- a/docs/guides/examples.md +++ b/docs/guides/examples.md @@ -8,14 +8,14 @@ Other examples can be found in the [examples](https://github.com/aiven/terraform - [Getting Started](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/getting-started.tf) - [Account, projects, teams, and member management](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/account) -- [Elasticsearch deployment and configuration](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/elasticsearch) +- [OpenSearch deployment and configuration](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/opensearch) - [Standalone Kafka connect deployment with custom config](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_connect) - [Deploying a ClickHouse service](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/clickhouse) - [Deploying ClickHouse with a Kafka source integration](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/clickhouse_integrations/kafka_source) - [Deploying ClickHouse with a PostgreSQL source integration](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/clickhouse_integrations/postgres_source) - [Deploying Kafka with a Prometheus Service Integration](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_prometheus) -- [Deploying Kafka and Elasticsearch with a Kafka Connect Elasticsearch Sink connector](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_connectors/es_sink) -- [Deploying Kafka and Elasticsearch with a Kafka Connect Mongo Sink connector](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_connectors/mongo_sink) +- [Deploying Kafka and OpenSearch with a Kafka Connect OpenSearch Sink connector](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_connectors/os_sink) +- [Deploying Kafka with a Kafka Connect Mongo Sink connector](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_connectors/mongo_sink) - [Deploying Kafka with Schema Registry enabled and providing a schema](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_schemas) - [Deploying Cassandra and forking (cloning the service, config and data) into a new service with a higher plan](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/cassandra_fork) - [Deploying a Grafana service](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/service) diff --git a/docs/guides/syslog-service-integration.md b/docs/guides/syslog-service-integration.md index d00d484b4..9d0ad1b3b 100644 --- a/docs/guides/syslog-service-integration.md +++ b/docs/guides/syslog-service-integration.md @@ -3,7 +3,7 @@ page_title: "Creating a Syslog Service Integration" --- # Creating a Syslog Service Integration -Let's say you have a project in your account and a Kafka service that is throwing all sorts of errors. The Aiven web console has logs built in, you cry! Sure, but you likely need the search power of Elasticsearch or the power of logging services, such as Datadog or Rsyslog servers. +Let's say you have a project in your account and a Kafka service that is throwing all sorts of errors. The Aiven web console has logs built in, you cry! Sure, but you likely need the search power of OpenSearch or the power of logging services, such as Datadog or Rsyslog servers. In Terraform, we support adding these service integrations and it can be broken down into 2 steps: diff --git a/docs/resources/kafka_connector.md b/docs/resources/kafka_connector.md index 47624b9f0..22950da90 100644 --- a/docs/resources/kafka_connector.md +++ b/docs/resources/kafka_connector.md @@ -23,7 +23,7 @@ resource "aiven_kafka_connector" "kafka-os-con1" { "connector.class" : "io.aiven.kafka.connect.opensearch.OpensearchSinkConnector" "type.name" = "os-connector" "name" = "kafka-os-con1" - "connection.url" = aiven_elasticsearch.os-service1.service_uri + "connection.url" = aiven_opensearch.os-service1.service_uri "connection.username" = aiven_opensearch.os-service1.service_username "connection.password" = aiven_opensearch.os-service1.service_password } diff --git a/examples/gcp_marketplace/main.tf b/examples/gcp_marketplace/main.tf index d70504125..a30161510 100644 --- a/examples/gcp_marketplace/main.tf +++ b/examples/gcp_marketplace/main.tf @@ -35,9 +35,9 @@ resource "aiven_project" "new_project" { account_id = data.aiven_account.test_account.id # This is required for new marketplace projects } -resource "aiven_elasticsearch" "elasticsearch" { +resource "aiven_opensearch" "opensearch" { project = data.aiven_project.existing_project.id cloud_name = "google-europe-north1" plan = "gcp-marketplace-startup-4" - service_name = "elasticsearch" + service_name = "opensearch" } diff --git a/examples/resources/aiven_kafka_connector/resource.tf b/examples/resources/aiven_kafka_connector/resource.tf index 09c73f628..f6f8b0bb7 100644 --- a/examples/resources/aiven_kafka_connector/resource.tf +++ b/examples/resources/aiven_kafka_connector/resource.tf @@ -8,7 +8,7 @@ resource "aiven_kafka_connector" "kafka-os-con1" { "connector.class" : "io.aiven.kafka.connect.opensearch.OpensearchSinkConnector" "type.name" = "os-connector" "name" = "kafka-os-con1" - "connection.url" = aiven_elasticsearch.os-service1.service_uri + "connection.url" = aiven_opensearch.os-service1.service_uri "connection.username" = aiven_opensearch.os-service1.service_username "connection.password" = aiven_opensearch.os-service1.service_password } diff --git a/internal/sdkprovider/service/serviceintegration/service_integration_endpoint_test.go b/internal/sdkprovider/service/serviceintegration/service_integration_endpoint_test.go index 2d5e4b149..6ed61c6b0 100644 --- a/internal/sdkprovider/service/serviceintegration/service_integration_endpoint_test.go +++ b/internal/sdkprovider/service/serviceintegration/service_integration_endpoint_test.go @@ -31,7 +31,7 @@ func TestAccAivenServiceIntegrationEndpoint_basic(t *testing.T) { testAccCheckAivenServiceEndpointIntegrationAttributes("data.aiven_service_integration_endpoint.endpoint"), resource.TestCheckResourceAttr(resourceName, "project", os.Getenv("AIVEN_PROJECT_NAME")), resource.TestCheckResourceAttr(resourceName, "endpoint_name", fmt.Sprintf("test-acc-ie-%s", rName)), - resource.TestCheckResourceAttr(resourceName, "endpoint_type", "external_elasticsearch_logs"), + resource.TestCheckResourceAttr(resourceName, "endpoint_type", "external_opensearch_logs"), ), }, }, @@ -110,9 +110,9 @@ resource "aiven_pg" "bar-pg" { resource "aiven_service_integration_endpoint" "bar" { project = data.aiven_project.foo.project endpoint_name = "test-acc-ie-%s" - endpoint_type = "external_elasticsearch_logs" + endpoint_type = "external_opensearch_logs" - external_elasticsearch_logs_user_config { + external_opensearch_logs_user_config { url = "https://user:passwd@logs.example.com/" index_prefix = "test-acc-prefix-%s" index_days_max = 3 @@ -122,7 +122,7 @@ resource "aiven_service_integration_endpoint" "bar" { resource "aiven_service_integration" "bar" { project = data.aiven_project.foo.project - integration_type = "external_elasticsearch_logs" + integration_type = "external_opensearch_logs" source_service_name = aiven_pg.bar-pg.service_name destination_endpoint_id = aiven_service_integration_endpoint.bar.id } diff --git a/templates/guides/examples.md b/templates/guides/examples.md index dc49f0b6d..6f2794a9c 100644 --- a/templates/guides/examples.md +++ b/templates/guides/examples.md @@ -8,14 +8,14 @@ Other examples can be found in the [examples](https://github.com/aiven/terraform - [Getting Started](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/getting-started.tf) - [Account, projects, teams, and member management](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/account) -- [Elasticsearch deployment and configuration](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/elasticsearch) +- [OpenSearch deployment and configuration](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/opensearch) - [Standalone Kafka connect deployment with custom config](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_connect) - [Deploying a ClickHouse service](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/clickhouse) - [Deploying ClickHouse with a Kafka source integration](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/clickhouse_integrations/kafka_source) - [Deploying ClickHouse with a PostgreSQL source integration](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/clickhouse_integrations/postgres_source) - [Deploying Kafka with a Prometheus Service Integration](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_prometheus) -- [Deploying Kafka and Elasticsearch with a Kafka Connect Elasticsearch Sink connector](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_connectors/es_sink) -- [Deploying Kafka and Elasticsearch with a Kafka Connect Mongo Sink connector](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_connectors/mongo_sink) +- [Deploying Kafka and OpenSearch with a Kafka Connect OpenSearch Sink connector](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_connectors/os_sink) +- [Deploying Kafka with a Kafka Connect Mongo Sink connector](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_connectors/mongo_sink) - [Deploying Kafka with Schema Registry enabled and providing a schema](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/kafka_schemas) - [Deploying Cassandra and forking (cloning the service, config and data) into a new service with a higher plan](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/cassandra_fork) - [Deploying a Grafana service](https://github.com/aiven/terraform-provider-aiven/tree/master/examples/service) diff --git a/templates/guides/syslog-service-integration.md b/templates/guides/syslog-service-integration.md index d00d484b4..9d0ad1b3b 100644 --- a/templates/guides/syslog-service-integration.md +++ b/templates/guides/syslog-service-integration.md @@ -3,7 +3,7 @@ page_title: "Creating a Syslog Service Integration" --- # Creating a Syslog Service Integration -Let's say you have a project in your account and a Kafka service that is throwing all sorts of errors. The Aiven web console has logs built in, you cry! Sure, but you likely need the search power of Elasticsearch or the power of logging services, such as Datadog or Rsyslog servers. +Let's say you have a project in your account and a Kafka service that is throwing all sorts of errors. The Aiven web console has logs built in, you cry! Sure, but you likely need the search power of OpenSearch or the power of logging services, such as Datadog or Rsyslog servers. In Terraform, we support adding these service integrations and it can be broken down into 2 steps: From 5a2bfcd0fbd773e0d73f039dedeef66a494e8691 Mon Sep 17 00:00:00 2001 From: Aleksander Zaruczewski Date: Tue, 13 Feb 2024 17:38:35 +0200 Subject: [PATCH 3/3] docs(kafka): use v3.5 in examples/etc --- docs/resources/kafka.md | 2 +- examples/kafka_connectors/mongo_sink/services.tf | 2 +- examples/kafka_connectors/os_sink/services.tf | 2 +- examples/kafka_mirrormaker/kafka.tf | 4 ++-- examples/kafka_mirrormaker_bidirectional/kafka.tf | 4 ++-- examples/kafka_mirrormaker_global/kafka.tf | 6 +++--- examples/kafka_prometheus/services.tf | 2 +- examples/kafka_schemas/kafka_service.tf | 2 +- examples/resources/aiven_kafka/resource.tf | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/resources/kafka.md b/docs/resources/kafka.md index d8185743c..15cde9c0d 100644 --- a/docs/resources/kafka.md +++ b/docs/resources/kafka.md @@ -25,7 +25,7 @@ resource "aiven_kafka" "kafka1" { kafka_rest = true kafka_connect = true schema_registry = true - kafka_version = "3.1" + kafka_version = "3.5" kafka { group_max_session_timeout_ms = 70000 diff --git a/examples/kafka_connectors/mongo_sink/services.tf b/examples/kafka_connectors/mongo_sink/services.tf index 8c4f0f9ac..bcabdcd3e 100644 --- a/examples/kafka_connectors/mongo_sink/services.tf +++ b/examples/kafka_connectors/mongo_sink/services.tf @@ -8,7 +8,7 @@ resource "aiven_kafka" "kafka-service1" { maintenance_window_time = "10:00:00" kafka_user_config { - kafka_version = "2.4" + kafka_version = "3.5" // Enables Kafka Connectors kafka_connect = true diff --git a/examples/kafka_connectors/os_sink/services.tf b/examples/kafka_connectors/os_sink/services.tf index e01de6dd8..92dd28e5e 100644 --- a/examples/kafka_connectors/os_sink/services.tf +++ b/examples/kafka_connectors/os_sink/services.tf @@ -9,7 +9,7 @@ resource "aiven_kafka" "kafka" { kafka_user_config { // Enables Kafka Connectors kafka_connect = true - kafka_version = "3.2" + kafka_version = "3.5" kafka { group_max_session_timeout_ms = 70000 diff --git a/examples/kafka_mirrormaker/kafka.tf b/examples/kafka_mirrormaker/kafka.tf index 7baf152a8..09ef07c49 100644 --- a/examples/kafka_mirrormaker/kafka.tf +++ b/examples/kafka_mirrormaker/kafka.tf @@ -7,7 +7,7 @@ resource "aiven_kafka" "source" { maintenance_window_time = "10:00:00" kafka_user_config { - kafka_version = "2.4" + kafka_version = "3.5" kafka { group_max_session_timeout_ms = 70000 log_retention_bytes = 1000000000 @@ -32,7 +32,7 @@ resource "aiven_kafka" "target" { maintenance_window_time = "10:00:00" kafka_user_config { - kafka_version = "2.4" + kafka_version = "3.5" kafka { group_max_session_timeout_ms = 70000 log_retention_bytes = 1000000000 diff --git a/examples/kafka_mirrormaker_bidirectional/kafka.tf b/examples/kafka_mirrormaker_bidirectional/kafka.tf index 2287c6dec..77858b76c 100644 --- a/examples/kafka_mirrormaker_bidirectional/kafka.tf +++ b/examples/kafka_mirrormaker_bidirectional/kafka.tf @@ -8,7 +8,7 @@ resource "aiven_kafka" "kafka-ue1" { service_name = "kafka-ue1" kafka_user_config { - kafka_version = "2.6" + kafka_version = "3.5" kafka_rest = "true" } } @@ -20,7 +20,7 @@ resource "aiven_kafka" "kafka-uw2" { service_name = "kafka-uw2" kafka_user_config { - kafka_version = "2.6" + kafka_version = "3.5" kafka_rest = "true" } } diff --git a/examples/kafka_mirrormaker_global/kafka.tf b/examples/kafka_mirrormaker_global/kafka.tf index b1ac2494c..f3dfc7845 100644 --- a/examples/kafka_mirrormaker_global/kafka.tf +++ b/examples/kafka_mirrormaker_global/kafka.tf @@ -8,7 +8,7 @@ resource "aiven_kafka" "kafka-syd" { service_name = "kafka-syd" kafka_user_config { - kafka_version = "2.6" + kafka_version = "3.5" kafka_rest = "true" } } @@ -20,7 +20,7 @@ resource "aiven_kafka" "kafka-use" { service_name = "kafka-us-east" kafka_user_config { - kafka_version = "2.6" + kafka_version = "3.5" kafka_rest = "true" } } @@ -32,7 +32,7 @@ resource "aiven_kafka" "kafka-usw" { service_name = "kafka-us-west" kafka_user_config { - kafka_version = "2.6" + kafka_version = "3.5" kafka_rest = "true" } } diff --git a/examples/kafka_prometheus/services.tf b/examples/kafka_prometheus/services.tf index 2855be332..697262246 100644 --- a/examples/kafka_prometheus/services.tf +++ b/examples/kafka_prometheus/services.tf @@ -10,7 +10,7 @@ resource "aiven_kafka" "kafka" { kafka_rest = true kafka_connect = true schema_registry = true - kafka_version = "3.2" + kafka_version = "3.5" public_access { kafka_rest = true diff --git a/examples/kafka_schemas/kafka_service.tf b/examples/kafka_schemas/kafka_service.tf index b6daa12d6..ac2d079d5 100644 --- a/examples/kafka_schemas/kafka_service.tf +++ b/examples/kafka_schemas/kafka_service.tf @@ -10,7 +10,7 @@ resource "aiven_kafka" "kafka-service1" { kafka_user_config { // Enables Kafka Schemas schema_registry = true - kafka_version = "2.4" + kafka_version = "3.5" kafka { group_max_session_timeout_ms = 70000 log_retention_bytes = 1000000000 diff --git a/examples/resources/aiven_kafka/resource.tf b/examples/resources/aiven_kafka/resource.tf index 3e9dd349f..58bd92d5a 100644 --- a/examples/resources/aiven_kafka/resource.tf +++ b/examples/resources/aiven_kafka/resource.tf @@ -10,7 +10,7 @@ resource "aiven_kafka" "kafka1" { kafka_rest = true kafka_connect = true schema_registry = true - kafka_version = "3.1" + kafka_version = "3.5" kafka { group_max_session_timeout_ms = 70000