pulumi-aiven 6.13.0a1709702245__py3-none-any.whl → 6.31.0a1736831339__py3-none-any.whl

pulumi_aiven/clickhouse.py

@@ -4,9 +4,14 @@
 
 import copy
 import warnings
+import sys
 import pulumi
 import pulumi.runtime
 from typing import Any, Mapping, Optional, Sequence, Union, overload
+if sys.version_info >= (3, 11):
+    from typing import NotRequired, TypedDict, TypeAlias
+else:
+    from typing_extensions import NotRequired, TypedDict, TypeAlias
 from . import _utilities
 from . import outputs
 from ._inputs import *
@@ -20,6 +25,7 @@ class ClickhouseArgs:
                  project: pulumi.Input[str],
                  service_name: pulumi.Input[str],
                  additional_disk_space: Optional[pulumi.Input[str]] = None,
+                 clickhouse: Optional[pulumi.Input['ClickhouseClickhouseArgs']] = None,
                  clickhouse_user_config: Optional[pulumi.Input['ClickhouseClickhouseUserConfigArgs']] = None,
                  cloud_name: Optional[pulumi.Input[str]] = None,
                  disk_space: Optional[pulumi.Input[str]] = None,
@@ -33,20 +39,21 @@ class ClickhouseArgs:
                  termination_protection: Optional[pulumi.Input[bool]] = None):
         """
         The set of arguments for constructing a Clickhouse resource.
-        :param pulumi.Input[str] plan: 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).
-        :param pulumi.Input[str] project: 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.
+        :param pulumi.Input[str] plan: 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 seen from the [Aiven pricing page](https://aiven.io/pricing).
+        :param pulumi.Input[str] project: The name of the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. Changing this property forces recreation of the resource.
         :param pulumi.Input[str] service_name: 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.
-        :param pulumi.Input[str] additional_disk_space: Additional disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
-        :param pulumi.Input['ClickhouseClickhouseUserConfigArgs'] clickhouse_user_config: Clickhouse user configurable settings
+        :param pulumi.Input[str] additional_disk_space: Add [disk storage](https://aiven.io/docs/platform/howto/add-storage-space) in increments of 30  GiB to scale your service. The maximum value depends on the service type and cloud provider. Removing additional storage causes the service nodes to go through a rolling restart and there might be a short downtime for services with no HA capabilities.
+        :param pulumi.Input['ClickhouseClickhouseArgs'] clickhouse: Values provided by the ClickHouse server.
+        :param pulumi.Input['ClickhouseClickhouseUserConfigArgs'] clickhouse_user_config: Clickhouse user configurable settings. **Warning:** There's no way to reset advanced configuration options to default. Options that you add cannot be removed later
         :param pulumi.Input[str] cloud_name: 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).
         :param pulumi.Input[str] disk_space: Service disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
         :param pulumi.Input[str] maintenance_window_dow: Day of week when maintenance operations should be performed. One monday, tuesday, wednesday, etc.
         :param pulumi.Input[str] maintenance_window_time: Time of day when maintenance operations should be performed. UTC time in HH:mm:ss format.
         :param pulumi.Input[str] project_vpc_id: 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.
         :param pulumi.Input[Sequence[pulumi.Input['ClickhouseServiceIntegrationArgs']]] service_integrations: Service integrations to specify when creating a service. Not applied after initial service creation
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] static_ips: Use static public IP addresses.
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] static_ips: 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
         :param pulumi.Input[Sequence[pulumi.Input['ClickhouseTagArgs']]] tags: Tags are key-value pairs that allow you to categorize services.
-        :param pulumi.Input[Sequence[pulumi.Input['ClickhouseTechEmailArgs']]] tech_emails: Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service instability.
+        :param pulumi.Input[Sequence[pulumi.Input['ClickhouseTechEmailArgs']]] tech_emails: The email addresses for [service contacts](https://aiven.io/docs/platform/howto/technical-emails), who will receive important alerts and updates about this service. You can also set email contacts at the project level.
         :param pulumi.Input[bool] termination_protection: 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.
         """
         pulumi.set(__self__, "plan", plan)
@@ -54,6 +61,8 @@ class ClickhouseArgs:
         pulumi.set(__self__, "service_name", service_name)
         if additional_disk_space is not None:
             pulumi.set(__self__, "additional_disk_space", additional_disk_space)
+        if clickhouse is not None:
+            pulumi.set(__self__, "clickhouse", clickhouse)
         if clickhouse_user_config is not None:
             pulumi.set(__self__, "clickhouse_user_config", clickhouse_user_config)
         if cloud_name is not None:
@@ -84,7 +93,7 @@ class ClickhouseArgs:
     @pulumi.getter
     def plan(self) -> pulumi.Input[str]:
         """
-        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).
+        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 seen from the [Aiven pricing page](https://aiven.io/pricing).
         """
         return pulumi.get(self, "plan")
 
@@ -96,7 +105,7 @@ class ClickhouseArgs:
     @pulumi.getter
     def project(self) -> pulumi.Input[str]:
         """
-        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.
+        The name of the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. Changing this property forces recreation of the resource.
         """
         return pulumi.get(self, "project")
 
@@ -120,7 +129,7 @@ class ClickhouseArgs:
     @pulumi.getter(name="additionalDiskSpace")
     def additional_disk_space(self) -> Optional[pulumi.Input[str]]:
         """
-        Additional disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
+        Add [disk storage](https://aiven.io/docs/platform/howto/add-storage-space) in increments of 30  GiB to scale your service. The maximum value depends on the service type and cloud provider. Removing additional storage causes the service nodes to go through a rolling restart and there might be a short downtime for services with no HA capabilities.
         """
         return pulumi.get(self, "additional_disk_space")
 
@@ -128,11 +137,23 @@ class ClickhouseArgs:
     def additional_disk_space(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "additional_disk_space", value)
 
+    @property
+    @pulumi.getter
+    def clickhouse(self) -> Optional[pulumi.Input['ClickhouseClickhouseArgs']]:
+        """
+        Values provided by the ClickHouse server.
+        """
+        return pulumi.get(self, "clickhouse")
+
+    @clickhouse.setter
+    def clickhouse(self, value: Optional[pulumi.Input['ClickhouseClickhouseArgs']]):
+        pulumi.set(self, "clickhouse", value)
+
     @property
     @pulumi.getter(name="clickhouseUserConfig")
     def clickhouse_user_config(self) -> Optional[pulumi.Input['ClickhouseClickhouseUserConfigArgs']]:
         """
-        Clickhouse user configurable settings
+        Clickhouse user configurable settings. **Warning:** There's no way to reset advanced configuration options to default. Options that you add cannot be removed later
         """
         return pulumi.get(self, "clickhouse_user_config")
 
@@ -154,13 +175,11 @@ class ClickhouseArgs:
 
     @property
     @pulumi.getter(name="diskSpace")
+    @_utilities.deprecated("""This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""")
     def disk_space(self) -> Optional[pulumi.Input[str]]:
         """
         Service disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
         """
-        warnings.warn("""This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""", DeprecationWarning)
-        pulumi.log.warn("""disk_space is deprecated: This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""")
-
         return pulumi.get(self, "disk_space")
 
     @disk_space.setter
@@ -219,7 +238,7 @@ class ClickhouseArgs:
     @pulumi.getter(name="staticIps")
     def static_ips(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
-        Use static public IP addresses.
+        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
         """
         return pulumi.get(self, "static_ips")
 
@@ -243,7 +262,7 @@ class ClickhouseArgs:
     @pulumi.getter(name="techEmails")
     def tech_emails(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['ClickhouseTechEmailArgs']]]]:
         """
-        Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service instability.
+        The email addresses for [service contacts](https://aiven.io/docs/platform/howto/technical-emails), who will receive important alerts and updates about this service. You can also set email contacts at the project level.
         """
         return pulumi.get(self, "tech_emails")
 
@@ -268,8 +287,8 @@ class ClickhouseArgs:
 class _ClickhouseState:
     def __init__(__self__, *,
                  additional_disk_space: Optional[pulumi.Input[str]] = None,
+                 clickhouse: Optional[pulumi.Input['ClickhouseClickhouseArgs']] = None,
                  clickhouse_user_config: Optional[pulumi.Input['ClickhouseClickhouseUserConfigArgs']] = None,
-                 clickhouses: Optional[pulumi.Input[Sequence[pulumi.Input['ClickhouseClickhouseArgs']]]] = None,
                  cloud_name: Optional[pulumi.Input[str]] = None,
                  components: Optional[pulumi.Input[Sequence[pulumi.Input['ClickhouseComponentArgs']]]] = None,
                  disk_space: Optional[pulumi.Input[str]] = None,
@@ -297,9 +316,9 @@ class _ClickhouseState:
                  termination_protection: Optional[pulumi.Input[bool]] = None):
         """
         Input properties used for looking up and filtering Clickhouse resources.
-        :param pulumi.Input[str] additional_disk_space: Additional disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
-        :param pulumi.Input['ClickhouseClickhouseUserConfigArgs'] clickhouse_user_config: Clickhouse user configurable settings
-        :param pulumi.Input[Sequence[pulumi.Input['ClickhouseClickhouseArgs']]] clickhouses: Allow clients to connect to clickhouse with a DNS name that always resolves to the service's private IP addresses. Only available in certain network locations.
+        :param pulumi.Input[str] additional_disk_space: Add [disk storage](https://aiven.io/docs/platform/howto/add-storage-space) in increments of 30  GiB to scale your service. The maximum value depends on the service type and cloud provider. Removing additional storage causes the service nodes to go through a rolling restart and there might be a short downtime for services with no HA capabilities.
+        :param pulumi.Input['ClickhouseClickhouseArgs'] clickhouse: Values provided by the ClickHouse server.
+        :param pulumi.Input['ClickhouseClickhouseUserConfigArgs'] clickhouse_user_config: Clickhouse user configurable settings. **Warning:** There's no way to reset advanced configuration options to default. Options that you add cannot be removed later
         :param pulumi.Input[str] cloud_name: 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).
         :param pulumi.Input[Sequence[pulumi.Input['ClickhouseComponentArgs']]] components: Service component information objects
         :param pulumi.Input[str] disk_space: Service disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
@@ -309,8 +328,8 @@ class _ClickhouseState:
         :param pulumi.Input[str] disk_space_used: Disk space that service is currently using
         :param pulumi.Input[str] maintenance_window_dow: Day of week when maintenance operations should be performed. One monday, tuesday, wednesday, etc.
         :param pulumi.Input[str] maintenance_window_time: Time of day when maintenance operations should be performed. UTC time in HH:mm:ss format.
-        :param pulumi.Input[str] plan: 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).
-        :param pulumi.Input[str] project: 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.
+        :param pulumi.Input[str] plan: 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 seen from the [Aiven pricing page](https://aiven.io/pricing).
+        :param pulumi.Input[str] project: The name of the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. Changing this property forces recreation of the resource.
         :param pulumi.Input[str] project_vpc_id: 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.
         :param pulumi.Input[str] service_host: The hostname of the service.
         :param pulumi.Input[Sequence[pulumi.Input['ClickhouseServiceIntegrationArgs']]] service_integrations: Service integrations to specify when creating a service. Not applied after initial service creation
@@ -321,17 +340,17 @@ class _ClickhouseState:
         :param pulumi.Input[str] service_uri: URI for connecting to the service. Service specific info is under "kafka", "pg", etc.
         :param pulumi.Input[str] service_username: Username used for connecting to the service, if applicable
         :param pulumi.Input[str] state: Service state. One of `POWEROFF`, `REBALANCING`, `REBUILDING` or `RUNNING`
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] static_ips: Use static public IP addresses.
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] static_ips: 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
         :param pulumi.Input[Sequence[pulumi.Input['ClickhouseTagArgs']]] tags: Tags are key-value pairs that allow you to categorize services.
-        :param pulumi.Input[Sequence[pulumi.Input['ClickhouseTechEmailArgs']]] tech_emails: Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service instability.
+        :param pulumi.Input[Sequence[pulumi.Input['ClickhouseTechEmailArgs']]] tech_emails: The email addresses for [service contacts](https://aiven.io/docs/platform/howto/technical-emails), who will receive important alerts and updates about this service. You can also set email contacts at the project level.
         :param pulumi.Input[bool] termination_protection: 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.
         """
         if additional_disk_space is not None:
             pulumi.set(__self__, "additional_disk_space", additional_disk_space)
+        if clickhouse is not None:
+            pulumi.set(__self__, "clickhouse", clickhouse)
         if clickhouse_user_config is not None:
             pulumi.set(__self__, "clickhouse_user_config", clickhouse_user_config)
-        if clickhouses is not None:
-            pulumi.set(__self__, "clickhouses", clickhouses)
         if cloud_name is not None:
             pulumi.set(__self__, "cloud_name", cloud_name)
         if components is not None:
@@ -347,6 +366,9 @@ class _ClickhouseState:
             pulumi.set(__self__, "disk_space_default", disk_space_default)
         if disk_space_step is not None:
             pulumi.set(__self__, "disk_space_step", disk_space_step)
+        if disk_space_used is not None:
+            warnings.warn("""This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""", DeprecationWarning)
+            pulumi.log.warn("""disk_space_used is deprecated: This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""")
         if disk_space_used is not None:
             pulumi.set(__self__, "disk_space_used", disk_space_used)
         if maintenance_window_dow is not None:
@@ -390,7 +412,7 @@ class _ClickhouseState:
     @pulumi.getter(name="additionalDiskSpace")
     def additional_disk_space(self) -> Optional[pulumi.Input[str]]:
         """
-        Additional disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
+        Add [disk storage](https://aiven.io/docs/platform/howto/add-storage-space) in increments of 30  GiB to scale your service. The maximum value depends on the service type and cloud provider. Removing additional storage causes the service nodes to go through a rolling restart and there might be a short downtime for services with no HA capabilities.
         """
         return pulumi.get(self, "additional_disk_space")
 
@@ -398,11 +420,23 @@ class _ClickhouseState:
     def additional_disk_space(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "additional_disk_space", value)
 
+    @property
+    @pulumi.getter
+    def clickhouse(self) -> Optional[pulumi.Input['ClickhouseClickhouseArgs']]:
+        """
+        Values provided by the ClickHouse server.
+        """
+        return pulumi.get(self, "clickhouse")
+
+    @clickhouse.setter
+    def clickhouse(self, value: Optional[pulumi.Input['ClickhouseClickhouseArgs']]):
+        pulumi.set(self, "clickhouse", value)
+
     @property
     @pulumi.getter(name="clickhouseUserConfig")
     def clickhouse_user_config(self) -> Optional[pulumi.Input['ClickhouseClickhouseUserConfigArgs']]:
         """
-        Clickhouse user configurable settings
+        Clickhouse user configurable settings. **Warning:** There's no way to reset advanced configuration options to default. Options that you add cannot be removed later
         """
         return pulumi.get(self, "clickhouse_user_config")
 
@@ -410,18 +444,6 @@ class _ClickhouseState:
     def clickhouse_user_config(self, value: Optional[pulumi.Input['ClickhouseClickhouseUserConfigArgs']]):
         pulumi.set(self, "clickhouse_user_config", value)
 
-    @property
-    @pulumi.getter
-    def clickhouses(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['ClickhouseClickhouseArgs']]]]:
-        """
-        Allow clients to connect to clickhouse with a DNS name that always resolves to the service's private IP addresses. Only available in certain network locations.
-        """
-        return pulumi.get(self, "clickhouses")
-
-    @clickhouses.setter
-    def clickhouses(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['ClickhouseClickhouseArgs']]]]):
-        pulumi.set(self, "clickhouses", value)
-
     @property
     @pulumi.getter(name="cloudName")
     def cloud_name(self) -> Optional[pulumi.Input[str]]:
@@ -448,13 +470,11 @@ class _ClickhouseState:
 
     @property
     @pulumi.getter(name="diskSpace")
+    @_utilities.deprecated("""This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""")
     def disk_space(self) -> Optional[pulumi.Input[str]]:
         """
         Service disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
         """
-        warnings.warn("""This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""", DeprecationWarning)
-        pulumi.log.warn("""disk_space is deprecated: This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""")
-
         return pulumi.get(self, "disk_space")
 
     @disk_space.setter
@@ -499,6 +519,7 @@ class _ClickhouseState:
 
     @property
     @pulumi.getter(name="diskSpaceUsed")
+    @_utilities.deprecated("""This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""")
     def disk_space_used(self) -> Optional[pulumi.Input[str]]:
         """
         Disk space that service is currently using
@@ -537,7 +558,7 @@ class _ClickhouseState:
     @pulumi.getter
     def plan(self) -> Optional[pulumi.Input[str]]:
         """
-        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).
+        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 seen from the [Aiven pricing page](https://aiven.io/pricing).
         """
         return pulumi.get(self, "plan")
 
@@ -549,7 +570,7 @@ class _ClickhouseState:
     @pulumi.getter
     def project(self) -> Optional[pulumi.Input[str]]:
         """
-        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.
+        The name of the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. Changing this property forces recreation of the resource.
         """
         return pulumi.get(self, "project")
 
@@ -681,7 +702,7 @@ class _ClickhouseState:
     @pulumi.getter(name="staticIps")
     def static_ips(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
-        Use static public IP addresses.
+        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
         """
         return pulumi.get(self, "static_ips")
 
@@ -705,7 +726,7 @@ class _ClickhouseState:
     @pulumi.getter(name="techEmails")
     def tech_emails(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['ClickhouseTechEmailArgs']]]]:
         """
-        Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service instability.
+        The email addresses for [service contacts](https://aiven.io/docs/platform/howto/technical-emails), who will receive important alerts and updates about this service. You can also set email contacts at the project level.
         """
         return pulumi.get(self, "tech_emails")
 
@@ -732,7 +753,8 @@ class Clickhouse(pulumi.CustomResource):
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  additional_disk_space: Optional[pulumi.Input[str]] = None,
-                 clickhouse_user_config: Optional[pulumi.Input[pulumi.InputType['ClickhouseClickhouseUserConfigArgs']]] = None,
+                 clickhouse: Optional[pulumi.Input[Union['ClickhouseClickhouseArgs', 'ClickhouseClickhouseArgsDict']]] = None,
+                 clickhouse_user_config: Optional[pulumi.Input[Union['ClickhouseClickhouseUserConfigArgs', 'ClickhouseClickhouseUserConfigArgsDict']]] = None,
                  cloud_name: Optional[pulumi.Input[str]] = None,
                  disk_space: Optional[pulumi.Input[str]] = None,
                  maintenance_window_dow: Optional[pulumi.Input[str]] = None,
@@ -740,15 +762,15 @@ class Clickhouse(pulumi.CustomResource):
                  plan: Optional[pulumi.Input[str]] = None,
                  project: Optional[pulumi.Input[str]] = None,
                  project_vpc_id: Optional[pulumi.Input[str]] = None,
-                 service_integrations: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseServiceIntegrationArgs']]]]] = None,
+                 service_integrations: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseServiceIntegrationArgs', 'ClickhouseServiceIntegrationArgsDict']]]]] = None,
                  service_name: Optional[pulumi.Input[str]] = None,
                  static_ips: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
-                 tags: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseTagArgs']]]]] = None,
-                 tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseTechEmailArgs']]]]] = None,
+                 tags: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseTagArgs', 'ClickhouseTagArgsDict']]]]] = None,
+                 tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseTechEmailArgs', 'ClickhouseTechEmailArgsDict']]]]] = None,
                  termination_protection: Optional[pulumi.Input[bool]] = None,
                  __props__=None):
         """
-        The Clickhouse resource allows the creation and management of Aiven Clickhouse services.
+        Creates and manages an [Aiven for ClickHouse®](https://aiven.io/docs/products/clickhouse/concepts/features-overview) service.
 
         ## Example Usage
 
@@ -756,11 +778,11 @@ class Clickhouse(pulumi.CustomResource):
         import pulumi
         import pulumi_aiven as aiven
 
-        clickhouse = aiven.Clickhouse("clickhouse",
-            project=data["aiven_project"]["pr1"]["project"],
+        example_clickhouse = aiven.Clickhouse("example_clickhouse",
+            project=example_project["project"],
             cloud_name="google-europe-west1",
             plan="business-4",
-            service_name="my-clickhouse",
+            service_name="example-clickhouse-service",
             maintenance_window_dow="monday",
             maintenance_window_time="10:00:00")
         ```
@@ -768,25 +790,26 @@ class Clickhouse(pulumi.CustomResource):
         ## Import
 
         ```sh
-         $ pulumi import aiven:index/clickhouse:Clickhouse clickhouse project/service_name
+        $ pulumi import aiven:index/clickhouse:Clickhouse clickhouse PROJECT/SERVICE_NAME
         ```
 
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
-        :param pulumi.Input[str] additional_disk_space: Additional disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
-        :param pulumi.Input[pulumi.InputType['ClickhouseClickhouseUserConfigArgs']] clickhouse_user_config: Clickhouse user configurable settings
+        :param pulumi.Input[str] additional_disk_space: Add [disk storage](https://aiven.io/docs/platform/howto/add-storage-space) in increments of 30  GiB to scale your service. The maximum value depends on the service type and cloud provider. Removing additional storage causes the service nodes to go through a rolling restart and there might be a short downtime for services with no HA capabilities.
+        :param pulumi.Input[Union['ClickhouseClickhouseArgs', 'ClickhouseClickhouseArgsDict']] clickhouse: Values provided by the ClickHouse server.
+        :param pulumi.Input[Union['ClickhouseClickhouseUserConfigArgs', 'ClickhouseClickhouseUserConfigArgsDict']] clickhouse_user_config: Clickhouse user configurable settings. **Warning:** There's no way to reset advanced configuration options to default. Options that you add cannot be removed later
         :param pulumi.Input[str] cloud_name: 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).
         :param pulumi.Input[str] disk_space: Service disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
         :param pulumi.Input[str] maintenance_window_dow: Day of week when maintenance operations should be performed. One monday, tuesday, wednesday, etc.
         :param pulumi.Input[str] maintenance_window_time: Time of day when maintenance operations should be performed. UTC time in HH:mm:ss format.
-        :param pulumi.Input[str] plan: 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).
-        :param pulumi.Input[str] project: 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.
+        :param pulumi.Input[str] plan: 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 seen from the [Aiven pricing page](https://aiven.io/pricing).
+        :param pulumi.Input[str] project: The name of the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. Changing this property forces recreation of the resource.
         :param pulumi.Input[str] project_vpc_id: 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.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseServiceIntegrationArgs']]]] service_integrations: Service integrations to specify when creating a service. Not applied after initial service creation
+        :param pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseServiceIntegrationArgs', 'ClickhouseServiceIntegrationArgsDict']]]] service_integrations: Service integrations to specify when creating a service. Not applied after initial service creation
         :param pulumi.Input[str] service_name: 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.
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] static_ips: Use static public IP addresses.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseTagArgs']]]] tags: Tags are key-value pairs that allow you to categorize services.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseTechEmailArgs']]]] tech_emails: Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service instability.
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] static_ips: 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
+        :param pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseTagArgs', 'ClickhouseTagArgsDict']]]] tags: Tags are key-value pairs that allow you to categorize services.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseTechEmailArgs', 'ClickhouseTechEmailArgsDict']]]] tech_emails: The email addresses for [service contacts](https://aiven.io/docs/platform/howto/technical-emails), who will receive important alerts and updates about this service. You can also set email contacts at the project level.
         :param pulumi.Input[bool] termination_protection: 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.
         """
         ...
@@ -796,7 +819,7 @@ class Clickhouse(pulumi.CustomResource):
                  args: ClickhouseArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
-        The Clickhouse resource allows the creation and management of Aiven Clickhouse services.
+        Creates and manages an [Aiven for ClickHouse®](https://aiven.io/docs/products/clickhouse/concepts/features-overview) service.
 
         ## Example Usage
 
@@ -804,11 +827,11 @@ class Clickhouse(pulumi.CustomResource):
         import pulumi
         import pulumi_aiven as aiven
 
-        clickhouse = aiven.Clickhouse("clickhouse",
-            project=data["aiven_project"]["pr1"]["project"],
+        example_clickhouse = aiven.Clickhouse("example_clickhouse",
+            project=example_project["project"],
             cloud_name="google-europe-west1",
             plan="business-4",
-            service_name="my-clickhouse",
+            service_name="example-clickhouse-service",
             maintenance_window_dow="monday",
             maintenance_window_time="10:00:00")
         ```
@@ -816,7 +839,7 @@ class Clickhouse(pulumi.CustomResource):
         ## Import
 
         ```sh
-         $ pulumi import aiven:index/clickhouse:Clickhouse clickhouse project/service_name
+        $ pulumi import aiven:index/clickhouse:Clickhouse clickhouse PROJECT/SERVICE_NAME
         ```
 
         :param str resource_name: The name of the resource.
@@ -835,7 +858,8 @@ class Clickhouse(pulumi.CustomResource):
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
                  additional_disk_space: Optional[pulumi.Input[str]] = None,
-                 clickhouse_user_config: Optional[pulumi.Input[pulumi.InputType['ClickhouseClickhouseUserConfigArgs']]] = None,
+                 clickhouse: Optional[pulumi.Input[Union['ClickhouseClickhouseArgs', 'ClickhouseClickhouseArgsDict']]] = None,
+                 clickhouse_user_config: Optional[pulumi.Input[Union['ClickhouseClickhouseUserConfigArgs', 'ClickhouseClickhouseUserConfigArgsDict']]] = None,
                  cloud_name: Optional[pulumi.Input[str]] = None,
                  disk_space: Optional[pulumi.Input[str]] = None,
                  maintenance_window_dow: Optional[pulumi.Input[str]] = None,
@@ -843,11 +867,11 @@ class Clickhouse(pulumi.CustomResource):
                  plan: Optional[pulumi.Input[str]] = None,
                  project: Optional[pulumi.Input[str]] = None,
                  project_vpc_id: Optional[pulumi.Input[str]] = None,
-                 service_integrations: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseServiceIntegrationArgs']]]]] = None,
+                 service_integrations: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseServiceIntegrationArgs', 'ClickhouseServiceIntegrationArgsDict']]]]] = None,
                  service_name: Optional[pulumi.Input[str]] = None,
                  static_ips: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
-                 tags: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseTagArgs']]]]] = None,
-                 tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseTechEmailArgs']]]]] = None,
+                 tags: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseTagArgs', 'ClickhouseTagArgsDict']]]]] = None,
+                 tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseTechEmailArgs', 'ClickhouseTechEmailArgsDict']]]]] = None,
                  termination_protection: Optional[pulumi.Input[bool]] = None,
                  __props__=None):
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
@@ -859,6 +883,7 @@ class Clickhouse(pulumi.CustomResource):
             __props__ = ClickhouseArgs.__new__(ClickhouseArgs)
 
             __props__.__dict__["additional_disk_space"] = additional_disk_space
+            __props__.__dict__["clickhouse"] = None if clickhouse is None else pulumi.Output.secret(clickhouse)
             __props__.__dict__["clickhouse_user_config"] = clickhouse_user_config
             __props__.__dict__["cloud_name"] = cloud_name
             __props__.__dict__["disk_space"] = disk_space
@@ -879,7 +904,6 @@ class Clickhouse(pulumi.CustomResource):
             __props__.__dict__["tags"] = tags
             __props__.__dict__["tech_emails"] = tech_emails
             __props__.__dict__["termination_protection"] = termination_protection
-            __props__.__dict__["clickhouses"] = None
             __props__.__dict__["components"] = None
             __props__.__dict__["disk_space_cap"] = None
             __props__.__dict__["disk_space_default"] = None
@@ -892,7 +916,7 @@ class Clickhouse(pulumi.CustomResource):
             __props__.__dict__["service_uri"] = None
             __props__.__dict__["service_username"] = None
             __props__.__dict__["state"] = None
-        secret_opts = pulumi.ResourceOptions(additional_secret_outputs=["servicePassword", "serviceUri"])
+        secret_opts = pulumi.ResourceOptions(additional_secret_outputs=["clickhouse", "servicePassword", "serviceUri"])
         opts = pulumi.ResourceOptions.merge(opts, secret_opts)
         super(Clickhouse, __self__).__init__(
             'aiven:index/clickhouse:Clickhouse',
@@ -905,10 +929,10 @@ class Clickhouse(pulumi.CustomResource):
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
             additional_disk_space: Optional[pulumi.Input[str]] = None,
-            clickhouse_user_config: Optional[pulumi.Input[pulumi.InputType['ClickhouseClickhouseUserConfigArgs']]] = None,
-            clickhouses: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseClickhouseArgs']]]]] = None,
+            clickhouse: Optional[pulumi.Input[Union['ClickhouseClickhouseArgs', 'ClickhouseClickhouseArgsDict']]] = None,
+            clickhouse_user_config: Optional[pulumi.Input[Union['ClickhouseClickhouseUserConfigArgs', 'ClickhouseClickhouseUserConfigArgsDict']]] = None,
             cloud_name: Optional[pulumi.Input[str]] = None,
-            components: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseComponentArgs']]]]] = None,
+            components: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseComponentArgs', 'ClickhouseComponentArgsDict']]]]] = None,
             disk_space: Optional[pulumi.Input[str]] = None,
             disk_space_cap: Optional[pulumi.Input[str]] = None,
             disk_space_default: Optional[pulumi.Input[str]] = None,
@@ -920,7 +944,7 @@ class Clickhouse(pulumi.CustomResource):
             project: Optional[pulumi.Input[str]] = None,
             project_vpc_id: Optional[pulumi.Input[str]] = None,
             service_host: Optional[pulumi.Input[str]] = None,
-            service_integrations: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseServiceIntegrationArgs']]]]] = None,
+            service_integrations: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseServiceIntegrationArgs', 'ClickhouseServiceIntegrationArgsDict']]]]] = None,
             service_name: Optional[pulumi.Input[str]] = None,
             service_password: Optional[pulumi.Input[str]] = None,
             service_port: Optional[pulumi.Input[int]] = None,
@@ -929,8 +953,8 @@ class Clickhouse(pulumi.CustomResource):
             service_username: Optional[pulumi.Input[str]] = None,
             state: Optional[pulumi.Input[str]] = None,
             static_ips: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
-            tags: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseTagArgs']]]]] = None,
-            tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseTechEmailArgs']]]]] = None,
+            tags: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseTagArgs', 'ClickhouseTagArgsDict']]]]] = None,
+            tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseTechEmailArgs', 'ClickhouseTechEmailArgsDict']]]]] = None,
             termination_protection: Optional[pulumi.Input[bool]] = None) -> 'Clickhouse':
         """
         Get an existing Clickhouse resource's state with the given name, id, and optional extra
@@ -939,11 +963,11 @@ class Clickhouse(pulumi.CustomResource):
         :param str resource_name: The unique name of the resulting resource.
         :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
         :param pulumi.ResourceOptions opts: Options for the resource.
-        :param pulumi.Input[str] additional_disk_space: Additional disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
-        :param pulumi.Input[pulumi.InputType['ClickhouseClickhouseUserConfigArgs']] clickhouse_user_config: Clickhouse user configurable settings
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseClickhouseArgs']]]] clickhouses: Allow clients to connect to clickhouse with a DNS name that always resolves to the service's private IP addresses. Only available in certain network locations.
+        :param pulumi.Input[str] additional_disk_space: Add [disk storage](https://aiven.io/docs/platform/howto/add-storage-space) in increments of 30  GiB to scale your service. The maximum value depends on the service type and cloud provider. Removing additional storage causes the service nodes to go through a rolling restart and there might be a short downtime for services with no HA capabilities.
+        :param pulumi.Input[Union['ClickhouseClickhouseArgs', 'ClickhouseClickhouseArgsDict']] clickhouse: Values provided by the ClickHouse server.
+        :param pulumi.Input[Union['ClickhouseClickhouseUserConfigArgs', 'ClickhouseClickhouseUserConfigArgsDict']] clickhouse_user_config: Clickhouse user configurable settings. **Warning:** There's no way to reset advanced configuration options to default. Options that you add cannot be removed later
         :param pulumi.Input[str] cloud_name: 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).
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseComponentArgs']]]] components: Service component information objects
+        :param pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseComponentArgs', 'ClickhouseComponentArgsDict']]]] components: Service component information objects
         :param pulumi.Input[str] disk_space: Service disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
         :param pulumi.Input[str] disk_space_cap: The maximum disk space of the service, possible values depend on the service type, the cloud provider and the project.
         :param pulumi.Input[str] disk_space_default: 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`
@@ -951,11 +975,11 @@ class Clickhouse(pulumi.CustomResource):
         :param pulumi.Input[str] disk_space_used: Disk space that service is currently using
         :param pulumi.Input[str] maintenance_window_dow: Day of week when maintenance operations should be performed. One monday, tuesday, wednesday, etc.
         :param pulumi.Input[str] maintenance_window_time: Time of day when maintenance operations should be performed. UTC time in HH:mm:ss format.
-        :param pulumi.Input[str] plan: 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).
-        :param pulumi.Input[str] project: 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.
+        :param pulumi.Input[str] plan: 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 seen from the [Aiven pricing page](https://aiven.io/pricing).
+        :param pulumi.Input[str] project: The name of the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. Changing this property forces recreation of the resource.
         :param pulumi.Input[str] project_vpc_id: 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.
         :param pulumi.Input[str] service_host: The hostname of the service.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseServiceIntegrationArgs']]]] service_integrations: Service integrations to specify when creating a service. Not applied after initial service creation
+        :param pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseServiceIntegrationArgs', 'ClickhouseServiceIntegrationArgsDict']]]] service_integrations: Service integrations to specify when creating a service. Not applied after initial service creation
         :param pulumi.Input[str] service_name: 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.
         :param pulumi.Input[str] service_password: Password used for connecting to the service, if applicable
         :param pulumi.Input[int] service_port: The port of the service
@@ -963,9 +987,9 @@ class Clickhouse(pulumi.CustomResource):
         :param pulumi.Input[str] service_uri: URI for connecting to the service. Service specific info is under "kafka", "pg", etc.
         :param pulumi.Input[str] service_username: Username used for connecting to the service, if applicable
         :param pulumi.Input[str] state: Service state. One of `POWEROFF`, `REBALANCING`, `REBUILDING` or `RUNNING`
-        :param pulumi.Input[Sequence[pulumi.Input[str]]] static_ips: Use static public IP addresses.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseTagArgs']]]] tags: Tags are key-value pairs that allow you to categorize services.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ClickhouseTechEmailArgs']]]] tech_emails: Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service instability.
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] static_ips: 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
+        :param pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseTagArgs', 'ClickhouseTagArgsDict']]]] tags: Tags are key-value pairs that allow you to categorize services.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['ClickhouseTechEmailArgs', 'ClickhouseTechEmailArgsDict']]]] tech_emails: The email addresses for [service contacts](https://aiven.io/docs/platform/howto/technical-emails), who will receive important alerts and updates about this service. You can also set email contacts at the project level.
         :param pulumi.Input[bool] termination_protection: 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.
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
@@ -973,8 +997,8 @@ class Clickhouse(pulumi.CustomResource):
         __props__ = _ClickhouseState.__new__(_ClickhouseState)
 
         __props__.__dict__["additional_disk_space"] = additional_disk_space
+        __props__.__dict__["clickhouse"] = clickhouse
         __props__.__dict__["clickhouse_user_config"] = clickhouse_user_config
-        __props__.__dict__["clickhouses"] = clickhouses
         __props__.__dict__["cloud_name"] = cloud_name
         __props__.__dict__["components"] = components
         __props__.__dict__["disk_space"] = disk_space
@@ -1004,27 +1028,27 @@ class Clickhouse(pulumi.CustomResource):
 
     @property
     @pulumi.getter(name="additionalDiskSpace")
-    def additional_disk_space(self) -> pulumi.Output[Optional[str]]:
+    def additional_disk_space(self) -> pulumi.Output[str]:
         """
-        Additional disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
+        Add [disk storage](https://aiven.io/docs/platform/howto/add-storage-space) in increments of 30  GiB to scale your service. The maximum value depends on the service type and cloud provider. Removing additional storage causes the service nodes to go through a rolling restart and there might be a short downtime for services with no HA capabilities.
         """
         return pulumi.get(self, "additional_disk_space")
 
     @property
-    @pulumi.getter(name="clickhouseUserConfig")
-    def clickhouse_user_config(self) -> pulumi.Output[Optional['outputs.ClickhouseClickhouseUserConfig']]:
+    @pulumi.getter
+    def clickhouse(self) -> pulumi.Output['outputs.ClickhouseClickhouse']:
         """
-        Clickhouse user configurable settings
+        Values provided by the ClickHouse server.
         """
-        return pulumi.get(self, "clickhouse_user_config")
+        return pulumi.get(self, "clickhouse")
 
     @property
-    @pulumi.getter
-    def clickhouses(self) -> pulumi.Output[Sequence['outputs.ClickhouseClickhouse']]:
+    @pulumi.getter(name="clickhouseUserConfig")
+    def clickhouse_user_config(self) -> pulumi.Output[Optional['outputs.ClickhouseClickhouseUserConfig']]:
         """
-        Allow clients to connect to clickhouse with a DNS name that always resolves to the service's private IP addresses. Only available in certain network locations.
+        Clickhouse user configurable settings. **Warning:** There's no way to reset advanced configuration options to default. Options that you add cannot be removed later
         """
-        return pulumi.get(self, "clickhouses")
+        return pulumi.get(self, "clickhouse_user_config")
 
     @property
     @pulumi.getter(name="cloudName")
@@ -1044,13 +1068,11 @@ class Clickhouse(pulumi.CustomResource):
 
     @property
     @pulumi.getter(name="diskSpace")
+    @_utilities.deprecated("""This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""")
     def disk_space(self) -> pulumi.Output[Optional[str]]:
         """
         Service disk space. Possible values depend on the service type, the cloud provider and the project. Therefore, reducing will result in the service rebalancing.
         """
-        warnings.warn("""This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""", DeprecationWarning)
-        pulumi.log.warn("""disk_space is deprecated: This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""")
-
         return pulumi.get(self, "disk_space")
 
     @property
@@ -1079,6 +1101,7 @@ class Clickhouse(pulumi.CustomResource):
 
     @property
     @pulumi.getter(name="diskSpaceUsed")
+    @_utilities.deprecated("""This will be removed in v5.0.0. Please use `additional_disk_space` to specify the space to be added to the default `disk_space` defined by the plan.""")
     def disk_space_used(self) -> pulumi.Output[str]:
         """
         Disk space that service is currently using
@@ -1105,7 +1128,7 @@ class Clickhouse(pulumi.CustomResource):
     @pulumi.getter
     def plan(self) -> pulumi.Output[str]:
         """
-        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).
+        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 seen from the [Aiven pricing page](https://aiven.io/pricing).
         """
         return pulumi.get(self, "plan")
 
@@ -1113,13 +1136,13 @@ class Clickhouse(pulumi.CustomResource):
     @pulumi.getter
     def project(self) -> pulumi.Output[str]:
         """
-        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.
+        The name of the project this resource belongs to. To set up proper dependencies please refer to this variable as a reference. Changing this property forces recreation of the resource.
         """
         return pulumi.get(self, "project")
 
     @property
     @pulumi.getter(name="projectVpcId")
-    def project_vpc_id(self) -> pulumi.Output[Optional[str]]:
+    def project_vpc_id(self) -> pulumi.Output[str]:
         """
         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.
         """
@@ -1135,7 +1158,7 @@ class Clickhouse(pulumi.CustomResource):
 
     @property
     @pulumi.getter(name="serviceIntegrations")
-    def service_integrations(self) -> pulumi.Output[Optional[Sequence['outputs.ClickhouseServiceIntegration']]]:
+    def service_integrations(self) -> pulumi.Output[Sequence['outputs.ClickhouseServiceIntegration']]:
         """
         Service integrations to specify when creating a service. Not applied after initial service creation
         """
@@ -1201,7 +1224,7 @@ class Clickhouse(pulumi.CustomResource):
     @pulumi.getter(name="staticIps")
     def static_ips(self) -> pulumi.Output[Optional[Sequence[str]]]:
         """
-        Use static public IP addresses.
+        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
         """
         return pulumi.get(self, "static_ips")
 
@@ -1217,7 +1240,7 @@ class Clickhouse(pulumi.CustomResource):
     @pulumi.getter(name="techEmails")
     def tech_emails(self) -> pulumi.Output[Optional[Sequence['outputs.ClickhouseTechEmail']]]:
         """
-        Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service instability.
+        The email addresses for [service contacts](https://aiven.io/docs/platform/howto/technical-emails), who will receive important alerts and updates about this service. You can also set email contacts at the project level.
         """
         return pulumi.get(self, "tech_emails")