pulumi-aiven 6.13.0a1710156545__py3-none-any.whl → 6.31.0a1736849214__py3-none-any.whl

pulumi_aiven/grafana.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 *
@@ -21,6 +26,7 @@ class GrafanaArgs:
                  additional_disk_space: Optional[pulumi.Input[str]] = None,
                  cloud_name: Optional[pulumi.Input[str]] = None,
                  disk_space: Optional[pulumi.Input[str]] = None,
+                 grafana: Optional[pulumi.Input['GrafanaGrafanaArgs']] = None,
                  grafana_user_config: Optional[pulumi.Input['GrafanaGrafanaUserConfigArgs']] = None,
                  maintenance_window_dow: Optional[pulumi.Input[str]] = None,
                  maintenance_window_time: Optional[pulumi.Input[str]] = None,
@@ -33,42 +39,22 @@ class GrafanaArgs:
                  termination_protection: Optional[pulumi.Input[bool]] = None):
         """
         The set of arguments for constructing a Grafana 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] 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[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['GrafanaGrafanaUserConfigArgs'] grafana_user_config: Grafana user configurable settings
+        :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] 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[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['GrafanaGrafanaArgs'] grafana: Values provided by the Grafana server.
+        :param pulumi.Input['GrafanaGrafanaUserConfigArgs'] grafana_user_config: Grafana 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] 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[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['GrafanaServiceIntegrationArgs']]] 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: 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[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: 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['GrafanaTagArgs']]] tags: Tags are key-value pairs that allow you to categorize services.
-        :param pulumi.Input[Sequence[pulumi.Input['GrafanaTechEmailArgs']]] tech_emails: Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service
-               instability.
-        :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.
+        :param pulumi.Input[Sequence[pulumi.Input['GrafanaTechEmailArgs']]] 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)
         pulumi.set(__self__, "project", project)
@@ -81,6 +67,8 @@ class GrafanaArgs:
             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.""")
         if disk_space is not None:
             pulumi.set(__self__, "disk_space", disk_space)
+        if grafana is not None:
+            pulumi.set(__self__, "grafana", grafana)
         if grafana_user_config is not None:
             pulumi.set(__self__, "grafana_user_config", grafana_user_config)
         if maintenance_window_dow is not None:
@@ -106,12 +94,7 @@ class GrafanaArgs:
     @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")
 
@@ -123,8 +106,7 @@ class GrafanaArgs:
     @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")
 
@@ -136,8 +118,7 @@ class GrafanaArgs:
     @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")
 
@@ -149,12 +130,7 @@ class GrafanaArgs:
     @pulumi.getter(name="cloudName")
     def cloud_name(self) -> Optional[pulumi.Input[str]]:
         """
-        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).
+        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).
         """
         return pulumi.get(self, "cloud_name")
 
@@ -164,25 +140,34 @@ class GrafanaArgs:
 
     @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.
+        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
     def disk_space(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "disk_space", value)
 
+    @property
+    @pulumi.getter
+    def grafana(self) -> Optional[pulumi.Input['GrafanaGrafanaArgs']]:
+        """
+        Values provided by the Grafana server.
+        """
+        return pulumi.get(self, "grafana")
+
+    @grafana.setter
+    def grafana(self, value: Optional[pulumi.Input['GrafanaGrafanaArgs']]):
+        pulumi.set(self, "grafana", value)
+
     @property
     @pulumi.getter(name="grafanaUserConfig")
     def grafana_user_config(self) -> Optional[pulumi.Input['GrafanaGrafanaUserConfigArgs']]:
         """
-        Grafana user configurable settings
+        Grafana 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, "grafana_user_config")
 
@@ -218,10 +203,7 @@ class GrafanaArgs:
     @pulumi.getter(name="projectVpcId")
     def project_vpc_id(self) -> Optional[pulumi.Input[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.
+        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.
         """
         return pulumi.get(self, "project_vpc_id")
 
@@ -245,8 +227,7 @@ class GrafanaArgs:
     @pulumi.getter(name="serviceName")
     def service_name(self) -> Optional[pulumi.Input[str]]:
         """
-        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.
+        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.
         """
         return pulumi.get(self, "service_name")
 
@@ -258,8 +239,7 @@ class GrafanaArgs:
     @pulumi.getter(name="staticIps")
     def static_ips(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
-        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
+        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")
 
@@ -283,8 +263,7 @@ class GrafanaArgs:
     @pulumi.getter(name="techEmails")
     def tech_emails(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['GrafanaTechEmailArgs']]]]:
         """
-        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")
 
@@ -296,9 +275,7 @@ class GrafanaArgs:
     @pulumi.getter(name="terminationProtection")
     def termination_protection(self) -> Optional[pulumi.Input[bool]]:
         """
-        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.
+        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.
         """
         return pulumi.get(self, "termination_protection")
 
@@ -318,8 +295,8 @@ class _GrafanaState:
                  disk_space_default: Optional[pulumi.Input[str]] = None,
                  disk_space_step: Optional[pulumi.Input[str]] = None,
                  disk_space_used: Optional[pulumi.Input[str]] = None,
+                 grafana: Optional[pulumi.Input['GrafanaGrafanaArgs']] = None,
                  grafana_user_config: Optional[pulumi.Input['GrafanaGrafanaUserConfigArgs']] = None,
-                 grafanas: Optional[pulumi.Input[Sequence[pulumi.Input['GrafanaGrafanaArgs']]]] = None,
                  maintenance_window_dow: Optional[pulumi.Input[str]] = None,
                  maintenance_window_time: Optional[pulumi.Input[str]] = None,
                  plan: Optional[pulumi.Input[str]] = None,
@@ -340,57 +317,34 @@ class _GrafanaState:
                  termination_protection: Optional[pulumi.Input[bool]] = None):
         """
         Input properties used for looking up and filtering Grafana 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[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] 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[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['GrafanaComponentArgs']]] 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: 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`
-        :param pulumi.Input[str] disk_space_step: 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.
+        :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`
+        :param pulumi.Input[str] disk_space_step: 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.
         :param pulumi.Input[str] disk_space_used: Disk space that service is currently using
-        :param pulumi.Input['GrafanaGrafanaUserConfigArgs'] grafana_user_config: Grafana user configurable settings
-        :param pulumi.Input[Sequence[pulumi.Input['GrafanaGrafanaArgs']]] grafanas: Grafana server provided values
+        :param pulumi.Input['GrafanaGrafanaArgs'] grafana: Values provided by the Grafana server.
+        :param pulumi.Input['GrafanaGrafanaUserConfigArgs'] grafana_user_config: Grafana 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] 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] 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] 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['GrafanaServiceIntegrationArgs']]] 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_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
         :param pulumi.Input[str] service_type: Aiven internal service type code
         :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: 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[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['GrafanaTagArgs']]] tags: Tags are key-value pairs that allow you to categorize services.
-        :param pulumi.Input[Sequence[pulumi.Input['GrafanaTechEmailArgs']]] tech_emails: Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service
-               instability.
-        :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.
+        :param pulumi.Input[Sequence[pulumi.Input['GrafanaTechEmailArgs']]] 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)
@@ -409,12 +363,15 @@ class _GrafanaState:
             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 grafana is not None:
+            pulumi.set(__self__, "grafana", grafana)
         if grafana_user_config is not None:
             pulumi.set(__self__, "grafana_user_config", grafana_user_config)
-        if grafanas is not None:
-            pulumi.set(__self__, "grafanas", grafanas)
         if maintenance_window_dow is not None:
             pulumi.set(__self__, "maintenance_window_dow", maintenance_window_dow)
         if maintenance_window_time is not None:
@@ -456,8 +413,7 @@ class _GrafanaState:
     @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")
 
@@ -469,12 +425,7 @@ class _GrafanaState:
     @pulumi.getter(name="cloudName")
     def cloud_name(self) -> Optional[pulumi.Input[str]]:
         """
-        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).
+        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).
         """
         return pulumi.get(self, "cloud_name")
 
@@ -496,14 +447,11 @@ class _GrafanaState:
 
     @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.
+        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
@@ -526,8 +474,7 @@ class _GrafanaState:
     @pulumi.getter(name="diskSpaceDefault")
     def disk_space_default(self) -> Optional[pulumi.Input[str]]:
         """
-        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`
+        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`
         """
         return pulumi.get(self, "disk_space_default")
 
@@ -539,8 +486,7 @@ class _GrafanaState:
     @pulumi.getter(name="diskSpaceStep")
     def disk_space_step(self) -> Optional[pulumi.Input[str]]:
         """
-        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.
+        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.
         """
         return pulumi.get(self, "disk_space_step")
 
@@ -550,6 +496,7 @@ class _GrafanaState:
 
     @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
@@ -560,11 +507,23 @@ class _GrafanaState:
     def disk_space_used(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "disk_space_used", value)
 
+    @property
+    @pulumi.getter
+    def grafana(self) -> Optional[pulumi.Input['GrafanaGrafanaArgs']]:
+        """
+        Values provided by the Grafana server.
+        """
+        return pulumi.get(self, "grafana")
+
+    @grafana.setter
+    def grafana(self, value: Optional[pulumi.Input['GrafanaGrafanaArgs']]):
+        pulumi.set(self, "grafana", value)
+
     @property
     @pulumi.getter(name="grafanaUserConfig")
     def grafana_user_config(self) -> Optional[pulumi.Input['GrafanaGrafanaUserConfigArgs']]:
         """
-        Grafana user configurable settings
+        Grafana 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, "grafana_user_config")
 
@@ -572,18 +531,6 @@ class _GrafanaState:
     def grafana_user_config(self, value: Optional[pulumi.Input['GrafanaGrafanaUserConfigArgs']]):
         pulumi.set(self, "grafana_user_config", value)
 
-    @property
-    @pulumi.getter
-    def grafanas(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['GrafanaGrafanaArgs']]]]:
-        """
-        Grafana server provided values
-        """
-        return pulumi.get(self, "grafanas")
-
-    @grafanas.setter
-    def grafanas(self, value: Optional[pulumi.Input[Sequence[pulumi.Input['GrafanaGrafanaArgs']]]]):
-        pulumi.set(self, "grafanas", value)
-
     @property
     @pulumi.getter(name="maintenanceWindowDow")
     def maintenance_window_dow(self) -> Optional[pulumi.Input[str]]:
@@ -612,12 +559,7 @@ class _GrafanaState:
     @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")
 
@@ -629,8 +571,7 @@ class _GrafanaState:
     @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")
 
@@ -642,10 +583,7 @@ class _GrafanaState:
     @pulumi.getter(name="projectVpcId")
     def project_vpc_id(self) -> Optional[pulumi.Input[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.
+        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.
         """
         return pulumi.get(self, "project_vpc_id")
 
@@ -681,8 +619,7 @@ class _GrafanaState:
     @pulumi.getter(name="serviceName")
     def service_name(self) -> Optional[pulumi.Input[str]]:
         """
-        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.
+        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.
         """
         return pulumi.get(self, "service_name")
 
@@ -766,8 +703,7 @@ class _GrafanaState:
     @pulumi.getter(name="staticIps")
     def static_ips(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
         """
-        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
+        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")
 
@@ -791,8 +727,7 @@ class _GrafanaState:
     @pulumi.getter(name="techEmails")
     def tech_emails(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['GrafanaTechEmailArgs']]]]:
         """
-        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")
 
@@ -804,9 +739,7 @@ class _GrafanaState:
     @pulumi.getter(name="terminationProtection")
     def termination_protection(self) -> Optional[pulumi.Input[bool]]:
         """
-        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.
+        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.
         """
         return pulumi.get(self, "termination_protection")
 
@@ -823,88 +756,68 @@ class Grafana(pulumi.CustomResource):
                  additional_disk_space: Optional[pulumi.Input[str]] = None,
                  cloud_name: Optional[pulumi.Input[str]] = None,
                  disk_space: Optional[pulumi.Input[str]] = None,
-                 grafana_user_config: Optional[pulumi.Input[pulumi.InputType['GrafanaGrafanaUserConfigArgs']]] = None,
+                 grafana: Optional[pulumi.Input[Union['GrafanaGrafanaArgs', 'GrafanaGrafanaArgsDict']]] = None,
+                 grafana_user_config: Optional[pulumi.Input[Union['GrafanaGrafanaUserConfigArgs', 'GrafanaGrafanaUserConfigArgsDict']]] = None,
                  maintenance_window_dow: Optional[pulumi.Input[str]] = None,
                  maintenance_window_time: Optional[pulumi.Input[str]] = None,
                  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['GrafanaServiceIntegrationArgs']]]]] = None,
+                 service_integrations: Optional[pulumi.Input[Sequence[pulumi.Input[Union['GrafanaServiceIntegrationArgs', 'GrafanaServiceIntegrationArgsDict']]]]] = 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['GrafanaTagArgs']]]]] = None,
-                 tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['GrafanaTechEmailArgs']]]]] = None,
+                 tags: Optional[pulumi.Input[Sequence[pulumi.Input[Union['GrafanaTagArgs', 'GrafanaTagArgsDict']]]]] = None,
+                 tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[Union['GrafanaTechEmailArgs', 'GrafanaTechEmailArgsDict']]]]] = None,
                  termination_protection: Optional[pulumi.Input[bool]] = None,
                  __props__=None):
         """
-        The Grafana resource allows the creation and management of Aiven Grafana services.
+        Creates and manages an [Aiven for Grafana®](https://aiven.io/docs/products/grafana) service.
 
         ## Example Usage
 
-        <!--Start PulumiCodeChooser -->
         ```python
         import pulumi
         import pulumi_aiven as aiven
 
-        gr1 = aiven.Grafana("gr1",
-            project=data["aiven_project"]["ps1"]["project"],
+        example_grafana = aiven.Grafana("example_grafana",
+            project=example_project["project"],
             cloud_name="google-europe-west1",
             plan="startup-1",
+            service_name="example-grafana-service",
             maintenance_window_dow="monday",
             maintenance_window_time="10:00:00",
-            grafana_user_config=aiven.GrafanaGrafanaUserConfigArgs(
-                alerting_enabled=True,
-                public_access=aiven.GrafanaGrafanaUserConfigPublicAccessArgs(
-                    grafana=True,
-                ),
-            ))
+            grafana_user_config={
+                "alerting_enabled": True,
+                "public_access": {
+                    "grafana": True,
+                },
+            })
         ```
-        <!--End PulumiCodeChooser -->
 
         ## Import
 
         ```sh
-        $ pulumi import aiven:index/grafana:Grafana gr1 project/service_name
+        $ pulumi import aiven:index/grafana:Grafana example_grafana 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[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[pulumi.InputType['GrafanaGrafanaUserConfigArgs']] grafana_user_config: Grafana 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[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[Union['GrafanaGrafanaArgs', 'GrafanaGrafanaArgsDict']] grafana: Values provided by the Grafana server.
+        :param pulumi.Input[Union['GrafanaGrafanaUserConfigArgs', 'GrafanaGrafanaUserConfigArgsDict']] grafana_user_config: Grafana 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] 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] 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['GrafanaServiceIntegrationArgs']]]] 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: 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[pulumi.InputType['GrafanaTagArgs']]]] tags: Tags are key-value pairs that allow you to categorize services.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['GrafanaTechEmailArgs']]]] tech_emails: Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service
-               instability.
-        :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.
+        :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[Union['GrafanaServiceIntegrationArgs', 'GrafanaServiceIntegrationArgsDict']]]] 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: 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['GrafanaTagArgs', 'GrafanaTagArgsDict']]]] tags: Tags are key-value pairs that allow you to categorize services.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['GrafanaTechEmailArgs', 'GrafanaTechEmailArgsDict']]]] 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.
         """
         ...
     @overload
@@ -913,34 +826,33 @@ class Grafana(pulumi.CustomResource):
                  args: GrafanaArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
-        The Grafana resource allows the creation and management of Aiven Grafana services.
+        Creates and manages an [Aiven for Grafana®](https://aiven.io/docs/products/grafana) service.
 
         ## Example Usage
 
-        <!--Start PulumiCodeChooser -->
         ```python
         import pulumi
         import pulumi_aiven as aiven
 
-        gr1 = aiven.Grafana("gr1",
-            project=data["aiven_project"]["ps1"]["project"],
+        example_grafana = aiven.Grafana("example_grafana",
+            project=example_project["project"],
             cloud_name="google-europe-west1",
             plan="startup-1",
+            service_name="example-grafana-service",
             maintenance_window_dow="monday",
             maintenance_window_time="10:00:00",
-            grafana_user_config=aiven.GrafanaGrafanaUserConfigArgs(
-                alerting_enabled=True,
-                public_access=aiven.GrafanaGrafanaUserConfigPublicAccessArgs(
-                    grafana=True,
-                ),
-            ))
+            grafana_user_config={
+                "alerting_enabled": True,
+                "public_access": {
+                    "grafana": True,
+                },
+            })
         ```
-        <!--End PulumiCodeChooser -->
 
         ## Import
 
         ```sh
-        $ pulumi import aiven:index/grafana:Grafana gr1 project/service_name
+        $ pulumi import aiven:index/grafana:Grafana example_grafana PROJECT/SERVICE_NAME
         ```
 
         :param str resource_name: The name of the resource.
@@ -961,17 +873,18 @@ class Grafana(pulumi.CustomResource):
                  additional_disk_space: Optional[pulumi.Input[str]] = None,
                  cloud_name: Optional[pulumi.Input[str]] = None,
                  disk_space: Optional[pulumi.Input[str]] = None,
-                 grafana_user_config: Optional[pulumi.Input[pulumi.InputType['GrafanaGrafanaUserConfigArgs']]] = None,
+                 grafana: Optional[pulumi.Input[Union['GrafanaGrafanaArgs', 'GrafanaGrafanaArgsDict']]] = None,
+                 grafana_user_config: Optional[pulumi.Input[Union['GrafanaGrafanaUserConfigArgs', 'GrafanaGrafanaUserConfigArgsDict']]] = None,
                  maintenance_window_dow: Optional[pulumi.Input[str]] = None,
                  maintenance_window_time: Optional[pulumi.Input[str]] = None,
                  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['GrafanaServiceIntegrationArgs']]]]] = None,
+                 service_integrations: Optional[pulumi.Input[Sequence[pulumi.Input[Union['GrafanaServiceIntegrationArgs', 'GrafanaServiceIntegrationArgsDict']]]]] = 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['GrafanaTagArgs']]]]] = None,
-                 tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['GrafanaTechEmailArgs']]]]] = None,
+                 tags: Optional[pulumi.Input[Sequence[pulumi.Input[Union['GrafanaTagArgs', 'GrafanaTagArgsDict']]]]] = None,
+                 tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[Union['GrafanaTechEmailArgs', 'GrafanaTechEmailArgsDict']]]]] = None,
                  termination_protection: Optional[pulumi.Input[bool]] = None,
                  __props__=None):
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
@@ -985,6 +898,7 @@ class Grafana(pulumi.CustomResource):
             __props__.__dict__["additional_disk_space"] = additional_disk_space
             __props__.__dict__["cloud_name"] = cloud_name
             __props__.__dict__["disk_space"] = disk_space
+            __props__.__dict__["grafana"] = None if grafana is None else pulumi.Output.secret(grafana)
             __props__.__dict__["grafana_user_config"] = grafana_user_config
             __props__.__dict__["maintenance_window_dow"] = maintenance_window_dow
             __props__.__dict__["maintenance_window_time"] = maintenance_window_time
@@ -1006,7 +920,6 @@ class Grafana(pulumi.CustomResource):
             __props__.__dict__["disk_space_default"] = None
             __props__.__dict__["disk_space_step"] = None
             __props__.__dict__["disk_space_used"] = None
-            __props__.__dict__["grafanas"] = None
             __props__.__dict__["service_host"] = None
             __props__.__dict__["service_password"] = None
             __props__.__dict__["service_port"] = None
@@ -1014,7 +927,7 @@ class Grafana(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=["grafana", "servicePassword", "serviceUri"])
         opts = pulumi.ResourceOptions.merge(opts, secret_opts)
         super(Grafana, __self__).__init__(
             'aiven:index/grafana:Grafana',
@@ -1028,21 +941,21 @@ class Grafana(pulumi.CustomResource):
             opts: Optional[pulumi.ResourceOptions] = None,
             additional_disk_space: Optional[pulumi.Input[str]] = None,
             cloud_name: Optional[pulumi.Input[str]] = None,
-            components: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['GrafanaComponentArgs']]]]] = None,
+            components: Optional[pulumi.Input[Sequence[pulumi.Input[Union['GrafanaComponentArgs', 'GrafanaComponentArgsDict']]]]] = None,
             disk_space: Optional[pulumi.Input[str]] = None,
             disk_space_cap: Optional[pulumi.Input[str]] = None,
             disk_space_default: Optional[pulumi.Input[str]] = None,
             disk_space_step: Optional[pulumi.Input[str]] = None,
             disk_space_used: Optional[pulumi.Input[str]] = None,
-            grafana_user_config: Optional[pulumi.Input[pulumi.InputType['GrafanaGrafanaUserConfigArgs']]] = None,
-            grafanas: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['GrafanaGrafanaArgs']]]]] = None,
+            grafana: Optional[pulumi.Input[Union['GrafanaGrafanaArgs', 'GrafanaGrafanaArgsDict']]] = None,
+            grafana_user_config: Optional[pulumi.Input[Union['GrafanaGrafanaUserConfigArgs', 'GrafanaGrafanaUserConfigArgsDict']]] = None,
             maintenance_window_dow: Optional[pulumi.Input[str]] = None,
             maintenance_window_time: Optional[pulumi.Input[str]] = None,
             plan: Optional[pulumi.Input[str]] = None,
             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['GrafanaServiceIntegrationArgs']]]]] = None,
+            service_integrations: Optional[pulumi.Input[Sequence[pulumi.Input[Union['GrafanaServiceIntegrationArgs', 'GrafanaServiceIntegrationArgsDict']]]]] = None,
             service_name: Optional[pulumi.Input[str]] = None,
             service_password: Optional[pulumi.Input[str]] = None,
             service_port: Optional[pulumi.Input[int]] = None,
@@ -1051,8 +964,8 @@ class Grafana(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['GrafanaTagArgs']]]]] = None,
-            tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['GrafanaTechEmailArgs']]]]] = None,
+            tags: Optional[pulumi.Input[Sequence[pulumi.Input[Union['GrafanaTagArgs', 'GrafanaTagArgsDict']]]]] = None,
+            tech_emails: Optional[pulumi.Input[Sequence[pulumi.Input[Union['GrafanaTechEmailArgs', 'GrafanaTechEmailArgsDict']]]]] = None,
             termination_protection: Optional[pulumi.Input[bool]] = None) -> 'Grafana':
         """
         Get an existing Grafana resource's state with the given name, id, and optional extra
@@ -1061,57 +974,34 @@ class Grafana(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[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['GrafanaComponentArgs']]]] 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] 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[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[Union['GrafanaComponentArgs', 'GrafanaComponentArgsDict']]]] 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`
-        :param pulumi.Input[str] disk_space_step: 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.
+        :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`
+        :param pulumi.Input[str] disk_space_step: 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.
         :param pulumi.Input[str] disk_space_used: Disk space that service is currently using
-        :param pulumi.Input[pulumi.InputType['GrafanaGrafanaUserConfigArgs']] grafana_user_config: Grafana user configurable settings
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['GrafanaGrafanaArgs']]]] grafanas: Grafana server provided values
+        :param pulumi.Input[Union['GrafanaGrafanaArgs', 'GrafanaGrafanaArgsDict']] grafana: Values provided by the Grafana server.
+        :param pulumi.Input[Union['GrafanaGrafanaUserConfigArgs', 'GrafanaGrafanaUserConfigArgsDict']] grafana_user_config: Grafana 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] 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] 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] 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['GrafanaServiceIntegrationArgs']]]] 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[Union['GrafanaServiceIntegrationArgs', 'GrafanaServiceIntegrationArgsDict']]]] 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
         :param pulumi.Input[str] service_type: Aiven internal service type code
         :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: 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[pulumi.InputType['GrafanaTagArgs']]]] tags: Tags are key-value pairs that allow you to categorize services.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['GrafanaTechEmailArgs']]]] tech_emails: Defines the email addresses that will receive alerts about upcoming maintenance updates or warnings about service
-               instability.
-        :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.
+        :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['GrafanaTagArgs', 'GrafanaTagArgsDict']]]] tags: Tags are key-value pairs that allow you to categorize services.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['GrafanaTechEmailArgs', 'GrafanaTechEmailArgsDict']]]] 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))
 
@@ -1125,8 +1015,8 @@ class Grafana(pulumi.CustomResource):
         __props__.__dict__["disk_space_default"] = disk_space_default
         __props__.__dict__["disk_space_step"] = disk_space_step
         __props__.__dict__["disk_space_used"] = disk_space_used
+        __props__.__dict__["grafana"] = grafana
         __props__.__dict__["grafana_user_config"] = grafana_user_config
-        __props__.__dict__["grafanas"] = grafanas
         __props__.__dict__["maintenance_window_dow"] = maintenance_window_dow
         __props__.__dict__["maintenance_window_time"] = maintenance_window_time
         __props__.__dict__["plan"] = plan
@@ -1149,10 +1039,9 @@ class Grafana(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")
 
@@ -1160,12 +1049,7 @@ class Grafana(pulumi.CustomResource):
     @pulumi.getter(name="cloudName")
     def cloud_name(self) -> pulumi.Output[Optional[str]]:
         """
-        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).
+        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).
         """
         return pulumi.get(self, "cloud_name")
 
@@ -1179,14 +1063,11 @@ class Grafana(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.
+        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
@@ -1201,8 +1082,7 @@ class Grafana(pulumi.CustomResource):
     @pulumi.getter(name="diskSpaceDefault")
     def disk_space_default(self) -> pulumi.Output[str]:
         """
-        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`
+        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`
         """
         return pulumi.get(self, "disk_space_default")
 
@@ -1210,13 +1090,13 @@ class Grafana(pulumi.CustomResource):
     @pulumi.getter(name="diskSpaceStep")
     def disk_space_step(self) -> pulumi.Output[str]:
         """
-        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.
+        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.
         """
         return pulumi.get(self, "disk_space_step")
 
     @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
@@ -1224,20 +1104,20 @@ class Grafana(pulumi.CustomResource):
         return pulumi.get(self, "disk_space_used")
 
     @property
-    @pulumi.getter(name="grafanaUserConfig")
-    def grafana_user_config(self) -> pulumi.Output[Optional['outputs.GrafanaGrafanaUserConfig']]:
+    @pulumi.getter
+    def grafana(self) -> pulumi.Output['outputs.GrafanaGrafana']:
         """
-        Grafana user configurable settings
+        Values provided by the Grafana server.
         """
-        return pulumi.get(self, "grafana_user_config")
+        return pulumi.get(self, "grafana")
 
     @property
-    @pulumi.getter
-    def grafanas(self) -> pulumi.Output[Sequence['outputs.GrafanaGrafana']]:
+    @pulumi.getter(name="grafanaUserConfig")
+    def grafana_user_config(self) -> pulumi.Output[Optional['outputs.GrafanaGrafanaUserConfig']]:
         """
-        Grafana server provided values
+        Grafana 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, "grafanas")
+        return pulumi.get(self, "grafana_user_config")
 
     @property
     @pulumi.getter(name="maintenanceWindowDow")
@@ -1259,12 +1139,7 @@ class Grafana(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")
 
@@ -1272,19 +1147,15 @@ class Grafana(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.
+        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.
         """
         return pulumi.get(self, "project_vpc_id")
 
@@ -1298,7 +1169,7 @@ class Grafana(pulumi.CustomResource):
 
     @property
     @pulumi.getter(name="serviceIntegrations")
-    def service_integrations(self) -> pulumi.Output[Optional[Sequence['outputs.GrafanaServiceIntegration']]]:
+    def service_integrations(self) -> pulumi.Output[Sequence['outputs.GrafanaServiceIntegration']]:
         """
         Service integrations to specify when creating a service. Not applied after initial service creation
         """
@@ -1308,8 +1179,7 @@ class Grafana(pulumi.CustomResource):
     @pulumi.getter(name="serviceName")
     def service_name(self) -> pulumi.Output[str]:
         """
-        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.
+        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.
         """
         return pulumi.get(self, "service_name")
 
@@ -1365,8 +1235,7 @@ class Grafana(pulumi.CustomResource):
     @pulumi.getter(name="staticIps")
     def static_ips(self) -> pulumi.Output[Optional[Sequence[str]]]:
         """
-        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
+        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")
 
@@ -1382,8 +1251,7 @@ class Grafana(pulumi.CustomResource):
     @pulumi.getter(name="techEmails")
     def tech_emails(self) -> pulumi.Output[Optional[Sequence['outputs.GrafanaTechEmail']]]:
         """
-        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")
 
@@ -1391,9 +1259,7 @@ class Grafana(pulumi.CustomResource):
     @pulumi.getter(name="terminationProtection")
     def termination_protection(self) -> pulumi.Output[Optional[bool]]:
         """
-        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.
+        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.
         """
         return pulumi.get(self, "termination_protection")