PyPI - pulumi-newrelic - Versions diffs - 5.22.0__py3-none-any.whl → 5.58.0a1763707205__py3-none-any.whl - Mend

pulumi-newrelic 5.22.0py3-none-any.whl → 5.58.0a1763707205py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of pulumi-newrelic might be problematic. Click here for more details.

Files changed (92) hide show

pulumi_newrelic/__init__.py +28 -1
pulumi_newrelic/_inputs.py +10385 -2976
pulumi_newrelic/_utilities.py +50 -10
pulumi_newrelic/account_management.py +48 -42
pulumi_newrelic/alert_channel.py +165 -175
pulumi_newrelic/alert_condition.py +307 -319
pulumi_newrelic/alert_muting_rule.py +193 -140
pulumi_newrelic/alert_policy.py +121 -117
pulumi_newrelic/alert_policy_channel.py +89 -79
pulumi_newrelic/api_access_key.py +195 -193
pulumi_newrelic/browser_application.py +120 -114
pulumi_newrelic/cloud/__init__.py +3 -1
pulumi_newrelic/cloud/_inputs.py +4267 -2714
pulumi_newrelic/cloud/aws_govcloud_integrations.py +206 -196
pulumi_newrelic/cloud/aws_govcloud_link_account.py +143 -228
pulumi_newrelic/cloud/aws_integrations.py +510 -1490
pulumi_newrelic/cloud/aws_link_account.py +80 -76
pulumi_newrelic/cloud/azure_integrations.py +673 -587
pulumi_newrelic/cloud/azure_link_account.py +121 -117
pulumi_newrelic/cloud/gcp_integrations.py +428 -408
pulumi_newrelic/cloud/gcp_link_account.py +65 -61
pulumi_newrelic/cloud/oci_link_account.py +926 -0
pulumi_newrelic/cloud/outputs.py +1678 -2321
pulumi_newrelic/config/__init__.py +2 -1
pulumi_newrelic/config/__init__.pyi +8 -3
pulumi_newrelic/config/vars.py +22 -17
pulumi_newrelic/data_partition_rule.py +119 -117
pulumi_newrelic/entity_tags.py +111 -53
pulumi_newrelic/events_to_metrics_rule.py +106 -102
pulumi_newrelic/get_account.py +41 -33
pulumi_newrelic/get_alert_channel.py +73 -28
pulumi_newrelic/get_alert_policy.py +82 -33
pulumi_newrelic/get_application.py +51 -43
pulumi_newrelic/get_authentication_domain.py +27 -23
pulumi_newrelic/get_cloud_account.py +43 -35
pulumi_newrelic/get_entity.py +126 -183
pulumi_newrelic/get_group.py +76 -31
pulumi_newrelic/get_key_transaction.py +117 -42
pulumi_newrelic/get_notification_destination.py +75 -38
pulumi_newrelic/get_obfuscation_expression.py +47 -39
pulumi_newrelic/get_service_level_alert_helper.py +189 -171
pulumi_newrelic/get_test_grok_pattern.py +47 -36
pulumi_newrelic/get_user.py +39 -31
pulumi_newrelic/group.py +59 -199
pulumi_newrelic/infra_alert_condition.py +399 -405
pulumi_newrelic/insights/__init__.py +2 -1
pulumi_newrelic/insights/_inputs.py +71 -28
pulumi_newrelic/insights/event.py +54 -52
pulumi_newrelic/insights/outputs.py +28 -23
pulumi_newrelic/key_transaction.py +465 -0
pulumi_newrelic/log_parsing_rule.py +159 -157
pulumi_newrelic/monitor_downtime.py +311 -331
pulumi_newrelic/notification_channel.py +534 -464
pulumi_newrelic/notification_destination.py +238 -141
pulumi_newrelic/nrql_alert_condition.py +820 -614
pulumi_newrelic/nrql_drop_rule.py +113 -151
pulumi_newrelic/obfuscation_expression.py +80 -76
pulumi_newrelic/obfuscation_rule.py +115 -109
pulumi_newrelic/one_dashboard.py +110 -104
pulumi_newrelic/one_dashboard_json.py +69 -63
pulumi_newrelic/one_dashboard_raw.py +212 -206
pulumi_newrelic/outputs.py +4936 -2234
pulumi_newrelic/pipeline_cloud_rule.py +335 -0
pulumi_newrelic/plugins/__init__.py +2 -1
pulumi_newrelic/plugins/_inputs.py +519 -89
pulumi_newrelic/plugins/application_settings.py +463 -187
pulumi_newrelic/plugins/outputs.py +336 -74
pulumi_newrelic/plugins/workload.py +313 -189
pulumi_newrelic/provider.py +156 -142
pulumi_newrelic/pulumi-plugin.json +2 -1
pulumi_newrelic/service_level.py +263 -263
pulumi_newrelic/synthetics/__init__.py +2 -1
pulumi_newrelic/synthetics/_inputs.py +265 -108
pulumi_newrelic/synthetics/alert_condition.py +170 -180
pulumi_newrelic/synthetics/broken_links_monitor.py +297 -249
pulumi_newrelic/synthetics/cert_check_monitor.py +306 -258
pulumi_newrelic/synthetics/get_private_location.py +51 -47
pulumi_newrelic/synthetics/get_secure_credential.py +39 -31
pulumi_newrelic/synthetics/monitor.py +658 -460
pulumi_newrelic/synthetics/multi_location_alert_condition.py +211 -205
pulumi_newrelic/synthetics/outputs.py +92 -87
pulumi_newrelic/synthetics/private_location.py +118 -112
pulumi_newrelic/synthetics/script_monitor.py +613 -373
pulumi_newrelic/synthetics/secure_credential.py +97 -95
pulumi_newrelic/synthetics/step_monitor.py +445 -275
pulumi_newrelic/user.py +84 -80
pulumi_newrelic/workflow.py +336 -322
{pulumi_newrelic-5.22.0.dist-info → pulumi_newrelic-5.58.0a1763707205.dist-info}/METADATA +7 -6
pulumi_newrelic-5.58.0a1763707205.dist-info/RECORD +92 -0
{pulumi_newrelic-5.22.0.dist-info → pulumi_newrelic-5.58.0a1763707205.dist-info}/WHEEL +1 -1
pulumi_newrelic-5.22.0.dist-info/RECORD +0 -89
{pulumi_newrelic-5.22.0.dist-info → pulumi_newrelic-5.58.0a1763707205.dist-info}/top_level.txt +0 -0

pulumi_newrelic/cloud/aws_integrations.py CHANGED Viewed

@@ -1,12 +1,17 @@
 # coding=utf-8
-# *** WARNING: this file was generated by the Pulumi Terraform Bridge (tfgen) Tool. ***
+# *** WARNING: this file was generated by pulumi-language-python. ***
 # *** Do not edit by hand unless you're certain you know what you are doing! ***
-import copy
+import builtins as _builtins
 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 *
@@ -16,13 +21,14 @@ __all__ = ['AwsIntegrationsArgs', 'AwsIntegrations']
 @pulumi.input_type
 class AwsIntegrationsArgs:
     def __init__(__self__, *,
-                 linked_account_id: pulumi.Input[int],
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 linked_account_id: pulumi.Input[_builtins.str],
+                 account_id: Optional[pulumi.Input[_builtins.str]] = None,
                  alb: Optional[pulumi.Input['AwsIntegrationsAlbArgs']] = None,
                  api_gateway: Optional[pulumi.Input['AwsIntegrationsApiGatewayArgs']] = None,
                  auto_scaling: Optional[pulumi.Input['AwsIntegrationsAutoScalingArgs']] = None,
                  aws_app_sync: Optional[pulumi.Input['AwsIntegrationsAwsAppSyncArgs']] = None,
                  aws_athena: Optional[pulumi.Input['AwsIntegrationsAwsAthenaArgs']] = None,
+                 aws_auto_discovery: Optional[pulumi.Input['AwsIntegrationsAwsAutoDiscoveryArgs']] = None,
                  aws_cognito: Optional[pulumi.Input['AwsIntegrationsAwsCognitoArgs']] = None,
                  aws_connect: Optional[pulumi.Input['AwsIntegrationsAwsConnectArgs']] = None,
                  aws_direct_connect: Optional[pulumi.Input['AwsIntegrationsAwsDirectConnectArgs']] = None,
@@ -72,74 +78,14 @@ class AwsIntegrationsArgs:
                  x_ray: Optional[pulumi.Input['AwsIntegrationsXRayArgs']] = None):
         """
         The set of arguments for constructing a AwsIntegrations resource.
-        :param pulumi.Input[int] linked_account_id: The ID of the linked AWS account in New Relic.
-               All other arguments are dependent on the services to be integrated, which have been listed in the collapsible section below. All of these are **optional** blocks that can be added in any required combination. **For details on arguments that can be used with each service, check out the `Integration` blocks section below.**
-               <details>
-               <summary>Expand this section to view all supported AWS services supported, that may be integrated via this resource.</summary>
-               | Block                   | Description                   |
-               |-------------------------|-------------------------------|
-               | `alb`                   | ALB Integration               |
-               | `api_gateway`           | API Gateway Integration       |
-               | `auto_scaling`          | Auto Scaling Integration      |
-               | `aws_app_sync`          | AppSync Integration           |
-               | `aws_athena`            | Athena Integration            |
-               | `aws_cognito`           | Cognito Integration           |
-               | `aws_connect`           | Connect Integration           |
-               | `aws_direct_connect`    | Direct Connect Integration    |
-               | `aws_fsx`               | FSx Integration               |
-               | `aws_glue`              | Glue Integration              |
-               | `aws_kinesis_analytics` | Kinesis Analytics Integration |
-               | `aws_media_convert`     | MediaConvert Integration      |
-               | `aws_media_package_vod` | Media Package VOD Integration |
-               | `aws_mq`                | MQ Integration                |
-               | `aws_msk`               | MSK Integration               |
-               | `aws_neptune`           | Neptune Integration           |
-               | `aws_qldb`              | QLDB Integration              |
-               | `aws_route53resolver`   | Route53 Resolver Integration  |
-               | `aws_states`            | States Integration            |
-               | `aws_transit_gateway`   | Transit Gateway Integration   |
-               | `aws_waf`               | WAF Integration               |
-               | `aws_wafv2`             | WAFv2 Integration             |
-               | `billing`               | Billing Integration           |
-               | `cloudfront`            | CloudFront Integration        |
-               | `cloudtrail`            | CloudTrail Integration        |
-               | `doc_db`                | DocumentDB Integration        |
-               | `dynamodb`              | DynamoDB Integration          |
-               | `ebs`                   | EBS Integration               |
-               | `ec2`                   | EC2 Integration               |
-               | `ecs`                   | ECS Integration               |
-               | `efs`                   | EFS Integration               |
-               | `elasticache`           | ElastiCache Integration       |
-               | `elasticbeanstalk`      | Elastic Beanstalk Integration |
-               | `elasticsearch`         | Elasticsearch Integration     |
-               | `elb`                   | ELB Integration               |
-               | `emr`                   | EMR Integration               |
-               | `health`                | Health Integration            |
-               | `iam`                   | IAM Integration               |
-               | `iot`                   | IoT Integration               |
-               | `kinesis`               | Kinesis Integration           |
-               | `kinesis_firehose`      | Kinesis Firehose Integration  |
-               | `lambda`                | Lambda Integration            |
-               | `rds`                   | RDS Integration               |
-               | `redshift`              | Redshift Integration          |
-               | `route53`               | Route53 Integration           |
-               | `s3`                    | S3 Integration                |
-               | `ses`                   | SES Integration               |
-               | `sns`                   | SNS Integration               |
-               | `sqs`                   | SQS Integration               |
-               | `trusted_advisor`       | Trusted Advisor Integration   |
-               | `vpc`                   | VPC Integration               |
-               | `x_ray`                 | X-Ray Integration             |
-               </details>
-        :param pulumi.Input[int] account_id: The New Relic account ID to operate on.  This allows the user to override the `account_id` attribute set on the provider. Defaults to the environment variable `NEW_RELIC_ACCOUNT_ID`.
+        :param pulumi.Input[_builtins.str] linked_account_id: The ID of the linked AWS account in New Relic.
+        :param pulumi.Input[_builtins.str] account_id: The New Relic account ID to operate on.  This allows the user to override the `account_id` attribute set on the provider. Defaults to the environment variable `NEW_RELIC_ACCOUNT_ID`.
         :param pulumi.Input['AwsIntegrationsAlbArgs'] alb: ALB integration
         :param pulumi.Input['AwsIntegrationsApiGatewayArgs'] api_gateway: API Gateway integration
-        :param pulumi.Input['AwsIntegrationsAutoScalingArgs'] auto_scaling: ,`aws_app_sync`,`aws_athena`,`aws_cognito`,`aws_connect`,`aws_direct_connect`,`aws_fsx`,`aws_glue`,`aws_kinesis_analytics`,`aws_media_convert`,`aws_media_package_vod`,`aws_mq`,`aws_msk`,`aws_neptune`,`aws_qldb`,`aws_route53resolver`,`aws_states`,`aws_transit_gateway`,`aws_waf`,`aws_wafv2`,`iot`,`kinesis_firehose` and `ses`.
+        :param pulumi.Input['AwsIntegrationsAutoScalingArgs'] auto_scaling: AutoScaling integration
         :param pulumi.Input['AwsIntegrationsAwsAppSyncArgs'] aws_app_sync: Aws Appsync integration
         :param pulumi.Input['AwsIntegrationsAwsAthenaArgs'] aws_athena: Aws Athena integration
+        :param pulumi.Input['AwsIntegrationsAwsAutoDiscoveryArgs'] aws_auto_discovery: Aws Auto Discovery Integration
         :param pulumi.Input['AwsIntegrationsAwsCognitoArgs'] aws_cognito: Aws Cognito integration
         :param pulumi.Input['AwsIntegrationsAwsConnectArgs'] aws_connect: Aws Connect integration
         :param pulumi.Input['AwsIntegrationsAwsDirectConnectArgs'] aws_direct_connect: Aws Direct Connect integration
@@ -201,6 +147,8 @@ class AwsIntegrationsArgs:
             pulumi.set(__self__, "aws_app_sync", aws_app_sync)
         if aws_athena is not None:
             pulumi.set(__self__, "aws_athena", aws_athena)
+        if aws_auto_discovery is not None:
+            pulumi.set(__self__, "aws_auto_discovery", aws_auto_discovery)
         if aws_cognito is not None:
             pulumi.set(__self__, "aws_cognito", aws_cognito)
         if aws_connect is not None:
@@ -296,92 +244,31 @@ class AwsIntegrationsArgs:
         if x_ray is not None:
             pulumi.set(__self__, "x_ray", x_ray)
-    @property
+    @_builtins.property
     @pulumi.getter(name="linkedAccountId")
-    def linked_account_id(self) -> pulumi.Input[int]:
+    def linked_account_id(self) -> pulumi.Input[_builtins.str]:
         """
         The ID of the linked AWS account in New Relic.
-        All other arguments are dependent on the services to be integrated, which have been listed in the collapsible section below. All of these are **optional** blocks that can be added in any required combination. **For details on arguments that can be used with each service, check out the `Integration` blocks section below.**
-        <details>
-        <summary>Expand this section to view all supported AWS services supported, that may be integrated via this resource.</summary>
-        | Block                   | Description                   |
-        |-------------------------|-------------------------------|
-        | `alb`                   | ALB Integration               |
-        | `api_gateway`           | API Gateway Integration       |
-        | `auto_scaling`          | Auto Scaling Integration      |
-        | `aws_app_sync`          | AppSync Integration           |
-        | `aws_athena`            | Athena Integration            |
-        | `aws_cognito`           | Cognito Integration           |
-        | `aws_connect`           | Connect Integration           |
-        | `aws_direct_connect`    | Direct Connect Integration    |
-        | `aws_fsx`               | FSx Integration               |
-        | `aws_glue`              | Glue Integration              |
-        | `aws_kinesis_analytics` | Kinesis Analytics Integration |
-        | `aws_media_convert`     | MediaConvert Integration      |
-        | `aws_media_package_vod` | Media Package VOD Integration |
-        | `aws_mq`                | MQ Integration                |
-        | `aws_msk`               | MSK Integration               |
-        | `aws_neptune`           | Neptune Integration           |
-        | `aws_qldb`              | QLDB Integration              |
-        | `aws_route53resolver`   | Route53 Resolver Integration  |
-        | `aws_states`            | States Integration            |
-        | `aws_transit_gateway`   | Transit Gateway Integration   |
-        | `aws_waf`               | WAF Integration               |
-        | `aws_wafv2`             | WAFv2 Integration             |
-        | `billing`               | Billing Integration           |
-        | `cloudfront`            | CloudFront Integration        |
-        | `cloudtrail`            | CloudTrail Integration        |
-        | `doc_db`                | DocumentDB Integration        |
-        | `dynamodb`              | DynamoDB Integration          |
-        | `ebs`                   | EBS Integration               |
-        | `ec2`                   | EC2 Integration               |
-        | `ecs`                   | ECS Integration               |
-        | `efs`                   | EFS Integration               |
-        | `elasticache`           | ElastiCache Integration       |
-        | `elasticbeanstalk`      | Elastic Beanstalk Integration |
-        | `elasticsearch`         | Elasticsearch Integration     |
-        | `elb`                   | ELB Integration               |
-        | `emr`                   | EMR Integration               |
-        | `health`                | Health Integration            |
-        | `iam`                   | IAM Integration               |
-        | `iot`                   | IoT Integration               |
-        | `kinesis`               | Kinesis Integration           |
-        | `kinesis_firehose`      | Kinesis Firehose Integration  |
-        | `lambda`                | Lambda Integration            |
-        | `rds`                   | RDS Integration               |
-        | `redshift`              | Redshift Integration          |
-        | `route53`               | Route53 Integration           |
-        | `s3`                    | S3 Integration                |
-        | `ses`                   | SES Integration               |
-        | `sns`                   | SNS Integration               |
-        | `sqs`                   | SQS Integration               |
-        | `trusted_advisor`       | Trusted Advisor Integration   |
-        | `vpc`                   | VPC Integration               |
-        | `x_ray`                 | X-Ray Integration             |
-        </details>
         """
         return pulumi.get(self, "linked_account_id")
     @linked_account_id.setter
-    def linked_account_id(self, value: pulumi.Input[int]):
+    def linked_account_id(self, value: pulumi.Input[_builtins.str]):
         pulumi.set(self, "linked_account_id", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> Optional[pulumi.Input[int]]:
+    def account_id(self) -> Optional[pulumi.Input[_builtins.str]]:
         """
         The New Relic account ID to operate on.  This allows the user to override the `account_id` attribute set on the provider. Defaults to the environment variable `NEW_RELIC_ACCOUNT_ID`.
         """
         return pulumi.get(self, "account_id")
     @account_id.setter
-    def account_id(self, value: Optional[pulumi.Input[int]]):
+    def account_id(self, value: Optional[pulumi.Input[_builtins.str]]):
         pulumi.set(self, "account_id", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def alb(self) -> Optional[pulumi.Input['AwsIntegrationsAlbArgs']]:
         """
@@ -393,7 +280,7 @@ class AwsIntegrationsArgs:
     def alb(self, value: Optional[pulumi.Input['AwsIntegrationsAlbArgs']]):
         pulumi.set(self, "alb", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="apiGateway")
     def api_gateway(self) -> Optional[pulumi.Input['AwsIntegrationsApiGatewayArgs']]:
         """
@@ -405,11 +292,11 @@ class AwsIntegrationsArgs:
     def api_gateway(self, value: Optional[pulumi.Input['AwsIntegrationsApiGatewayArgs']]):
         pulumi.set(self, "api_gateway", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="autoScaling")
     def auto_scaling(self) -> Optional[pulumi.Input['AwsIntegrationsAutoScalingArgs']]:
         """
-        ,`aws_app_sync`,`aws_athena`,`aws_cognito`,`aws_connect`,`aws_direct_connect`,`aws_fsx`,`aws_glue`,`aws_kinesis_analytics`,`aws_media_convert`,`aws_media_package_vod`,`aws_mq`,`aws_msk`,`aws_neptune`,`aws_qldb`,`aws_route53resolver`,`aws_states`,`aws_transit_gateway`,`aws_waf`,`aws_wafv2`,`iot`,`kinesis_firehose` and `ses`.
+        AutoScaling integration
         """
         return pulumi.get(self, "auto_scaling")
@@ -417,7 +304,7 @@ class AwsIntegrationsArgs:
     def auto_scaling(self, value: Optional[pulumi.Input['AwsIntegrationsAutoScalingArgs']]):
         pulumi.set(self, "auto_scaling", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsAppSync")
     def aws_app_sync(self) -> Optional[pulumi.Input['AwsIntegrationsAwsAppSyncArgs']]:
         """
@@ -429,7 +316,7 @@ class AwsIntegrationsArgs:
     def aws_app_sync(self, value: Optional[pulumi.Input['AwsIntegrationsAwsAppSyncArgs']]):
         pulumi.set(self, "aws_app_sync", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsAthena")
     def aws_athena(self) -> Optional[pulumi.Input['AwsIntegrationsAwsAthenaArgs']]:
         """
@@ -441,7 +328,19 @@ class AwsIntegrationsArgs:
     def aws_athena(self, value: Optional[pulumi.Input['AwsIntegrationsAwsAthenaArgs']]):
         pulumi.set(self, "aws_athena", value)
-    @property
+    @_builtins.property
+    @pulumi.getter(name="awsAutoDiscovery")
+    def aws_auto_discovery(self) -> Optional[pulumi.Input['AwsIntegrationsAwsAutoDiscoveryArgs']]:
+        """
+        Aws Auto Discovery Integration
+        """
+        return pulumi.get(self, "aws_auto_discovery")
+    @aws_auto_discovery.setter
+    def aws_auto_discovery(self, value: Optional[pulumi.Input['AwsIntegrationsAwsAutoDiscoveryArgs']]):
+        pulumi.set(self, "aws_auto_discovery", value)
+    @_builtins.property
     @pulumi.getter(name="awsCognito")
     def aws_cognito(self) -> Optional[pulumi.Input['AwsIntegrationsAwsCognitoArgs']]:
         """
@@ -453,7 +352,7 @@ class AwsIntegrationsArgs:
     def aws_cognito(self, value: Optional[pulumi.Input['AwsIntegrationsAwsCognitoArgs']]):
         pulumi.set(self, "aws_cognito", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsConnect")
     def aws_connect(self) -> Optional[pulumi.Input['AwsIntegrationsAwsConnectArgs']]:
         """
@@ -465,7 +364,7 @@ class AwsIntegrationsArgs:
     def aws_connect(self, value: Optional[pulumi.Input['AwsIntegrationsAwsConnectArgs']]):
         pulumi.set(self, "aws_connect", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsDirectConnect")
     def aws_direct_connect(self) -> Optional[pulumi.Input['AwsIntegrationsAwsDirectConnectArgs']]:
         """
@@ -477,7 +376,7 @@ class AwsIntegrationsArgs:
     def aws_direct_connect(self, value: Optional[pulumi.Input['AwsIntegrationsAwsDirectConnectArgs']]):
         pulumi.set(self, "aws_direct_connect", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsFsx")
     def aws_fsx(self) -> Optional[pulumi.Input['AwsIntegrationsAwsFsxArgs']]:
         """
@@ -489,7 +388,7 @@ class AwsIntegrationsArgs:
     def aws_fsx(self, value: Optional[pulumi.Input['AwsIntegrationsAwsFsxArgs']]):
         pulumi.set(self, "aws_fsx", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsGlue")
     def aws_glue(self) -> Optional[pulumi.Input['AwsIntegrationsAwsGlueArgs']]:
         """
@@ -501,7 +400,7 @@ class AwsIntegrationsArgs:
     def aws_glue(self, value: Optional[pulumi.Input['AwsIntegrationsAwsGlueArgs']]):
         pulumi.set(self, "aws_glue", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsKinesisAnalytics")
     def aws_kinesis_analytics(self) -> Optional[pulumi.Input['AwsIntegrationsAwsKinesisAnalyticsArgs']]:
         """
@@ -513,7 +412,7 @@ class AwsIntegrationsArgs:
     def aws_kinesis_analytics(self, value: Optional[pulumi.Input['AwsIntegrationsAwsKinesisAnalyticsArgs']]):
         pulumi.set(self, "aws_kinesis_analytics", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMediaConvert")
     def aws_media_convert(self) -> Optional[pulumi.Input['AwsIntegrationsAwsMediaConvertArgs']]:
         """
@@ -525,7 +424,7 @@ class AwsIntegrationsArgs:
     def aws_media_convert(self, value: Optional[pulumi.Input['AwsIntegrationsAwsMediaConvertArgs']]):
         pulumi.set(self, "aws_media_convert", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMediaPackageVod")
     def aws_media_package_vod(self) -> Optional[pulumi.Input['AwsIntegrationsAwsMediaPackageVodArgs']]:
         """
@@ -537,7 +436,7 @@ class AwsIntegrationsArgs:
     def aws_media_package_vod(self, value: Optional[pulumi.Input['AwsIntegrationsAwsMediaPackageVodArgs']]):
         pulumi.set(self, "aws_media_package_vod", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMq")
     def aws_mq(self) -> Optional[pulumi.Input['AwsIntegrationsAwsMqArgs']]:
         """
@@ -549,7 +448,7 @@ class AwsIntegrationsArgs:
     def aws_mq(self, value: Optional[pulumi.Input['AwsIntegrationsAwsMqArgs']]):
         pulumi.set(self, "aws_mq", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMsk")
     def aws_msk(self) -> Optional[pulumi.Input['AwsIntegrationsAwsMskArgs']]:
         """
@@ -561,7 +460,7 @@ class AwsIntegrationsArgs:
     def aws_msk(self, value: Optional[pulumi.Input['AwsIntegrationsAwsMskArgs']]):
         pulumi.set(self, "aws_msk", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsNeptune")
     def aws_neptune(self) -> Optional[pulumi.Input['AwsIntegrationsAwsNeptuneArgs']]:
         """
@@ -573,7 +472,7 @@ class AwsIntegrationsArgs:
     def aws_neptune(self, value: Optional[pulumi.Input['AwsIntegrationsAwsNeptuneArgs']]):
         pulumi.set(self, "aws_neptune", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsQldb")
     def aws_qldb(self) -> Optional[pulumi.Input['AwsIntegrationsAwsQldbArgs']]:
         """
@@ -585,7 +484,7 @@ class AwsIntegrationsArgs:
     def aws_qldb(self, value: Optional[pulumi.Input['AwsIntegrationsAwsQldbArgs']]):
         pulumi.set(self, "aws_qldb", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsRoute53resolver")
     def aws_route53resolver(self) -> Optional[pulumi.Input['AwsIntegrationsAwsRoute53resolverArgs']]:
         """
@@ -597,7 +496,7 @@ class AwsIntegrationsArgs:
     def aws_route53resolver(self, value: Optional[pulumi.Input['AwsIntegrationsAwsRoute53resolverArgs']]):
         pulumi.set(self, "aws_route53resolver", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsStates")
     def aws_states(self) -> Optional[pulumi.Input['AwsIntegrationsAwsStatesArgs']]:
         """
@@ -609,7 +508,7 @@ class AwsIntegrationsArgs:
     def aws_states(self, value: Optional[pulumi.Input['AwsIntegrationsAwsStatesArgs']]):
         pulumi.set(self, "aws_states", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsTransitGateway")
     def aws_transit_gateway(self) -> Optional[pulumi.Input['AwsIntegrationsAwsTransitGatewayArgs']]:
         """
@@ -621,7 +520,7 @@ class AwsIntegrationsArgs:
     def aws_transit_gateway(self, value: Optional[pulumi.Input['AwsIntegrationsAwsTransitGatewayArgs']]):
         pulumi.set(self, "aws_transit_gateway", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsWaf")
     def aws_waf(self) -> Optional[pulumi.Input['AwsIntegrationsAwsWafArgs']]:
         """
@@ -633,7 +532,7 @@ class AwsIntegrationsArgs:
     def aws_waf(self, value: Optional[pulumi.Input['AwsIntegrationsAwsWafArgs']]):
         pulumi.set(self, "aws_waf", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsWafv2")
     def aws_wafv2(self) -> Optional[pulumi.Input['AwsIntegrationsAwsWafv2Args']]:
         """
@@ -645,7 +544,7 @@ class AwsIntegrationsArgs:
     def aws_wafv2(self, value: Optional[pulumi.Input['AwsIntegrationsAwsWafv2Args']]):
         pulumi.set(self, "aws_wafv2", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def billing(self) -> Optional[pulumi.Input['AwsIntegrationsBillingArgs']]:
         """
@@ -657,7 +556,7 @@ class AwsIntegrationsArgs:
     def billing(self, value: Optional[pulumi.Input['AwsIntegrationsBillingArgs']]):
         pulumi.set(self, "billing", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def cloudfront(self) -> Optional[pulumi.Input['AwsIntegrationsCloudfrontArgs']]:
         """
@@ -669,7 +568,7 @@ class AwsIntegrationsArgs:
     def cloudfront(self, value: Optional[pulumi.Input['AwsIntegrationsCloudfrontArgs']]):
         pulumi.set(self, "cloudfront", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def cloudtrail(self) -> Optional[pulumi.Input['AwsIntegrationsCloudtrailArgs']]:
         """
@@ -681,7 +580,7 @@ class AwsIntegrationsArgs:
     def cloudtrail(self, value: Optional[pulumi.Input['AwsIntegrationsCloudtrailArgs']]):
         pulumi.set(self, "cloudtrail", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="docDb")
     def doc_db(self) -> Optional[pulumi.Input['AwsIntegrationsDocDbArgs']]:
         """
@@ -693,7 +592,7 @@ class AwsIntegrationsArgs:
     def doc_db(self, value: Optional[pulumi.Input['AwsIntegrationsDocDbArgs']]):
         pulumi.set(self, "doc_db", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def dynamodb(self) -> Optional[pulumi.Input['AwsIntegrationsDynamodbArgs']]:
         """
@@ -705,7 +604,7 @@ class AwsIntegrationsArgs:
     def dynamodb(self, value: Optional[pulumi.Input['AwsIntegrationsDynamodbArgs']]):
         pulumi.set(self, "dynamodb", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def ebs(self) -> Optional[pulumi.Input['AwsIntegrationsEbsArgs']]:
         """
@@ -717,7 +616,7 @@ class AwsIntegrationsArgs:
     def ebs(self, value: Optional[pulumi.Input['AwsIntegrationsEbsArgs']]):
         pulumi.set(self, "ebs", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def ec2(self) -> Optional[pulumi.Input['AwsIntegrationsEc2Args']]:
         """
@@ -729,7 +628,7 @@ class AwsIntegrationsArgs:
     def ec2(self, value: Optional[pulumi.Input['AwsIntegrationsEc2Args']]):
         pulumi.set(self, "ec2", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def ecs(self) -> Optional[pulumi.Input['AwsIntegrationsEcsArgs']]:
         """
@@ -741,7 +640,7 @@ class AwsIntegrationsArgs:
     def ecs(self, value: Optional[pulumi.Input['AwsIntegrationsEcsArgs']]):
         pulumi.set(self, "ecs", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def efs(self) -> Optional[pulumi.Input['AwsIntegrationsEfsArgs']]:
         """
@@ -753,7 +652,7 @@ class AwsIntegrationsArgs:
     def efs(self, value: Optional[pulumi.Input['AwsIntegrationsEfsArgs']]):
         pulumi.set(self, "efs", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def elasticache(self) -> Optional[pulumi.Input['AwsIntegrationsElasticacheArgs']]:
         """
@@ -765,7 +664,7 @@ class AwsIntegrationsArgs:
     def elasticache(self, value: Optional[pulumi.Input['AwsIntegrationsElasticacheArgs']]):
         pulumi.set(self, "elasticache", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def elasticbeanstalk(self) -> Optional[pulumi.Input['AwsIntegrationsElasticbeanstalkArgs']]:
         """
@@ -777,7 +676,7 @@ class AwsIntegrationsArgs:
     def elasticbeanstalk(self, value: Optional[pulumi.Input['AwsIntegrationsElasticbeanstalkArgs']]):
         pulumi.set(self, "elasticbeanstalk", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def elasticsearch(self) -> Optional[pulumi.Input['AwsIntegrationsElasticsearchArgs']]:
         """
@@ -789,7 +688,7 @@ class AwsIntegrationsArgs:
     def elasticsearch(self, value: Optional[pulumi.Input['AwsIntegrationsElasticsearchArgs']]):
         pulumi.set(self, "elasticsearch", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def elb(self) -> Optional[pulumi.Input['AwsIntegrationsElbArgs']]:
         """
@@ -801,7 +700,7 @@ class AwsIntegrationsArgs:
     def elb(self, value: Optional[pulumi.Input['AwsIntegrationsElbArgs']]):
         pulumi.set(self, "elb", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def emr(self) -> Optional[pulumi.Input['AwsIntegrationsEmrArgs']]:
         """
@@ -813,7 +712,7 @@ class AwsIntegrationsArgs:
     def emr(self, value: Optional[pulumi.Input['AwsIntegrationsEmrArgs']]):
         pulumi.set(self, "emr", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def health(self) -> Optional[pulumi.Input['AwsIntegrationsHealthArgs']]:
         """
@@ -825,7 +724,7 @@ class AwsIntegrationsArgs:
     def health(self, value: Optional[pulumi.Input['AwsIntegrationsHealthArgs']]):
         pulumi.set(self, "health", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def iam(self) -> Optional[pulumi.Input['AwsIntegrationsIamArgs']]:
         """
@@ -837,7 +736,7 @@ class AwsIntegrationsArgs:
     def iam(self, value: Optional[pulumi.Input['AwsIntegrationsIamArgs']]):
         pulumi.set(self, "iam", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def iot(self) -> Optional[pulumi.Input['AwsIntegrationsIotArgs']]:
         """
@@ -849,7 +748,7 @@ class AwsIntegrationsArgs:
     def iot(self, value: Optional[pulumi.Input['AwsIntegrationsIotArgs']]):
         pulumi.set(self, "iot", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def kinesis(self) -> Optional[pulumi.Input['AwsIntegrationsKinesisArgs']]:
         """
@@ -861,7 +760,7 @@ class AwsIntegrationsArgs:
     def kinesis(self, value: Optional[pulumi.Input['AwsIntegrationsKinesisArgs']]):
         pulumi.set(self, "kinesis", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="kinesisFirehose")
     def kinesis_firehose(self) -> Optional[pulumi.Input['AwsIntegrationsKinesisFirehoseArgs']]:
         """
@@ -873,7 +772,7 @@ class AwsIntegrationsArgs:
     def kinesis_firehose(self, value: Optional[pulumi.Input['AwsIntegrationsKinesisFirehoseArgs']]):
         pulumi.set(self, "kinesis_firehose", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="lambda")
     def lambda_(self) -> Optional[pulumi.Input['AwsIntegrationsLambdaArgs']]:
         """
@@ -885,7 +784,7 @@ class AwsIntegrationsArgs:
     def lambda_(self, value: Optional[pulumi.Input['AwsIntegrationsLambdaArgs']]):
         pulumi.set(self, "lambda_", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def rds(self) -> Optional[pulumi.Input['AwsIntegrationsRdsArgs']]:
         """
@@ -897,7 +796,7 @@ class AwsIntegrationsArgs:
     def rds(self, value: Optional[pulumi.Input['AwsIntegrationsRdsArgs']]):
         pulumi.set(self, "rds", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def redshift(self) -> Optional[pulumi.Input['AwsIntegrationsRedshiftArgs']]:
         """
@@ -909,7 +808,7 @@ class AwsIntegrationsArgs:
     def redshift(self, value: Optional[pulumi.Input['AwsIntegrationsRedshiftArgs']]):
         pulumi.set(self, "redshift", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def route53(self) -> Optional[pulumi.Input['AwsIntegrationsRoute53Args']]:
         """
@@ -921,7 +820,7 @@ class AwsIntegrationsArgs:
     def route53(self, value: Optional[pulumi.Input['AwsIntegrationsRoute53Args']]):
         pulumi.set(self, "route53", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def s3(self) -> Optional[pulumi.Input['AwsIntegrationsS3Args']]:
         """
@@ -933,7 +832,7 @@ class AwsIntegrationsArgs:
     def s3(self, value: Optional[pulumi.Input['AwsIntegrationsS3Args']]):
         pulumi.set(self, "s3", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def ses(self) -> Optional[pulumi.Input['AwsIntegrationsSesArgs']]:
         """
@@ -945,7 +844,7 @@ class AwsIntegrationsArgs:
     def ses(self, value: Optional[pulumi.Input['AwsIntegrationsSesArgs']]):
         pulumi.set(self, "ses", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def sns(self) -> Optional[pulumi.Input['AwsIntegrationsSnsArgs']]:
         """
@@ -957,7 +856,7 @@ class AwsIntegrationsArgs:
     def sns(self, value: Optional[pulumi.Input['AwsIntegrationsSnsArgs']]):
         pulumi.set(self, "sns", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def sqs(self) -> Optional[pulumi.Input['AwsIntegrationsSqsArgs']]:
         """
@@ -969,7 +868,7 @@ class AwsIntegrationsArgs:
     def sqs(self, value: Optional[pulumi.Input['AwsIntegrationsSqsArgs']]):
         pulumi.set(self, "sqs", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="trustedAdvisor")
     def trusted_advisor(self) -> Optional[pulumi.Input['AwsIntegrationsTrustedAdvisorArgs']]:
         """
@@ -981,7 +880,7 @@ class AwsIntegrationsArgs:
     def trusted_advisor(self, value: Optional[pulumi.Input['AwsIntegrationsTrustedAdvisorArgs']]):
         pulumi.set(self, "trusted_advisor", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def vpc(self) -> Optional[pulumi.Input['AwsIntegrationsVpcArgs']]:
         """
@@ -993,7 +892,7 @@ class AwsIntegrationsArgs:
     def vpc(self, value: Optional[pulumi.Input['AwsIntegrationsVpcArgs']]):
         pulumi.set(self, "vpc", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="xRay")
     def x_ray(self) -> Optional[pulumi.Input['AwsIntegrationsXRayArgs']]:
         """
@@ -1009,12 +908,13 @@ class AwsIntegrationsArgs:
 @pulumi.input_type
 class _AwsIntegrationsState:
     def __init__(__self__, *,
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 account_id: Optional[pulumi.Input[_builtins.str]] = None,
                  alb: Optional[pulumi.Input['AwsIntegrationsAlbArgs']] = None,
                  api_gateway: Optional[pulumi.Input['AwsIntegrationsApiGatewayArgs']] = None,
                  auto_scaling: Optional[pulumi.Input['AwsIntegrationsAutoScalingArgs']] = None,
                  aws_app_sync: Optional[pulumi.Input['AwsIntegrationsAwsAppSyncArgs']] = None,
                  aws_athena: Optional[pulumi.Input['AwsIntegrationsAwsAthenaArgs']] = None,
+                 aws_auto_discovery: Optional[pulumi.Input['AwsIntegrationsAwsAutoDiscoveryArgs']] = None,
                  aws_cognito: Optional[pulumi.Input['AwsIntegrationsAwsCognitoArgs']] = None,
                  aws_connect: Optional[pulumi.Input['AwsIntegrationsAwsConnectArgs']] = None,
                  aws_direct_connect: Optional[pulumi.Input['AwsIntegrationsAwsDirectConnectArgs']] = None,
@@ -1052,7 +952,7 @@ class _AwsIntegrationsState:
                  kinesis: Optional[pulumi.Input['AwsIntegrationsKinesisArgs']] = None,
                  kinesis_firehose: Optional[pulumi.Input['AwsIntegrationsKinesisFirehoseArgs']] = None,
                  lambda_: Optional[pulumi.Input['AwsIntegrationsLambdaArgs']] = None,
-                 linked_account_id: Optional[pulumi.Input[int]] = None,
+                 linked_account_id: Optional[pulumi.Input[_builtins.str]] = None,
                  rds: Optional[pulumi.Input['AwsIntegrationsRdsArgs']] = None,
                  redshift: Optional[pulumi.Input['AwsIntegrationsRedshiftArgs']] = None,
                  route53: Optional[pulumi.Input['AwsIntegrationsRoute53Args']] = None,
@@ -1065,12 +965,13 @@ class _AwsIntegrationsState:
                  x_ray: Optional[pulumi.Input['AwsIntegrationsXRayArgs']] = None):
         """
         Input properties used for looking up and filtering AwsIntegrations resources.
-        :param pulumi.Input[int] account_id: The New Relic account ID to operate on.  This allows the user to override the `account_id` attribute set on the provider. Defaults to the environment variable `NEW_RELIC_ACCOUNT_ID`.
+        :param pulumi.Input[_builtins.str] account_id: The New Relic account ID to operate on.  This allows the user to override the `account_id` attribute set on the provider. Defaults to the environment variable `NEW_RELIC_ACCOUNT_ID`.
         :param pulumi.Input['AwsIntegrationsAlbArgs'] alb: ALB integration
         :param pulumi.Input['AwsIntegrationsApiGatewayArgs'] api_gateway: API Gateway integration
-        :param pulumi.Input['AwsIntegrationsAutoScalingArgs'] auto_scaling: ,`aws_app_sync`,`aws_athena`,`aws_cognito`,`aws_connect`,`aws_direct_connect`,`aws_fsx`,`aws_glue`,`aws_kinesis_analytics`,`aws_media_convert`,`aws_media_package_vod`,`aws_mq`,`aws_msk`,`aws_neptune`,`aws_qldb`,`aws_route53resolver`,`aws_states`,`aws_transit_gateway`,`aws_waf`,`aws_wafv2`,`iot`,`kinesis_firehose` and `ses`.
+        :param pulumi.Input['AwsIntegrationsAutoScalingArgs'] auto_scaling: AutoScaling integration
         :param pulumi.Input['AwsIntegrationsAwsAppSyncArgs'] aws_app_sync: Aws Appsync integration
         :param pulumi.Input['AwsIntegrationsAwsAthenaArgs'] aws_athena: Aws Athena integration
+        :param pulumi.Input['AwsIntegrationsAwsAutoDiscoveryArgs'] aws_auto_discovery: Aws Auto Discovery Integration
         :param pulumi.Input['AwsIntegrationsAwsCognitoArgs'] aws_cognito: Aws Cognito integration
         :param pulumi.Input['AwsIntegrationsAwsConnectArgs'] aws_connect: Aws Connect integration
         :param pulumi.Input['AwsIntegrationsAwsDirectConnectArgs'] aws_direct_connect: Aws Direct Connect integration
@@ -1108,68 +1009,7 @@ class _AwsIntegrationsState:
         :param pulumi.Input['AwsIntegrationsKinesisArgs'] kinesis: Kinesis integration
         :param pulumi.Input['AwsIntegrationsKinesisFirehoseArgs'] kinesis_firehose: Kinesis Firehose integration
         :param pulumi.Input['AwsIntegrationsLambdaArgs'] lambda_: Lambda integration
-        :param pulumi.Input[int] linked_account_id: The ID of the linked AWS account in New Relic.
-               All other arguments are dependent on the services to be integrated, which have been listed in the collapsible section below. All of these are **optional** blocks that can be added in any required combination. **For details on arguments that can be used with each service, check out the `Integration` blocks section below.**
-               <details>
-               <summary>Expand this section to view all supported AWS services supported, that may be integrated via this resource.</summary>
-               | Block                   | Description                   |
-               |-------------------------|-------------------------------|
-               | `alb`                   | ALB Integration               |
-               | `api_gateway`           | API Gateway Integration       |
-               | `auto_scaling`          | Auto Scaling Integration      |
-               | `aws_app_sync`          | AppSync Integration           |
-               | `aws_athena`            | Athena Integration            |
-               | `aws_cognito`           | Cognito Integration           |
-               | `aws_connect`           | Connect Integration           |
-               | `aws_direct_connect`    | Direct Connect Integration    |
-               | `aws_fsx`               | FSx Integration               |
-               | `aws_glue`              | Glue Integration              |
-               | `aws_kinesis_analytics` | Kinesis Analytics Integration |
-               | `aws_media_convert`     | MediaConvert Integration      |
-               | `aws_media_package_vod` | Media Package VOD Integration |
-               | `aws_mq`                | MQ Integration                |
-               | `aws_msk`               | MSK Integration               |
-               | `aws_neptune`           | Neptune Integration           |
-               | `aws_qldb`              | QLDB Integration              |
-               | `aws_route53resolver`   | Route53 Resolver Integration  |
-               | `aws_states`            | States Integration            |
-               | `aws_transit_gateway`   | Transit Gateway Integration   |
-               | `aws_waf`               | WAF Integration               |
-               | `aws_wafv2`             | WAFv2 Integration             |
-               | `billing`               | Billing Integration           |
-               | `cloudfront`            | CloudFront Integration        |
-               | `cloudtrail`            | CloudTrail Integration        |
-               | `doc_db`                | DocumentDB Integration        |
-               | `dynamodb`              | DynamoDB Integration          |
-               | `ebs`                   | EBS Integration               |
-               | `ec2`                   | EC2 Integration               |
-               | `ecs`                   | ECS Integration               |
-               | `efs`                   | EFS Integration               |
-               | `elasticache`           | ElastiCache Integration       |
-               | `elasticbeanstalk`      | Elastic Beanstalk Integration |
-               | `elasticsearch`         | Elasticsearch Integration     |
-               | `elb`                   | ELB Integration               |
-               | `emr`                   | EMR Integration               |
-               | `health`                | Health Integration            |
-               | `iam`                   | IAM Integration               |
-               | `iot`                   | IoT Integration               |
-               | `kinesis`               | Kinesis Integration           |
-               | `kinesis_firehose`      | Kinesis Firehose Integration  |
-               | `lambda`                | Lambda Integration            |
-               | `rds`                   | RDS Integration               |
-               | `redshift`              | Redshift Integration          |
-               | `route53`               | Route53 Integration           |
-               | `s3`                    | S3 Integration                |
-               | `ses`                   | SES Integration               |
-               | `sns`                   | SNS Integration               |
-               | `sqs`                   | SQS Integration               |
-               | `trusted_advisor`       | Trusted Advisor Integration   |
-               | `vpc`                   | VPC Integration               |
-               | `x_ray`                 | X-Ray Integration             |
-               </details>
+        :param pulumi.Input[_builtins.str] linked_account_id: The ID of the linked AWS account in New Relic.
         :param pulumi.Input['AwsIntegrationsRdsArgs'] rds: Rds integration
         :param pulumi.Input['AwsIntegrationsRedshiftArgs'] redshift: Redshift integration
         :param pulumi.Input['AwsIntegrationsRoute53Args'] route53: Route53 integration
@@ -1193,6 +1033,8 @@ class _AwsIntegrationsState:
             pulumi.set(__self__, "aws_app_sync", aws_app_sync)
         if aws_athena is not None:
             pulumi.set(__self__, "aws_athena", aws_athena)
+        if aws_auto_discovery is not None:
+            pulumi.set(__self__, "aws_auto_discovery", aws_auto_discovery)
         if aws_cognito is not None:
             pulumi.set(__self__, "aws_cognito", aws_cognito)
         if aws_connect is not None:
@@ -1290,19 +1132,19 @@ class _AwsIntegrationsState:
         if x_ray is not None:
             pulumi.set(__self__, "x_ray", x_ray)
-    @property
+    @_builtins.property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> Optional[pulumi.Input[int]]:
+    def account_id(self) -> Optional[pulumi.Input[_builtins.str]]:
         """
         The New Relic account ID to operate on.  This allows the user to override the `account_id` attribute set on the provider. Defaults to the environment variable `NEW_RELIC_ACCOUNT_ID`.
         """
         return pulumi.get(self, "account_id")
     @account_id.setter
-    def account_id(self, value: Optional[pulumi.Input[int]]):
+    def account_id(self, value: Optional[pulumi.Input[_builtins.str]]):
         pulumi.set(self, "account_id", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def alb(self) -> Optional[pulumi.Input['AwsIntegrationsAlbArgs']]:
         """
@@ -1314,7 +1156,7 @@ class _AwsIntegrationsState:
     def alb(self, value: Optional[pulumi.Input['AwsIntegrationsAlbArgs']]):
         pulumi.set(self, "alb", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="apiGateway")
     def api_gateway(self) -> Optional[pulumi.Input['AwsIntegrationsApiGatewayArgs']]:
         """
@@ -1326,11 +1168,11 @@ class _AwsIntegrationsState:
     def api_gateway(self, value: Optional[pulumi.Input['AwsIntegrationsApiGatewayArgs']]):
         pulumi.set(self, "api_gateway", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="autoScaling")
     def auto_scaling(self) -> Optional[pulumi.Input['AwsIntegrationsAutoScalingArgs']]:
         """
-        ,`aws_app_sync`,`aws_athena`,`aws_cognito`,`aws_connect`,`aws_direct_connect`,`aws_fsx`,`aws_glue`,`aws_kinesis_analytics`,`aws_media_convert`,`aws_media_package_vod`,`aws_mq`,`aws_msk`,`aws_neptune`,`aws_qldb`,`aws_route53resolver`,`aws_states`,`aws_transit_gateway`,`aws_waf`,`aws_wafv2`,`iot`,`kinesis_firehose` and `ses`.
+        AutoScaling integration
         """
         return pulumi.get(self, "auto_scaling")
@@ -1338,7 +1180,7 @@ class _AwsIntegrationsState:
     def auto_scaling(self, value: Optional[pulumi.Input['AwsIntegrationsAutoScalingArgs']]):
         pulumi.set(self, "auto_scaling", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsAppSync")
     def aws_app_sync(self) -> Optional[pulumi.Input['AwsIntegrationsAwsAppSyncArgs']]:
         """
@@ -1350,7 +1192,7 @@ class _AwsIntegrationsState:
     def aws_app_sync(self, value: Optional[pulumi.Input['AwsIntegrationsAwsAppSyncArgs']]):
         pulumi.set(self, "aws_app_sync", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsAthena")
     def aws_athena(self) -> Optional[pulumi.Input['AwsIntegrationsAwsAthenaArgs']]:
         """
@@ -1362,7 +1204,19 @@ class _AwsIntegrationsState:
     def aws_athena(self, value: Optional[pulumi.Input['AwsIntegrationsAwsAthenaArgs']]):
         pulumi.set(self, "aws_athena", value)
-    @property
+    @_builtins.property
+    @pulumi.getter(name="awsAutoDiscovery")
+    def aws_auto_discovery(self) -> Optional[pulumi.Input['AwsIntegrationsAwsAutoDiscoveryArgs']]:
+        """
+        Aws Auto Discovery Integration
+        """
+        return pulumi.get(self, "aws_auto_discovery")
+    @aws_auto_discovery.setter
+    def aws_auto_discovery(self, value: Optional[pulumi.Input['AwsIntegrationsAwsAutoDiscoveryArgs']]):
+        pulumi.set(self, "aws_auto_discovery", value)
+    @_builtins.property
     @pulumi.getter(name="awsCognito")
     def aws_cognito(self) -> Optional[pulumi.Input['AwsIntegrationsAwsCognitoArgs']]:
         """
@@ -1374,7 +1228,7 @@ class _AwsIntegrationsState:
     def aws_cognito(self, value: Optional[pulumi.Input['AwsIntegrationsAwsCognitoArgs']]):
         pulumi.set(self, "aws_cognito", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsConnect")
     def aws_connect(self) -> Optional[pulumi.Input['AwsIntegrationsAwsConnectArgs']]:
         """
@@ -1386,7 +1240,7 @@ class _AwsIntegrationsState:
     def aws_connect(self, value: Optional[pulumi.Input['AwsIntegrationsAwsConnectArgs']]):
         pulumi.set(self, "aws_connect", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsDirectConnect")
     def aws_direct_connect(self) -> Optional[pulumi.Input['AwsIntegrationsAwsDirectConnectArgs']]:
         """
@@ -1398,7 +1252,7 @@ class _AwsIntegrationsState:
     def aws_direct_connect(self, value: Optional[pulumi.Input['AwsIntegrationsAwsDirectConnectArgs']]):
         pulumi.set(self, "aws_direct_connect", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsFsx")
     def aws_fsx(self) -> Optional[pulumi.Input['AwsIntegrationsAwsFsxArgs']]:
         """
@@ -1410,7 +1264,7 @@ class _AwsIntegrationsState:
     def aws_fsx(self, value: Optional[pulumi.Input['AwsIntegrationsAwsFsxArgs']]):
         pulumi.set(self, "aws_fsx", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsGlue")
     def aws_glue(self) -> Optional[pulumi.Input['AwsIntegrationsAwsGlueArgs']]:
         """
@@ -1422,7 +1276,7 @@ class _AwsIntegrationsState:
     def aws_glue(self, value: Optional[pulumi.Input['AwsIntegrationsAwsGlueArgs']]):
         pulumi.set(self, "aws_glue", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsKinesisAnalytics")
     def aws_kinesis_analytics(self) -> Optional[pulumi.Input['AwsIntegrationsAwsKinesisAnalyticsArgs']]:
         """
@@ -1434,7 +1288,7 @@ class _AwsIntegrationsState:
     def aws_kinesis_analytics(self, value: Optional[pulumi.Input['AwsIntegrationsAwsKinesisAnalyticsArgs']]):
         pulumi.set(self, "aws_kinesis_analytics", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMediaConvert")
     def aws_media_convert(self) -> Optional[pulumi.Input['AwsIntegrationsAwsMediaConvertArgs']]:
         """
@@ -1446,7 +1300,7 @@ class _AwsIntegrationsState:
     def aws_media_convert(self, value: Optional[pulumi.Input['AwsIntegrationsAwsMediaConvertArgs']]):
         pulumi.set(self, "aws_media_convert", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMediaPackageVod")
     def aws_media_package_vod(self) -> Optional[pulumi.Input['AwsIntegrationsAwsMediaPackageVodArgs']]:
         """
@@ -1458,7 +1312,7 @@ class _AwsIntegrationsState:
     def aws_media_package_vod(self, value: Optional[pulumi.Input['AwsIntegrationsAwsMediaPackageVodArgs']]):
         pulumi.set(self, "aws_media_package_vod", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMq")
     def aws_mq(self) -> Optional[pulumi.Input['AwsIntegrationsAwsMqArgs']]:
         """
@@ -1470,7 +1324,7 @@ class _AwsIntegrationsState:
     def aws_mq(self, value: Optional[pulumi.Input['AwsIntegrationsAwsMqArgs']]):
         pulumi.set(self, "aws_mq", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMsk")
     def aws_msk(self) -> Optional[pulumi.Input['AwsIntegrationsAwsMskArgs']]:
         """
@@ -1482,7 +1336,7 @@ class _AwsIntegrationsState:
     def aws_msk(self, value: Optional[pulumi.Input['AwsIntegrationsAwsMskArgs']]):
         pulumi.set(self, "aws_msk", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsNeptune")
     def aws_neptune(self) -> Optional[pulumi.Input['AwsIntegrationsAwsNeptuneArgs']]:
         """
@@ -1494,7 +1348,7 @@ class _AwsIntegrationsState:
     def aws_neptune(self, value: Optional[pulumi.Input['AwsIntegrationsAwsNeptuneArgs']]):
         pulumi.set(self, "aws_neptune", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsQldb")
     def aws_qldb(self) -> Optional[pulumi.Input['AwsIntegrationsAwsQldbArgs']]:
         """
@@ -1506,7 +1360,7 @@ class _AwsIntegrationsState:
     def aws_qldb(self, value: Optional[pulumi.Input['AwsIntegrationsAwsQldbArgs']]):
         pulumi.set(self, "aws_qldb", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsRoute53resolver")
     def aws_route53resolver(self) -> Optional[pulumi.Input['AwsIntegrationsAwsRoute53resolverArgs']]:
         """
@@ -1518,7 +1372,7 @@ class _AwsIntegrationsState:
     def aws_route53resolver(self, value: Optional[pulumi.Input['AwsIntegrationsAwsRoute53resolverArgs']]):
         pulumi.set(self, "aws_route53resolver", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsStates")
     def aws_states(self) -> Optional[pulumi.Input['AwsIntegrationsAwsStatesArgs']]:
         """
@@ -1530,7 +1384,7 @@ class _AwsIntegrationsState:
     def aws_states(self, value: Optional[pulumi.Input['AwsIntegrationsAwsStatesArgs']]):
         pulumi.set(self, "aws_states", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsTransitGateway")
     def aws_transit_gateway(self) -> Optional[pulumi.Input['AwsIntegrationsAwsTransitGatewayArgs']]:
         """
@@ -1542,7 +1396,7 @@ class _AwsIntegrationsState:
     def aws_transit_gateway(self, value: Optional[pulumi.Input['AwsIntegrationsAwsTransitGatewayArgs']]):
         pulumi.set(self, "aws_transit_gateway", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsWaf")
     def aws_waf(self) -> Optional[pulumi.Input['AwsIntegrationsAwsWafArgs']]:
         """
@@ -1554,7 +1408,7 @@ class _AwsIntegrationsState:
     def aws_waf(self, value: Optional[pulumi.Input['AwsIntegrationsAwsWafArgs']]):
         pulumi.set(self, "aws_waf", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsWafv2")
     def aws_wafv2(self) -> Optional[pulumi.Input['AwsIntegrationsAwsWafv2Args']]:
         """
@@ -1566,7 +1420,7 @@ class _AwsIntegrationsState:
     def aws_wafv2(self, value: Optional[pulumi.Input['AwsIntegrationsAwsWafv2Args']]):
         pulumi.set(self, "aws_wafv2", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def billing(self) -> Optional[pulumi.Input['AwsIntegrationsBillingArgs']]:
         """
@@ -1578,7 +1432,7 @@ class _AwsIntegrationsState:
     def billing(self, value: Optional[pulumi.Input['AwsIntegrationsBillingArgs']]):
         pulumi.set(self, "billing", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def cloudfront(self) -> Optional[pulumi.Input['AwsIntegrationsCloudfrontArgs']]:
         """
@@ -1590,7 +1444,7 @@ class _AwsIntegrationsState:
     def cloudfront(self, value: Optional[pulumi.Input['AwsIntegrationsCloudfrontArgs']]):
         pulumi.set(self, "cloudfront", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def cloudtrail(self) -> Optional[pulumi.Input['AwsIntegrationsCloudtrailArgs']]:
         """
@@ -1602,7 +1456,7 @@ class _AwsIntegrationsState:
     def cloudtrail(self, value: Optional[pulumi.Input['AwsIntegrationsCloudtrailArgs']]):
         pulumi.set(self, "cloudtrail", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="docDb")
     def doc_db(self) -> Optional[pulumi.Input['AwsIntegrationsDocDbArgs']]:
         """
@@ -1614,7 +1468,7 @@ class _AwsIntegrationsState:
     def doc_db(self, value: Optional[pulumi.Input['AwsIntegrationsDocDbArgs']]):
         pulumi.set(self, "doc_db", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def dynamodb(self) -> Optional[pulumi.Input['AwsIntegrationsDynamodbArgs']]:
         """
@@ -1626,7 +1480,7 @@ class _AwsIntegrationsState:
     def dynamodb(self, value: Optional[pulumi.Input['AwsIntegrationsDynamodbArgs']]):
         pulumi.set(self, "dynamodb", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def ebs(self) -> Optional[pulumi.Input['AwsIntegrationsEbsArgs']]:
         """
@@ -1638,7 +1492,7 @@ class _AwsIntegrationsState:
     def ebs(self, value: Optional[pulumi.Input['AwsIntegrationsEbsArgs']]):
         pulumi.set(self, "ebs", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def ec2(self) -> Optional[pulumi.Input['AwsIntegrationsEc2Args']]:
         """
@@ -1650,7 +1504,7 @@ class _AwsIntegrationsState:
     def ec2(self, value: Optional[pulumi.Input['AwsIntegrationsEc2Args']]):
         pulumi.set(self, "ec2", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def ecs(self) -> Optional[pulumi.Input['AwsIntegrationsEcsArgs']]:
         """
@@ -1662,7 +1516,7 @@ class _AwsIntegrationsState:
     def ecs(self, value: Optional[pulumi.Input['AwsIntegrationsEcsArgs']]):
         pulumi.set(self, "ecs", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def efs(self) -> Optional[pulumi.Input['AwsIntegrationsEfsArgs']]:
         """
@@ -1674,7 +1528,7 @@ class _AwsIntegrationsState:
     def efs(self, value: Optional[pulumi.Input['AwsIntegrationsEfsArgs']]):
         pulumi.set(self, "efs", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def elasticache(self) -> Optional[pulumi.Input['AwsIntegrationsElasticacheArgs']]:
         """
@@ -1686,7 +1540,7 @@ class _AwsIntegrationsState:
     def elasticache(self, value: Optional[pulumi.Input['AwsIntegrationsElasticacheArgs']]):
         pulumi.set(self, "elasticache", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def elasticbeanstalk(self) -> Optional[pulumi.Input['AwsIntegrationsElasticbeanstalkArgs']]:
         """
@@ -1698,7 +1552,7 @@ class _AwsIntegrationsState:
     def elasticbeanstalk(self, value: Optional[pulumi.Input['AwsIntegrationsElasticbeanstalkArgs']]):
         pulumi.set(self, "elasticbeanstalk", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def elasticsearch(self) -> Optional[pulumi.Input['AwsIntegrationsElasticsearchArgs']]:
         """
@@ -1710,7 +1564,7 @@ class _AwsIntegrationsState:
     def elasticsearch(self, value: Optional[pulumi.Input['AwsIntegrationsElasticsearchArgs']]):
         pulumi.set(self, "elasticsearch", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def elb(self) -> Optional[pulumi.Input['AwsIntegrationsElbArgs']]:
         """
@@ -1722,7 +1576,7 @@ class _AwsIntegrationsState:
     def elb(self, value: Optional[pulumi.Input['AwsIntegrationsElbArgs']]):
         pulumi.set(self, "elb", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def emr(self) -> Optional[pulumi.Input['AwsIntegrationsEmrArgs']]:
         """
@@ -1734,7 +1588,7 @@ class _AwsIntegrationsState:
     def emr(self, value: Optional[pulumi.Input['AwsIntegrationsEmrArgs']]):
         pulumi.set(self, "emr", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def health(self) -> Optional[pulumi.Input['AwsIntegrationsHealthArgs']]:
         """
@@ -1746,7 +1600,7 @@ class _AwsIntegrationsState:
     def health(self, value: Optional[pulumi.Input['AwsIntegrationsHealthArgs']]):
         pulumi.set(self, "health", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def iam(self) -> Optional[pulumi.Input['AwsIntegrationsIamArgs']]:
         """
@@ -1758,7 +1612,7 @@ class _AwsIntegrationsState:
     def iam(self, value: Optional[pulumi.Input['AwsIntegrationsIamArgs']]):
         pulumi.set(self, "iam", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def iot(self) -> Optional[pulumi.Input['AwsIntegrationsIotArgs']]:
         """
@@ -1770,7 +1624,7 @@ class _AwsIntegrationsState:
     def iot(self, value: Optional[pulumi.Input['AwsIntegrationsIotArgs']]):
         pulumi.set(self, "iot", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def kinesis(self) -> Optional[pulumi.Input['AwsIntegrationsKinesisArgs']]:
         """
@@ -1782,7 +1636,7 @@ class _AwsIntegrationsState:
     def kinesis(self, value: Optional[pulumi.Input['AwsIntegrationsKinesisArgs']]):
         pulumi.set(self, "kinesis", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="kinesisFirehose")
     def kinesis_firehose(self) -> Optional[pulumi.Input['AwsIntegrationsKinesisFirehoseArgs']]:
         """
@@ -1794,7 +1648,7 @@ class _AwsIntegrationsState:
     def kinesis_firehose(self, value: Optional[pulumi.Input['AwsIntegrationsKinesisFirehoseArgs']]):
         pulumi.set(self, "kinesis_firehose", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="lambda")
     def lambda_(self) -> Optional[pulumi.Input['AwsIntegrationsLambdaArgs']]:
         """
@@ -1806,80 +1660,19 @@ class _AwsIntegrationsState:
     def lambda_(self, value: Optional[pulumi.Input['AwsIntegrationsLambdaArgs']]):
         pulumi.set(self, "lambda_", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="linkedAccountId")
-    def linked_account_id(self) -> Optional[pulumi.Input[int]]:
+    def linked_account_id(self) -> Optional[pulumi.Input[_builtins.str]]:
         """
         The ID of the linked AWS account in New Relic.
-        All other arguments are dependent on the services to be integrated, which have been listed in the collapsible section below. All of these are **optional** blocks that can be added in any required combination. **For details on arguments that can be used with each service, check out the `Integration` blocks section below.**
-        <details>
-        <summary>Expand this section to view all supported AWS services supported, that may be integrated via this resource.</summary>
-        | Block                   | Description                   |
-        |-------------------------|-------------------------------|
-        | `alb`                   | ALB Integration               |
-        | `api_gateway`           | API Gateway Integration       |
-        | `auto_scaling`          | Auto Scaling Integration      |
-        | `aws_app_sync`          | AppSync Integration           |
-        | `aws_athena`            | Athena Integration            |
-        | `aws_cognito`           | Cognito Integration           |
-        | `aws_connect`           | Connect Integration           |
-        | `aws_direct_connect`    | Direct Connect Integration    |
-        | `aws_fsx`               | FSx Integration               |
-        | `aws_glue`              | Glue Integration              |
-        | `aws_kinesis_analytics` | Kinesis Analytics Integration |
-        | `aws_media_convert`     | MediaConvert Integration      |
-        | `aws_media_package_vod` | Media Package VOD Integration |
-        | `aws_mq`                | MQ Integration                |
-        | `aws_msk`               | MSK Integration               |
-        | `aws_neptune`           | Neptune Integration           |
-        | `aws_qldb`              | QLDB Integration              |
-        | `aws_route53resolver`   | Route53 Resolver Integration  |
-        | `aws_states`            | States Integration            |
-        | `aws_transit_gateway`   | Transit Gateway Integration   |
-        | `aws_waf`               | WAF Integration               |
-        | `aws_wafv2`             | WAFv2 Integration             |
-        | `billing`               | Billing Integration           |
-        | `cloudfront`            | CloudFront Integration        |
-        | `cloudtrail`            | CloudTrail Integration        |
-        | `doc_db`                | DocumentDB Integration        |
-        | `dynamodb`              | DynamoDB Integration          |
-        | `ebs`                   | EBS Integration               |
-        | `ec2`                   | EC2 Integration               |
-        | `ecs`                   | ECS Integration               |
-        | `efs`                   | EFS Integration               |
-        | `elasticache`           | ElastiCache Integration       |
-        | `elasticbeanstalk`      | Elastic Beanstalk Integration |
-        | `elasticsearch`         | Elasticsearch Integration     |
-        | `elb`                   | ELB Integration               |
-        | `emr`                   | EMR Integration               |
-        | `health`                | Health Integration            |
-        | `iam`                   | IAM Integration               |
-        | `iot`                   | IoT Integration               |
-        | `kinesis`               | Kinesis Integration           |
-        | `kinesis_firehose`      | Kinesis Firehose Integration  |
-        | `lambda`                | Lambda Integration            |
-        | `rds`                   | RDS Integration               |
-        | `redshift`              | Redshift Integration          |
-        | `route53`               | Route53 Integration           |
-        | `s3`                    | S3 Integration                |
-        | `ses`                   | SES Integration               |
-        | `sns`                   | SNS Integration               |
-        | `sqs`                   | SQS Integration               |
-        | `trusted_advisor`       | Trusted Advisor Integration   |
-        | `vpc`                   | VPC Integration               |
-        | `x_ray`                 | X-Ray Integration             |
-        </details>
         """
         return pulumi.get(self, "linked_account_id")
     @linked_account_id.setter
-    def linked_account_id(self, value: Optional[pulumi.Input[int]]):
+    def linked_account_id(self, value: Optional[pulumi.Input[_builtins.str]]):
         pulumi.set(self, "linked_account_id", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def rds(self) -> Optional[pulumi.Input['AwsIntegrationsRdsArgs']]:
         """
@@ -1891,7 +1684,7 @@ class _AwsIntegrationsState:
     def rds(self, value: Optional[pulumi.Input['AwsIntegrationsRdsArgs']]):
         pulumi.set(self, "rds", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def redshift(self) -> Optional[pulumi.Input['AwsIntegrationsRedshiftArgs']]:
         """
@@ -1903,7 +1696,7 @@ class _AwsIntegrationsState:
     def redshift(self, value: Optional[pulumi.Input['AwsIntegrationsRedshiftArgs']]):
         pulumi.set(self, "redshift", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def route53(self) -> Optional[pulumi.Input['AwsIntegrationsRoute53Args']]:
         """
@@ -1915,7 +1708,7 @@ class _AwsIntegrationsState:
     def route53(self, value: Optional[pulumi.Input['AwsIntegrationsRoute53Args']]):
         pulumi.set(self, "route53", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def s3(self) -> Optional[pulumi.Input['AwsIntegrationsS3Args']]:
         """
@@ -1927,7 +1720,7 @@ class _AwsIntegrationsState:
     def s3(self, value: Optional[pulumi.Input['AwsIntegrationsS3Args']]):
         pulumi.set(self, "s3", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def ses(self) -> Optional[pulumi.Input['AwsIntegrationsSesArgs']]:
         """
@@ -1939,7 +1732,7 @@ class _AwsIntegrationsState:
     def ses(self, value: Optional[pulumi.Input['AwsIntegrationsSesArgs']]):
         pulumi.set(self, "ses", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def sns(self) -> Optional[pulumi.Input['AwsIntegrationsSnsArgs']]:
         """
@@ -1951,7 +1744,7 @@ class _AwsIntegrationsState:
     def sns(self, value: Optional[pulumi.Input['AwsIntegrationsSnsArgs']]):
         pulumi.set(self, "sns", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def sqs(self) -> Optional[pulumi.Input['AwsIntegrationsSqsArgs']]:
         """
@@ -1963,7 +1756,7 @@ class _AwsIntegrationsState:
     def sqs(self, value: Optional[pulumi.Input['AwsIntegrationsSqsArgs']]):
         pulumi.set(self, "sqs", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="trustedAdvisor")
     def trusted_advisor(self) -> Optional[pulumi.Input['AwsIntegrationsTrustedAdvisorArgs']]:
         """
@@ -1975,7 +1768,7 @@ class _AwsIntegrationsState:
     def trusted_advisor(self, value: Optional[pulumi.Input['AwsIntegrationsTrustedAdvisorArgs']]):
         pulumi.set(self, "trusted_advisor", value)
-    @property
+    @_builtins.property
     @pulumi.getter
     def vpc(self) -> Optional[pulumi.Input['AwsIntegrationsVpcArgs']]:
         """
@@ -1987,7 +1780,7 @@ class _AwsIntegrationsState:
     def vpc(self, value: Optional[pulumi.Input['AwsIntegrationsVpcArgs']]):
         pulumi.set(self, "vpc", value)
-    @property
+    @_builtins.property
     @pulumi.getter(name="xRay")
     def x_ray(self) -> Optional[pulumi.Input['AwsIntegrationsXRayArgs']]:
         """
@@ -2000,370 +1793,69 @@ class _AwsIntegrationsState:
         pulumi.set(self, "x_ray", value)
+@pulumi.type_token("newrelic:cloud/awsIntegrations:AwsIntegrations")
 class AwsIntegrations(pulumi.CustomResource):
     @overload
     def __init__(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
-                 account_id: Optional[pulumi.Input[int]] = None,
-                 alb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAlbArgs']]] = None,
-                 api_gateway: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsApiGatewayArgs']]] = None,
-                 auto_scaling: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAutoScalingArgs']]] = None,
-                 aws_app_sync: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsAppSyncArgs']]] = None,
-                 aws_athena: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsAthenaArgs']]] = None,
-                 aws_cognito: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsCognitoArgs']]] = None,
-                 aws_connect: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsConnectArgs']]] = None,
-                 aws_direct_connect: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsDirectConnectArgs']]] = None,
-                 aws_fsx: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsFsxArgs']]] = None,
-                 aws_glue: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsGlueArgs']]] = None,
-                 aws_kinesis_analytics: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsKinesisAnalyticsArgs']]] = None,
-                 aws_media_convert: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMediaConvertArgs']]] = None,
-                 aws_media_package_vod: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMediaPackageVodArgs']]] = None,
-                 aws_mq: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMqArgs']]] = None,
-                 aws_msk: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMskArgs']]] = None,
-                 aws_neptune: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsNeptuneArgs']]] = None,
-                 aws_qldb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsQldbArgs']]] = None,
-                 aws_route53resolver: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsRoute53resolverArgs']]] = None,
-                 aws_states: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsStatesArgs']]] = None,
-                 aws_transit_gateway: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsTransitGatewayArgs']]] = None,
-                 aws_waf: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsWafArgs']]] = None,
-                 aws_wafv2: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsWafv2Args']]] = None,
-                 billing: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsBillingArgs']]] = None,
-                 cloudfront: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsCloudfrontArgs']]] = None,
-                 cloudtrail: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsCloudtrailArgs']]] = None,
-                 doc_db: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsDocDbArgs']]] = None,
-                 dynamodb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsDynamodbArgs']]] = None,
-                 ebs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEbsArgs']]] = None,
-                 ec2: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEc2Args']]] = None,
-                 ecs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEcsArgs']]] = None,
-                 efs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEfsArgs']]] = None,
-                 elasticache: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElasticacheArgs']]] = None,
-                 elasticbeanstalk: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElasticbeanstalkArgs']]] = None,
-                 elasticsearch: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElasticsearchArgs']]] = None,
-                 elb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElbArgs']]] = None,
-                 emr: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEmrArgs']]] = None,
-                 health: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsHealthArgs']]] = None,
-                 iam: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsIamArgs']]] = None,
-                 iot: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsIotArgs']]] = None,
-                 kinesis: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsKinesisArgs']]] = None,
-                 kinesis_firehose: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsKinesisFirehoseArgs']]] = None,
-                 lambda_: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsLambdaArgs']]] = None,
-                 linked_account_id: Optional[pulumi.Input[int]] = None,
-                 rds: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsRdsArgs']]] = None,
-                 redshift: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsRedshiftArgs']]] = None,
-                 route53: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsRoute53Args']]] = None,
-                 s3: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsS3Args']]] = None,
-                 ses: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsSesArgs']]] = None,
-                 sns: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsSnsArgs']]] = None,
-                 sqs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsSqsArgs']]] = None,
-                 trusted_advisor: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsTrustedAdvisorArgs']]] = None,
-                 vpc: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsVpcArgs']]] = None,
-                 x_ray: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsXRayArgs']]] = None,
+                 account_id: Optional[pulumi.Input[_builtins.str]] = None,
+                 alb: Optional[pulumi.Input[Union['AwsIntegrationsAlbArgs', 'AwsIntegrationsAlbArgsDict']]] = None,
+                 api_gateway: Optional[pulumi.Input[Union['AwsIntegrationsApiGatewayArgs', 'AwsIntegrationsApiGatewayArgsDict']]] = None,
+                 auto_scaling: Optional[pulumi.Input[Union['AwsIntegrationsAutoScalingArgs', 'AwsIntegrationsAutoScalingArgsDict']]] = None,
+                 aws_app_sync: Optional[pulumi.Input[Union['AwsIntegrationsAwsAppSyncArgs', 'AwsIntegrationsAwsAppSyncArgsDict']]] = None,
+                 aws_athena: Optional[pulumi.Input[Union['AwsIntegrationsAwsAthenaArgs', 'AwsIntegrationsAwsAthenaArgsDict']]] = None,
+                 aws_auto_discovery: Optional[pulumi.Input[Union['AwsIntegrationsAwsAutoDiscoveryArgs', 'AwsIntegrationsAwsAutoDiscoveryArgsDict']]] = None,
+                 aws_cognito: Optional[pulumi.Input[Union['AwsIntegrationsAwsCognitoArgs', 'AwsIntegrationsAwsCognitoArgsDict']]] = None,
+                 aws_connect: Optional[pulumi.Input[Union['AwsIntegrationsAwsConnectArgs', 'AwsIntegrationsAwsConnectArgsDict']]] = None,
+                 aws_direct_connect: Optional[pulumi.Input[Union['AwsIntegrationsAwsDirectConnectArgs', 'AwsIntegrationsAwsDirectConnectArgsDict']]] = None,
+                 aws_fsx: Optional[pulumi.Input[Union['AwsIntegrationsAwsFsxArgs', 'AwsIntegrationsAwsFsxArgsDict']]] = None,
+                 aws_glue: Optional[pulumi.Input[Union['AwsIntegrationsAwsGlueArgs', 'AwsIntegrationsAwsGlueArgsDict']]] = None,
+                 aws_kinesis_analytics: Optional[pulumi.Input[Union['AwsIntegrationsAwsKinesisAnalyticsArgs', 'AwsIntegrationsAwsKinesisAnalyticsArgsDict']]] = None,
+                 aws_media_convert: Optional[pulumi.Input[Union['AwsIntegrationsAwsMediaConvertArgs', 'AwsIntegrationsAwsMediaConvertArgsDict']]] = None,
+                 aws_media_package_vod: Optional[pulumi.Input[Union['AwsIntegrationsAwsMediaPackageVodArgs', 'AwsIntegrationsAwsMediaPackageVodArgsDict']]] = None,
+                 aws_mq: Optional[pulumi.Input[Union['AwsIntegrationsAwsMqArgs', 'AwsIntegrationsAwsMqArgsDict']]] = None,
+                 aws_msk: Optional[pulumi.Input[Union['AwsIntegrationsAwsMskArgs', 'AwsIntegrationsAwsMskArgsDict']]] = None,
+                 aws_neptune: Optional[pulumi.Input[Union['AwsIntegrationsAwsNeptuneArgs', 'AwsIntegrationsAwsNeptuneArgsDict']]] = None,
+                 aws_qldb: Optional[pulumi.Input[Union['AwsIntegrationsAwsQldbArgs', 'AwsIntegrationsAwsQldbArgsDict']]] = None,
+                 aws_route53resolver: Optional[pulumi.Input[Union['AwsIntegrationsAwsRoute53resolverArgs', 'AwsIntegrationsAwsRoute53resolverArgsDict']]] = None,
+                 aws_states: Optional[pulumi.Input[Union['AwsIntegrationsAwsStatesArgs', 'AwsIntegrationsAwsStatesArgsDict']]] = None,
+                 aws_transit_gateway: Optional[pulumi.Input[Union['AwsIntegrationsAwsTransitGatewayArgs', 'AwsIntegrationsAwsTransitGatewayArgsDict']]] = None,
+                 aws_waf: Optional[pulumi.Input[Union['AwsIntegrationsAwsWafArgs', 'AwsIntegrationsAwsWafArgsDict']]] = None,
+                 aws_wafv2: Optional[pulumi.Input[Union['AwsIntegrationsAwsWafv2Args', 'AwsIntegrationsAwsWafv2ArgsDict']]] = None,
+                 billing: Optional[pulumi.Input[Union['AwsIntegrationsBillingArgs', 'AwsIntegrationsBillingArgsDict']]] = None,
+                 cloudfront: Optional[pulumi.Input[Union['AwsIntegrationsCloudfrontArgs', 'AwsIntegrationsCloudfrontArgsDict']]] = None,
+                 cloudtrail: Optional[pulumi.Input[Union['AwsIntegrationsCloudtrailArgs', 'AwsIntegrationsCloudtrailArgsDict']]] = None,
+                 doc_db: Optional[pulumi.Input[Union['AwsIntegrationsDocDbArgs', 'AwsIntegrationsDocDbArgsDict']]] = None,
+                 dynamodb: Optional[pulumi.Input[Union['AwsIntegrationsDynamodbArgs', 'AwsIntegrationsDynamodbArgsDict']]] = None,
+                 ebs: Optional[pulumi.Input[Union['AwsIntegrationsEbsArgs', 'AwsIntegrationsEbsArgsDict']]] = None,
+                 ec2: Optional[pulumi.Input[Union['AwsIntegrationsEc2Args', 'AwsIntegrationsEc2ArgsDict']]] = None,
+                 ecs: Optional[pulumi.Input[Union['AwsIntegrationsEcsArgs', 'AwsIntegrationsEcsArgsDict']]] = None,
+                 efs: Optional[pulumi.Input[Union['AwsIntegrationsEfsArgs', 'AwsIntegrationsEfsArgsDict']]] = None,
+                 elasticache: Optional[pulumi.Input[Union['AwsIntegrationsElasticacheArgs', 'AwsIntegrationsElasticacheArgsDict']]] = None,
+                 elasticbeanstalk: Optional[pulumi.Input[Union['AwsIntegrationsElasticbeanstalkArgs', 'AwsIntegrationsElasticbeanstalkArgsDict']]] = None,
+                 elasticsearch: Optional[pulumi.Input[Union['AwsIntegrationsElasticsearchArgs', 'AwsIntegrationsElasticsearchArgsDict']]] = None,
+                 elb: Optional[pulumi.Input[Union['AwsIntegrationsElbArgs', 'AwsIntegrationsElbArgsDict']]] = None,
+                 emr: Optional[pulumi.Input[Union['AwsIntegrationsEmrArgs', 'AwsIntegrationsEmrArgsDict']]] = None,
+                 health: Optional[pulumi.Input[Union['AwsIntegrationsHealthArgs', 'AwsIntegrationsHealthArgsDict']]] = None,
+                 iam: Optional[pulumi.Input[Union['AwsIntegrationsIamArgs', 'AwsIntegrationsIamArgsDict']]] = None,
+                 iot: Optional[pulumi.Input[Union['AwsIntegrationsIotArgs', 'AwsIntegrationsIotArgsDict']]] = None,
+                 kinesis: Optional[pulumi.Input[Union['AwsIntegrationsKinesisArgs', 'AwsIntegrationsKinesisArgsDict']]] = None,
+                 kinesis_firehose: Optional[pulumi.Input[Union['AwsIntegrationsKinesisFirehoseArgs', 'AwsIntegrationsKinesisFirehoseArgsDict']]] = None,
+                 lambda_: Optional[pulumi.Input[Union['AwsIntegrationsLambdaArgs', 'AwsIntegrationsLambdaArgsDict']]] = None,
+                 linked_account_id: Optional[pulumi.Input[_builtins.str]] = None,
+                 rds: Optional[pulumi.Input[Union['AwsIntegrationsRdsArgs', 'AwsIntegrationsRdsArgsDict']]] = None,
+                 redshift: Optional[pulumi.Input[Union['AwsIntegrationsRedshiftArgs', 'AwsIntegrationsRedshiftArgsDict']]] = None,
+                 route53: Optional[pulumi.Input[Union['AwsIntegrationsRoute53Args', 'AwsIntegrationsRoute53ArgsDict']]] = None,
+                 s3: Optional[pulumi.Input[Union['AwsIntegrationsS3Args', 'AwsIntegrationsS3ArgsDict']]] = None,
+                 ses: Optional[pulumi.Input[Union['AwsIntegrationsSesArgs', 'AwsIntegrationsSesArgsDict']]] = None,
+                 sns: Optional[pulumi.Input[Union['AwsIntegrationsSnsArgs', 'AwsIntegrationsSnsArgsDict']]] = None,
+                 sqs: Optional[pulumi.Input[Union['AwsIntegrationsSqsArgs', 'AwsIntegrationsSqsArgsDict']]] = None,
+                 trusted_advisor: Optional[pulumi.Input[Union['AwsIntegrationsTrustedAdvisorArgs', 'AwsIntegrationsTrustedAdvisorArgsDict']]] = None,
+                 vpc: Optional[pulumi.Input[Union['AwsIntegrationsVpcArgs', 'AwsIntegrationsVpcArgsDict']]] = None,
+                 x_ray: Optional[pulumi.Input[Union['AwsIntegrationsXRayArgs', 'AwsIntegrationsXRayArgsDict']]] = None,
                  __props__=None):
         """
-        Use this resource to integrate AWS services with New Relic.
-        ## Prerequisite
-        Setup is required for this resource to work properly. This resource assumes you have linked an AWS account to New Relic and configured it to push metrics using CloudWatch Metric Streams.
-        New Relic doesn't automatically receive metrics from AWS for some services so this resource can be used to configure integrations to those services.
-        Using a metric stream to New Relic is the preferred way to integrate with AWS. Follow the [steps outlined here](https://docs.newrelic.com/docs/infrastructure/amazon-integrations/aws-integrations-list/aws-metric-stream/#set-up-metric-stream) to set up a metric stream. This resource supports any integration that's not available through AWS metric stream.
-        ## Example Usage
-        Leave an integration block empty to use its default configuration. You can also use the full example, including the AWS set up, found in our guides.
-        <!--Start PulumiCodeChooser -->
-        ```python
-        import pulumi
-        import pulumi_newrelic as newrelic
-        foo = newrelic.cloud.AwsLinkAccount("foo",
-            arn=aws_iam_role["newrelic_aws_role"]["arn"],
-            metric_collection_mode="PULL")
-        bar = newrelic.cloud.AwsIntegrations("bar",
-            linked_account_id=foo.id,
-            billing=newrelic.cloud.AwsIntegrationsBillingArgs(),
-            cloudtrail=newrelic.cloud.AwsIntegrationsCloudtrailArgs(
-                metrics_polling_interval=6000,
-                aws_regions=[
-                    "us-east-1",
-                    "us-east-2",
-                ],
-            ),
-            health=newrelic.cloud.AwsIntegrationsHealthArgs(
-                metrics_polling_interval=6000,
-            ),
-            trusted_advisor=newrelic.cloud.AwsIntegrationsTrustedAdvisorArgs(
-                metrics_polling_interval=6000,
-            ),
-            vpc=newrelic.cloud.AwsIntegrationsVpcArgs(
-                metrics_polling_interval=6000,
-                aws_regions=[
-                    "us-east-1",
-                    "us-east-2",
-                ],
-                fetch_nat_gateway=True,
-                fetch_vpn=False,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            x_ray=newrelic.cloud.AwsIntegrationsXRayArgs(
-                metrics_polling_interval=6000,
-                aws_regions=[
-                    "us-east-1",
-                    "us-east-2",
-                ],
-            ),
-            s3=newrelic.cloud.AwsIntegrationsS3Args(
-                metrics_polling_interval=6000,
-            ),
-            doc_db=newrelic.cloud.AwsIntegrationsDocDbArgs(
-                metrics_polling_interval=6000,
-            ),
-            sqs=newrelic.cloud.AwsIntegrationsSqsArgs(
-                fetch_extended_inventory=True,
-                fetch_tags=True,
-                queue_prefixes=["queue prefix"],
-                metrics_polling_interval=6000,
-                aws_regions=["us-east-1"],
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            ebs=newrelic.cloud.AwsIntegrationsEbsArgs(
-                metrics_polling_interval=6000,
-                fetch_extended_inventory=True,
-                aws_regions=["us-east-1"],
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            alb=newrelic.cloud.AwsIntegrationsAlbArgs(
-                fetch_extended_inventory=True,
-                fetch_tags=True,
-                load_balancer_prefixes=["load balancer prefix"],
-                metrics_polling_interval=6000,
-                aws_regions=["us-east-1"],
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            elasticache=newrelic.cloud.AwsIntegrationsElasticacheArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            api_gateway=newrelic.cloud.AwsIntegrationsApiGatewayArgs(
-                metrics_polling_interval=6000,
-                aws_regions=["us-east-1"],
-                stage_prefixes=["stage prefix"],
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            auto_scaling=newrelic.cloud.AwsIntegrationsAutoScalingArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_app_sync=newrelic.cloud.AwsIntegrationsAwsAppSyncArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_athena=newrelic.cloud.AwsIntegrationsAwsAthenaArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_cognito=newrelic.cloud.AwsIntegrationsAwsCognitoArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_connect=newrelic.cloud.AwsIntegrationsAwsConnectArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_direct_connect=newrelic.cloud.AwsIntegrationsAwsDirectConnectArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_fsx=newrelic.cloud.AwsIntegrationsAwsFsxArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_glue=newrelic.cloud.AwsIntegrationsAwsGlueArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_kinesis_analytics=newrelic.cloud.AwsIntegrationsAwsKinesisAnalyticsArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_media_convert=newrelic.cloud.AwsIntegrationsAwsMediaConvertArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_media_package_vod=newrelic.cloud.AwsIntegrationsAwsMediaPackageVodArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_mq=newrelic.cloud.AwsIntegrationsAwsMqArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_msk=newrelic.cloud.AwsIntegrationsAwsMskArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_neptune=newrelic.cloud.AwsIntegrationsAwsNeptuneArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_qldb=newrelic.cloud.AwsIntegrationsAwsQldbArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_route53resolver=newrelic.cloud.AwsIntegrationsAwsRoute53resolverArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_states=newrelic.cloud.AwsIntegrationsAwsStatesArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_transit_gateway=newrelic.cloud.AwsIntegrationsAwsTransitGatewayArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_waf=newrelic.cloud.AwsIntegrationsAwsWafArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_wafv2=newrelic.cloud.AwsIntegrationsAwsWafv2Args(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            cloudfront=newrelic.cloud.AwsIntegrationsCloudfrontArgs(
-                fetch_lambdas_at_edge=True,
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            dynamodb=newrelic.cloud.AwsIntegrationsDynamodbArgs(
-                aws_regions=["us-east-1"],
-                fetch_extended_inventory=True,
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            ec2=newrelic.cloud.AwsIntegrationsEc2Args(
-                aws_regions=["us-east-1"],
-                duplicate_ec2_tags=True,
-                fetch_ip_addresses=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            ecs=newrelic.cloud.AwsIntegrationsEcsArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            efs=newrelic.cloud.AwsIntegrationsEfsArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            elasticbeanstalk=newrelic.cloud.AwsIntegrationsElasticbeanstalkArgs(
-                aws_regions=["us-east-1"],
-                fetch_extended_inventory=True,
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            elasticsearch=newrelic.cloud.AwsIntegrationsElasticsearchArgs(
-                aws_regions=["us-east-1"],
-                fetch_nodes=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            elb=newrelic.cloud.AwsIntegrationsElbArgs(
-                aws_regions=["us-east-1"],
-                fetch_extended_inventory=True,
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-            ),
-            emr=newrelic.cloud.AwsIntegrationsEmrArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            iam=newrelic.cloud.AwsIntegrationsIamArgs(
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            iot=newrelic.cloud.AwsIntegrationsIotArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            kinesis=newrelic.cloud.AwsIntegrationsKinesisArgs(
-                aws_regions=["us-east-1"],
-                fetch_shards=True,
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            kinesis_firehose=newrelic.cloud.AwsIntegrationsKinesisFirehoseArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            lambda_=newrelic.cloud.AwsIntegrationsLambdaArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            rds=newrelic.cloud.AwsIntegrationsRdsArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            redshift=newrelic.cloud.AwsIntegrationsRedshiftArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            route53=newrelic.cloud.AwsIntegrationsRoute53Args(
-                fetch_extended_inventory=True,
-                metrics_polling_interval=6000,
-            ),
-            ses=newrelic.cloud.AwsIntegrationsSesArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            sns=newrelic.cloud.AwsIntegrationsSnsArgs(
-                aws_regions=["us-east-1"],
-                fetch_extended_inventory=True,
-                metrics_polling_interval=6000,
-            ))
-        ```
-        <!--End PulumiCodeChooser -->
         ## Import
         Linked AWS account integrations can be imported using the `id`, e.g.
@@ -2376,121 +1868,61 @@ class AwsIntegrations(pulumi.CustomResource):
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
-        :param pulumi.Input[int] account_id: The New Relic account ID to operate on.  This allows the user to override the `account_id` attribute set on the provider. Defaults to the environment variable `NEW_RELIC_ACCOUNT_ID`.
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAlbArgs']] alb: ALB integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsApiGatewayArgs']] api_gateway: API Gateway integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAutoScalingArgs']] auto_scaling: ,`aws_app_sync`,`aws_athena`,`aws_cognito`,`aws_connect`,`aws_direct_connect`,`aws_fsx`,`aws_glue`,`aws_kinesis_analytics`,`aws_media_convert`,`aws_media_package_vod`,`aws_mq`,`aws_msk`,`aws_neptune`,`aws_qldb`,`aws_route53resolver`,`aws_states`,`aws_transit_gateway`,`aws_waf`,`aws_wafv2`,`iot`,`kinesis_firehose` and `ses`.
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsAppSyncArgs']] aws_app_sync: Aws Appsync integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsAthenaArgs']] aws_athena: Aws Athena integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsCognitoArgs']] aws_cognito: Aws Cognito integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsConnectArgs']] aws_connect: Aws Connect integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsDirectConnectArgs']] aws_direct_connect: Aws Direct Connect integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsFsxArgs']] aws_fsx: Aws Fsx integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsGlueArgs']] aws_glue: Aws Glue integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsKinesisAnalyticsArgs']] aws_kinesis_analytics: Aws Kinesis Analytics integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMediaConvertArgs']] aws_media_convert: Aws Media Convert integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMediaPackageVodArgs']] aws_media_package_vod: Aws Media PackageVod integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMqArgs']] aws_mq: Aws Mq integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMskArgs']] aws_msk: Aws Msk integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsNeptuneArgs']] aws_neptune: Aws Neptune integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsQldbArgs']] aws_qldb: Aws Qldb integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsRoute53resolverArgs']] aws_route53resolver: Aws Route53resolver integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsStatesArgs']] aws_states: Aws states integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsTransitGatewayArgs']] aws_transit_gateway: Aws Transit Gateway integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsWafArgs']] aws_waf: Aws Waf integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsWafv2Args']] aws_wafv2: Aws Wafv2 integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsBillingArgs']] billing: Billing integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsCloudfrontArgs']] cloudfront: Cloudfront integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsCloudtrailArgs']] cloudtrail: CloudTrail integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsDocDbArgs']] doc_db: Doc DB integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsDynamodbArgs']] dynamodb: Dynamo DB integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsEbsArgs']] ebs: EBS integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsEc2Args']] ec2: Ec2 integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsEcsArgs']] ecs: Ecs integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsEfsArgs']] efs: Efs integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsElasticacheArgs']] elasticache: Elasticache integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsElasticbeanstalkArgs']] elasticbeanstalk: Elastic Bean Stalk integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsElasticsearchArgs']] elasticsearch: Elastic Search integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsElbArgs']] elb: Elb integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsEmrArgs']] emr: Emr integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsHealthArgs']] health: Health integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsIamArgs']] iam: Iam integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsIotArgs']] iot: Iot integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsKinesisArgs']] kinesis: Kinesis integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsKinesisFirehoseArgs']] kinesis_firehose: Kinesis Firehose integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsLambdaArgs']] lambda_: Lambda integration
-        :param pulumi.Input[int] linked_account_id: The ID of the linked AWS account in New Relic.
-               All other arguments are dependent on the services to be integrated, which have been listed in the collapsible section below. All of these are **optional** blocks that can be added in any required combination. **For details on arguments that can be used with each service, check out the `Integration` blocks section below.**
-               <details>
-               <summary>Expand this section to view all supported AWS services supported, that may be integrated via this resource.</summary>
-               | Block                   | Description                   |
-               |-------------------------|-------------------------------|
-               | `alb`                   | ALB Integration               |
-               | `api_gateway`           | API Gateway Integration       |
-               | `auto_scaling`          | Auto Scaling Integration      |
-               | `aws_app_sync`          | AppSync Integration           |
-               | `aws_athena`            | Athena Integration            |
-               | `aws_cognito`           | Cognito Integration           |
-               | `aws_connect`           | Connect Integration           |
-               | `aws_direct_connect`    | Direct Connect Integration    |
-               | `aws_fsx`               | FSx Integration               |
-               | `aws_glue`              | Glue Integration              |
-               | `aws_kinesis_analytics` | Kinesis Analytics Integration |
-               | `aws_media_convert`     | MediaConvert Integration      |
-               | `aws_media_package_vod` | Media Package VOD Integration |
-               | `aws_mq`                | MQ Integration                |
-               | `aws_msk`               | MSK Integration               |
-               | `aws_neptune`           | Neptune Integration           |
-               | `aws_qldb`              | QLDB Integration              |
-               | `aws_route53resolver`   | Route53 Resolver Integration  |
-               | `aws_states`            | States Integration            |
-               | `aws_transit_gateway`   | Transit Gateway Integration   |
-               | `aws_waf`               | WAF Integration               |
-               | `aws_wafv2`             | WAFv2 Integration             |
-               | `billing`               | Billing Integration           |
-               | `cloudfront`            | CloudFront Integration        |
-               | `cloudtrail`            | CloudTrail Integration        |
-               | `doc_db`                | DocumentDB Integration        |
-               | `dynamodb`              | DynamoDB Integration          |
-               | `ebs`                   | EBS Integration               |
-               | `ec2`                   | EC2 Integration               |
-               | `ecs`                   | ECS Integration               |
-               | `efs`                   | EFS Integration               |
-               | `elasticache`           | ElastiCache Integration       |
-               | `elasticbeanstalk`      | Elastic Beanstalk Integration |
-               | `elasticsearch`         | Elasticsearch Integration     |
-               | `elb`                   | ELB Integration               |
-               | `emr`                   | EMR Integration               |
-               | `health`                | Health Integration            |
-               | `iam`                   | IAM Integration               |
-               | `iot`                   | IoT Integration               |
-               | `kinesis`               | Kinesis Integration           |
-               | `kinesis_firehose`      | Kinesis Firehose Integration  |
-               | `lambda`                | Lambda Integration            |
-               | `rds`                   | RDS Integration               |
-               | `redshift`              | Redshift Integration          |
-               | `route53`               | Route53 Integration           |
-               | `s3`                    | S3 Integration                |
-               | `ses`                   | SES Integration               |
-               | `sns`                   | SNS Integration               |
-               | `sqs`                   | SQS Integration               |
-               | `trusted_advisor`       | Trusted Advisor Integration   |
-               | `vpc`                   | VPC Integration               |
-               | `x_ray`                 | X-Ray Integration             |
-               </details>
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsRdsArgs']] rds: Rds integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsRedshiftArgs']] redshift: Redshift integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsRoute53Args']] route53: Route53 integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsS3Args']] s3: S3 integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsSesArgs']] ses: Ses integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsSnsArgs']] sns: Sns integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsSqsArgs']] sqs: SQS integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsTrustedAdvisorArgs']] trusted_advisor: Trusted Advisor integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsVpcArgs']] vpc: VPC integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsXRayArgs']] x_ray: X-Ray integration
+        :param pulumi.Input[_builtins.str] account_id: The New Relic account ID to operate on.  This allows the user to override the `account_id` attribute set on the provider. Defaults to the environment variable `NEW_RELIC_ACCOUNT_ID`.
+        :param pulumi.Input[Union['AwsIntegrationsAlbArgs', 'AwsIntegrationsAlbArgsDict']] alb: ALB integration
+        :param pulumi.Input[Union['AwsIntegrationsApiGatewayArgs', 'AwsIntegrationsApiGatewayArgsDict']] api_gateway: API Gateway integration
+        :param pulumi.Input[Union['AwsIntegrationsAutoScalingArgs', 'AwsIntegrationsAutoScalingArgsDict']] auto_scaling: AutoScaling integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsAppSyncArgs', 'AwsIntegrationsAwsAppSyncArgsDict']] aws_app_sync: Aws Appsync integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsAthenaArgs', 'AwsIntegrationsAwsAthenaArgsDict']] aws_athena: Aws Athena integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsAutoDiscoveryArgs', 'AwsIntegrationsAwsAutoDiscoveryArgsDict']] aws_auto_discovery: Aws Auto Discovery Integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsCognitoArgs', 'AwsIntegrationsAwsCognitoArgsDict']] aws_cognito: Aws Cognito integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsConnectArgs', 'AwsIntegrationsAwsConnectArgsDict']] aws_connect: Aws Connect integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsDirectConnectArgs', 'AwsIntegrationsAwsDirectConnectArgsDict']] aws_direct_connect: Aws Direct Connect integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsFsxArgs', 'AwsIntegrationsAwsFsxArgsDict']] aws_fsx: Aws Fsx integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsGlueArgs', 'AwsIntegrationsAwsGlueArgsDict']] aws_glue: Aws Glue integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsKinesisAnalyticsArgs', 'AwsIntegrationsAwsKinesisAnalyticsArgsDict']] aws_kinesis_analytics: Aws Kinesis Analytics integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsMediaConvertArgs', 'AwsIntegrationsAwsMediaConvertArgsDict']] aws_media_convert: Aws Media Convert integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsMediaPackageVodArgs', 'AwsIntegrationsAwsMediaPackageVodArgsDict']] aws_media_package_vod: Aws Media PackageVod integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsMqArgs', 'AwsIntegrationsAwsMqArgsDict']] aws_mq: Aws Mq integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsMskArgs', 'AwsIntegrationsAwsMskArgsDict']] aws_msk: Aws Msk integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsNeptuneArgs', 'AwsIntegrationsAwsNeptuneArgsDict']] aws_neptune: Aws Neptune integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsQldbArgs', 'AwsIntegrationsAwsQldbArgsDict']] aws_qldb: Aws Qldb integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsRoute53resolverArgs', 'AwsIntegrationsAwsRoute53resolverArgsDict']] aws_route53resolver: Aws Route53resolver integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsStatesArgs', 'AwsIntegrationsAwsStatesArgsDict']] aws_states: Aws states integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsTransitGatewayArgs', 'AwsIntegrationsAwsTransitGatewayArgsDict']] aws_transit_gateway: Aws Transit Gateway integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsWafArgs', 'AwsIntegrationsAwsWafArgsDict']] aws_waf: Aws Waf integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsWafv2Args', 'AwsIntegrationsAwsWafv2ArgsDict']] aws_wafv2: Aws Wafv2 integration
+        :param pulumi.Input[Union['AwsIntegrationsBillingArgs', 'AwsIntegrationsBillingArgsDict']] billing: Billing integration
+        :param pulumi.Input[Union['AwsIntegrationsCloudfrontArgs', 'AwsIntegrationsCloudfrontArgsDict']] cloudfront: Cloudfront integration
+        :param pulumi.Input[Union['AwsIntegrationsCloudtrailArgs', 'AwsIntegrationsCloudtrailArgsDict']] cloudtrail: CloudTrail integration
+        :param pulumi.Input[Union['AwsIntegrationsDocDbArgs', 'AwsIntegrationsDocDbArgsDict']] doc_db: Doc DB integration
+        :param pulumi.Input[Union['AwsIntegrationsDynamodbArgs', 'AwsIntegrationsDynamodbArgsDict']] dynamodb: Dynamo DB integration
+        :param pulumi.Input[Union['AwsIntegrationsEbsArgs', 'AwsIntegrationsEbsArgsDict']] ebs: EBS integration
+        :param pulumi.Input[Union['AwsIntegrationsEc2Args', 'AwsIntegrationsEc2ArgsDict']] ec2: Ec2 integration
+        :param pulumi.Input[Union['AwsIntegrationsEcsArgs', 'AwsIntegrationsEcsArgsDict']] ecs: Ecs integration
+        :param pulumi.Input[Union['AwsIntegrationsEfsArgs', 'AwsIntegrationsEfsArgsDict']] efs: Efs integration
+        :param pulumi.Input[Union['AwsIntegrationsElasticacheArgs', 'AwsIntegrationsElasticacheArgsDict']] elasticache: Elasticache integration
+        :param pulumi.Input[Union['AwsIntegrationsElasticbeanstalkArgs', 'AwsIntegrationsElasticbeanstalkArgsDict']] elasticbeanstalk: Elastic Bean Stalk integration
+        :param pulumi.Input[Union['AwsIntegrationsElasticsearchArgs', 'AwsIntegrationsElasticsearchArgsDict']] elasticsearch: Elastic Search integration
+        :param pulumi.Input[Union['AwsIntegrationsElbArgs', 'AwsIntegrationsElbArgsDict']] elb: Elb integration
+        :param pulumi.Input[Union['AwsIntegrationsEmrArgs', 'AwsIntegrationsEmrArgsDict']] emr: Emr integration
+        :param pulumi.Input[Union['AwsIntegrationsHealthArgs', 'AwsIntegrationsHealthArgsDict']] health: Health integration
+        :param pulumi.Input[Union['AwsIntegrationsIamArgs', 'AwsIntegrationsIamArgsDict']] iam: Iam integration
+        :param pulumi.Input[Union['AwsIntegrationsIotArgs', 'AwsIntegrationsIotArgsDict']] iot: Iot integration
+        :param pulumi.Input[Union['AwsIntegrationsKinesisArgs', 'AwsIntegrationsKinesisArgsDict']] kinesis: Kinesis integration
+        :param pulumi.Input[Union['AwsIntegrationsKinesisFirehoseArgs', 'AwsIntegrationsKinesisFirehoseArgsDict']] kinesis_firehose: Kinesis Firehose integration
+        :param pulumi.Input[Union['AwsIntegrationsLambdaArgs', 'AwsIntegrationsLambdaArgsDict']] lambda_: Lambda integration
+        :param pulumi.Input[_builtins.str] linked_account_id: The ID of the linked AWS account in New Relic.
+        :param pulumi.Input[Union['AwsIntegrationsRdsArgs', 'AwsIntegrationsRdsArgsDict']] rds: Rds integration
+        :param pulumi.Input[Union['AwsIntegrationsRedshiftArgs', 'AwsIntegrationsRedshiftArgsDict']] redshift: Redshift integration
+        :param pulumi.Input[Union['AwsIntegrationsRoute53Args', 'AwsIntegrationsRoute53ArgsDict']] route53: Route53 integration
+        :param pulumi.Input[Union['AwsIntegrationsS3Args', 'AwsIntegrationsS3ArgsDict']] s3: S3 integration
+        :param pulumi.Input[Union['AwsIntegrationsSesArgs', 'AwsIntegrationsSesArgsDict']] ses: Ses integration
+        :param pulumi.Input[Union['AwsIntegrationsSnsArgs', 'AwsIntegrationsSnsArgsDict']] sns: Sns integration
+        :param pulumi.Input[Union['AwsIntegrationsSqsArgs', 'AwsIntegrationsSqsArgsDict']] sqs: SQS integration
+        :param pulumi.Input[Union['AwsIntegrationsTrustedAdvisorArgs', 'AwsIntegrationsTrustedAdvisorArgsDict']] trusted_advisor: Trusted Advisor integration
+        :param pulumi.Input[Union['AwsIntegrationsVpcArgs', 'AwsIntegrationsVpcArgsDict']] vpc: VPC integration
+        :param pulumi.Input[Union['AwsIntegrationsXRayArgs', 'AwsIntegrationsXRayArgsDict']] x_ray: X-Ray integration
         """
         ...
     @overload
@@ -2499,309 +1931,6 @@ class AwsIntegrations(pulumi.CustomResource):
                  args: AwsIntegrationsArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
-        Use this resource to integrate AWS services with New Relic.
-        ## Prerequisite
-        Setup is required for this resource to work properly. This resource assumes you have linked an AWS account to New Relic and configured it to push metrics using CloudWatch Metric Streams.
-        New Relic doesn't automatically receive metrics from AWS for some services so this resource can be used to configure integrations to those services.
-        Using a metric stream to New Relic is the preferred way to integrate with AWS. Follow the [steps outlined here](https://docs.newrelic.com/docs/infrastructure/amazon-integrations/aws-integrations-list/aws-metric-stream/#set-up-metric-stream) to set up a metric stream. This resource supports any integration that's not available through AWS metric stream.
-        ## Example Usage
-        Leave an integration block empty to use its default configuration. You can also use the full example, including the AWS set up, found in our guides.
-        <!--Start PulumiCodeChooser -->
-        ```python
-        import pulumi
-        import pulumi_newrelic as newrelic
-        foo = newrelic.cloud.AwsLinkAccount("foo",
-            arn=aws_iam_role["newrelic_aws_role"]["arn"],
-            metric_collection_mode="PULL")
-        bar = newrelic.cloud.AwsIntegrations("bar",
-            linked_account_id=foo.id,
-            billing=newrelic.cloud.AwsIntegrationsBillingArgs(),
-            cloudtrail=newrelic.cloud.AwsIntegrationsCloudtrailArgs(
-                metrics_polling_interval=6000,
-                aws_regions=[
-                    "us-east-1",
-                    "us-east-2",
-                ],
-            ),
-            health=newrelic.cloud.AwsIntegrationsHealthArgs(
-                metrics_polling_interval=6000,
-            ),
-            trusted_advisor=newrelic.cloud.AwsIntegrationsTrustedAdvisorArgs(
-                metrics_polling_interval=6000,
-            ),
-            vpc=newrelic.cloud.AwsIntegrationsVpcArgs(
-                metrics_polling_interval=6000,
-                aws_regions=[
-                    "us-east-1",
-                    "us-east-2",
-                ],
-                fetch_nat_gateway=True,
-                fetch_vpn=False,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            x_ray=newrelic.cloud.AwsIntegrationsXRayArgs(
-                metrics_polling_interval=6000,
-                aws_regions=[
-                    "us-east-1",
-                    "us-east-2",
-                ],
-            ),
-            s3=newrelic.cloud.AwsIntegrationsS3Args(
-                metrics_polling_interval=6000,
-            ),
-            doc_db=newrelic.cloud.AwsIntegrationsDocDbArgs(
-                metrics_polling_interval=6000,
-            ),
-            sqs=newrelic.cloud.AwsIntegrationsSqsArgs(
-                fetch_extended_inventory=True,
-                fetch_tags=True,
-                queue_prefixes=["queue prefix"],
-                metrics_polling_interval=6000,
-                aws_regions=["us-east-1"],
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            ebs=newrelic.cloud.AwsIntegrationsEbsArgs(
-                metrics_polling_interval=6000,
-                fetch_extended_inventory=True,
-                aws_regions=["us-east-1"],
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            alb=newrelic.cloud.AwsIntegrationsAlbArgs(
-                fetch_extended_inventory=True,
-                fetch_tags=True,
-                load_balancer_prefixes=["load balancer prefix"],
-                metrics_polling_interval=6000,
-                aws_regions=["us-east-1"],
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            elasticache=newrelic.cloud.AwsIntegrationsElasticacheArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            api_gateway=newrelic.cloud.AwsIntegrationsApiGatewayArgs(
-                metrics_polling_interval=6000,
-                aws_regions=["us-east-1"],
-                stage_prefixes=["stage prefix"],
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            auto_scaling=newrelic.cloud.AwsIntegrationsAutoScalingArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_app_sync=newrelic.cloud.AwsIntegrationsAwsAppSyncArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_athena=newrelic.cloud.AwsIntegrationsAwsAthenaArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_cognito=newrelic.cloud.AwsIntegrationsAwsCognitoArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_connect=newrelic.cloud.AwsIntegrationsAwsConnectArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_direct_connect=newrelic.cloud.AwsIntegrationsAwsDirectConnectArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_fsx=newrelic.cloud.AwsIntegrationsAwsFsxArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_glue=newrelic.cloud.AwsIntegrationsAwsGlueArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_kinesis_analytics=newrelic.cloud.AwsIntegrationsAwsKinesisAnalyticsArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_media_convert=newrelic.cloud.AwsIntegrationsAwsMediaConvertArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_media_package_vod=newrelic.cloud.AwsIntegrationsAwsMediaPackageVodArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_mq=newrelic.cloud.AwsIntegrationsAwsMqArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_msk=newrelic.cloud.AwsIntegrationsAwsMskArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_neptune=newrelic.cloud.AwsIntegrationsAwsNeptuneArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_qldb=newrelic.cloud.AwsIntegrationsAwsQldbArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_route53resolver=newrelic.cloud.AwsIntegrationsAwsRoute53resolverArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_states=newrelic.cloud.AwsIntegrationsAwsStatesArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_transit_gateway=newrelic.cloud.AwsIntegrationsAwsTransitGatewayArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_waf=newrelic.cloud.AwsIntegrationsAwsWafArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            aws_wafv2=newrelic.cloud.AwsIntegrationsAwsWafv2Args(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            cloudfront=newrelic.cloud.AwsIntegrationsCloudfrontArgs(
-                fetch_lambdas_at_edge=True,
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            dynamodb=newrelic.cloud.AwsIntegrationsDynamodbArgs(
-                aws_regions=["us-east-1"],
-                fetch_extended_inventory=True,
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            ec2=newrelic.cloud.AwsIntegrationsEc2Args(
-                aws_regions=["us-east-1"],
-                duplicate_ec2_tags=True,
-                fetch_ip_addresses=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            ecs=newrelic.cloud.AwsIntegrationsEcsArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            efs=newrelic.cloud.AwsIntegrationsEfsArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            elasticbeanstalk=newrelic.cloud.AwsIntegrationsElasticbeanstalkArgs(
-                aws_regions=["us-east-1"],
-                fetch_extended_inventory=True,
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            elasticsearch=newrelic.cloud.AwsIntegrationsElasticsearchArgs(
-                aws_regions=["us-east-1"],
-                fetch_nodes=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            elb=newrelic.cloud.AwsIntegrationsElbArgs(
-                aws_regions=["us-east-1"],
-                fetch_extended_inventory=True,
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-            ),
-            emr=newrelic.cloud.AwsIntegrationsEmrArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            iam=newrelic.cloud.AwsIntegrationsIamArgs(
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            iot=newrelic.cloud.AwsIntegrationsIotArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            kinesis=newrelic.cloud.AwsIntegrationsKinesisArgs(
-                aws_regions=["us-east-1"],
-                fetch_shards=True,
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            kinesis_firehose=newrelic.cloud.AwsIntegrationsKinesisFirehoseArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            lambda_=newrelic.cloud.AwsIntegrationsLambdaArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            rds=newrelic.cloud.AwsIntegrationsRdsArgs(
-                aws_regions=["us-east-1"],
-                fetch_tags=True,
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            redshift=newrelic.cloud.AwsIntegrationsRedshiftArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-                tag_key="tag key",
-                tag_value="tag value",
-            ),
-            route53=newrelic.cloud.AwsIntegrationsRoute53Args(
-                fetch_extended_inventory=True,
-                metrics_polling_interval=6000,
-            ),
-            ses=newrelic.cloud.AwsIntegrationsSesArgs(
-                aws_regions=["us-east-1"],
-                metrics_polling_interval=6000,
-            ),
-            sns=newrelic.cloud.AwsIntegrationsSnsArgs(
-                aws_regions=["us-east-1"],
-                fetch_extended_inventory=True,
-                metrics_polling_interval=6000,
-            ))
-        ```
-        <!--End PulumiCodeChooser -->
         ## Import
         Linked AWS account integrations can be imported using the `id`, e.g.
@@ -2827,60 +1956,61 @@ class AwsIntegrations(pulumi.CustomResource):
     def _internal_init(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
-                 account_id: Optional[pulumi.Input[int]] = None,
-                 alb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAlbArgs']]] = None,
-                 api_gateway: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsApiGatewayArgs']]] = None,
-                 auto_scaling: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAutoScalingArgs']]] = None,
-                 aws_app_sync: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsAppSyncArgs']]] = None,
-                 aws_athena: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsAthenaArgs']]] = None,
-                 aws_cognito: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsCognitoArgs']]] = None,
-                 aws_connect: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsConnectArgs']]] = None,
-                 aws_direct_connect: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsDirectConnectArgs']]] = None,
-                 aws_fsx: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsFsxArgs']]] = None,
-                 aws_glue: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsGlueArgs']]] = None,
-                 aws_kinesis_analytics: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsKinesisAnalyticsArgs']]] = None,
-                 aws_media_convert: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMediaConvertArgs']]] = None,
-                 aws_media_package_vod: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMediaPackageVodArgs']]] = None,
-                 aws_mq: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMqArgs']]] = None,
-                 aws_msk: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMskArgs']]] = None,
-                 aws_neptune: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsNeptuneArgs']]] = None,
-                 aws_qldb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsQldbArgs']]] = None,
-                 aws_route53resolver: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsRoute53resolverArgs']]] = None,
-                 aws_states: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsStatesArgs']]] = None,
-                 aws_transit_gateway: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsTransitGatewayArgs']]] = None,
-                 aws_waf: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsWafArgs']]] = None,
-                 aws_wafv2: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsWafv2Args']]] = None,
-                 billing: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsBillingArgs']]] = None,
-                 cloudfront: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsCloudfrontArgs']]] = None,
-                 cloudtrail: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsCloudtrailArgs']]] = None,
-                 doc_db: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsDocDbArgs']]] = None,
-                 dynamodb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsDynamodbArgs']]] = None,
-                 ebs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEbsArgs']]] = None,
-                 ec2: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEc2Args']]] = None,
-                 ecs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEcsArgs']]] = None,
-                 efs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEfsArgs']]] = None,
-                 elasticache: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElasticacheArgs']]] = None,
-                 elasticbeanstalk: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElasticbeanstalkArgs']]] = None,
-                 elasticsearch: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElasticsearchArgs']]] = None,
-                 elb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElbArgs']]] = None,
-                 emr: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEmrArgs']]] = None,
-                 health: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsHealthArgs']]] = None,
-                 iam: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsIamArgs']]] = None,
-                 iot: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsIotArgs']]] = None,
-                 kinesis: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsKinesisArgs']]] = None,
-                 kinesis_firehose: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsKinesisFirehoseArgs']]] = None,
-                 lambda_: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsLambdaArgs']]] = None,
-                 linked_account_id: Optional[pulumi.Input[int]] = None,
-                 rds: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsRdsArgs']]] = None,
-                 redshift: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsRedshiftArgs']]] = None,
-                 route53: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsRoute53Args']]] = None,
-                 s3: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsS3Args']]] = None,
-                 ses: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsSesArgs']]] = None,
-                 sns: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsSnsArgs']]] = None,
-                 sqs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsSqsArgs']]] = None,
-                 trusted_advisor: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsTrustedAdvisorArgs']]] = None,
-                 vpc: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsVpcArgs']]] = None,
-                 x_ray: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsXRayArgs']]] = None,
+                 account_id: Optional[pulumi.Input[_builtins.str]] = None,
+                 alb: Optional[pulumi.Input[Union['AwsIntegrationsAlbArgs', 'AwsIntegrationsAlbArgsDict']]] = None,
+                 api_gateway: Optional[pulumi.Input[Union['AwsIntegrationsApiGatewayArgs', 'AwsIntegrationsApiGatewayArgsDict']]] = None,
+                 auto_scaling: Optional[pulumi.Input[Union['AwsIntegrationsAutoScalingArgs', 'AwsIntegrationsAutoScalingArgsDict']]] = None,
+                 aws_app_sync: Optional[pulumi.Input[Union['AwsIntegrationsAwsAppSyncArgs', 'AwsIntegrationsAwsAppSyncArgsDict']]] = None,
+                 aws_athena: Optional[pulumi.Input[Union['AwsIntegrationsAwsAthenaArgs', 'AwsIntegrationsAwsAthenaArgsDict']]] = None,
+                 aws_auto_discovery: Optional[pulumi.Input[Union['AwsIntegrationsAwsAutoDiscoveryArgs', 'AwsIntegrationsAwsAutoDiscoveryArgsDict']]] = None,
+                 aws_cognito: Optional[pulumi.Input[Union['AwsIntegrationsAwsCognitoArgs', 'AwsIntegrationsAwsCognitoArgsDict']]] = None,
+                 aws_connect: Optional[pulumi.Input[Union['AwsIntegrationsAwsConnectArgs', 'AwsIntegrationsAwsConnectArgsDict']]] = None,
+                 aws_direct_connect: Optional[pulumi.Input[Union['AwsIntegrationsAwsDirectConnectArgs', 'AwsIntegrationsAwsDirectConnectArgsDict']]] = None,
+                 aws_fsx: Optional[pulumi.Input[Union['AwsIntegrationsAwsFsxArgs', 'AwsIntegrationsAwsFsxArgsDict']]] = None,
+                 aws_glue: Optional[pulumi.Input[Union['AwsIntegrationsAwsGlueArgs', 'AwsIntegrationsAwsGlueArgsDict']]] = None,
+                 aws_kinesis_analytics: Optional[pulumi.Input[Union['AwsIntegrationsAwsKinesisAnalyticsArgs', 'AwsIntegrationsAwsKinesisAnalyticsArgsDict']]] = None,
+                 aws_media_convert: Optional[pulumi.Input[Union['AwsIntegrationsAwsMediaConvertArgs', 'AwsIntegrationsAwsMediaConvertArgsDict']]] = None,
+                 aws_media_package_vod: Optional[pulumi.Input[Union['AwsIntegrationsAwsMediaPackageVodArgs', 'AwsIntegrationsAwsMediaPackageVodArgsDict']]] = None,
+                 aws_mq: Optional[pulumi.Input[Union['AwsIntegrationsAwsMqArgs', 'AwsIntegrationsAwsMqArgsDict']]] = None,
+                 aws_msk: Optional[pulumi.Input[Union['AwsIntegrationsAwsMskArgs', 'AwsIntegrationsAwsMskArgsDict']]] = None,
+                 aws_neptune: Optional[pulumi.Input[Union['AwsIntegrationsAwsNeptuneArgs', 'AwsIntegrationsAwsNeptuneArgsDict']]] = None,
+                 aws_qldb: Optional[pulumi.Input[Union['AwsIntegrationsAwsQldbArgs', 'AwsIntegrationsAwsQldbArgsDict']]] = None,
+                 aws_route53resolver: Optional[pulumi.Input[Union['AwsIntegrationsAwsRoute53resolverArgs', 'AwsIntegrationsAwsRoute53resolverArgsDict']]] = None,
+                 aws_states: Optional[pulumi.Input[Union['AwsIntegrationsAwsStatesArgs', 'AwsIntegrationsAwsStatesArgsDict']]] = None,
+                 aws_transit_gateway: Optional[pulumi.Input[Union['AwsIntegrationsAwsTransitGatewayArgs', 'AwsIntegrationsAwsTransitGatewayArgsDict']]] = None,
+                 aws_waf: Optional[pulumi.Input[Union['AwsIntegrationsAwsWafArgs', 'AwsIntegrationsAwsWafArgsDict']]] = None,
+                 aws_wafv2: Optional[pulumi.Input[Union['AwsIntegrationsAwsWafv2Args', 'AwsIntegrationsAwsWafv2ArgsDict']]] = None,
+                 billing: Optional[pulumi.Input[Union['AwsIntegrationsBillingArgs', 'AwsIntegrationsBillingArgsDict']]] = None,
+                 cloudfront: Optional[pulumi.Input[Union['AwsIntegrationsCloudfrontArgs', 'AwsIntegrationsCloudfrontArgsDict']]] = None,
+                 cloudtrail: Optional[pulumi.Input[Union['AwsIntegrationsCloudtrailArgs', 'AwsIntegrationsCloudtrailArgsDict']]] = None,
+                 doc_db: Optional[pulumi.Input[Union['AwsIntegrationsDocDbArgs', 'AwsIntegrationsDocDbArgsDict']]] = None,
+                 dynamodb: Optional[pulumi.Input[Union['AwsIntegrationsDynamodbArgs', 'AwsIntegrationsDynamodbArgsDict']]] = None,
+                 ebs: Optional[pulumi.Input[Union['AwsIntegrationsEbsArgs', 'AwsIntegrationsEbsArgsDict']]] = None,
+                 ec2: Optional[pulumi.Input[Union['AwsIntegrationsEc2Args', 'AwsIntegrationsEc2ArgsDict']]] = None,
+                 ecs: Optional[pulumi.Input[Union['AwsIntegrationsEcsArgs', 'AwsIntegrationsEcsArgsDict']]] = None,
+                 efs: Optional[pulumi.Input[Union['AwsIntegrationsEfsArgs', 'AwsIntegrationsEfsArgsDict']]] = None,
+                 elasticache: Optional[pulumi.Input[Union['AwsIntegrationsElasticacheArgs', 'AwsIntegrationsElasticacheArgsDict']]] = None,
+                 elasticbeanstalk: Optional[pulumi.Input[Union['AwsIntegrationsElasticbeanstalkArgs', 'AwsIntegrationsElasticbeanstalkArgsDict']]] = None,
+                 elasticsearch: Optional[pulumi.Input[Union['AwsIntegrationsElasticsearchArgs', 'AwsIntegrationsElasticsearchArgsDict']]] = None,
+                 elb: Optional[pulumi.Input[Union['AwsIntegrationsElbArgs', 'AwsIntegrationsElbArgsDict']]] = None,
+                 emr: Optional[pulumi.Input[Union['AwsIntegrationsEmrArgs', 'AwsIntegrationsEmrArgsDict']]] = None,
+                 health: Optional[pulumi.Input[Union['AwsIntegrationsHealthArgs', 'AwsIntegrationsHealthArgsDict']]] = None,
+                 iam: Optional[pulumi.Input[Union['AwsIntegrationsIamArgs', 'AwsIntegrationsIamArgsDict']]] = None,
+                 iot: Optional[pulumi.Input[Union['AwsIntegrationsIotArgs', 'AwsIntegrationsIotArgsDict']]] = None,
+                 kinesis: Optional[pulumi.Input[Union['AwsIntegrationsKinesisArgs', 'AwsIntegrationsKinesisArgsDict']]] = None,
+                 kinesis_firehose: Optional[pulumi.Input[Union['AwsIntegrationsKinesisFirehoseArgs', 'AwsIntegrationsKinesisFirehoseArgsDict']]] = None,
+                 lambda_: Optional[pulumi.Input[Union['AwsIntegrationsLambdaArgs', 'AwsIntegrationsLambdaArgsDict']]] = None,
+                 linked_account_id: Optional[pulumi.Input[_builtins.str]] = None,
+                 rds: Optional[pulumi.Input[Union['AwsIntegrationsRdsArgs', 'AwsIntegrationsRdsArgsDict']]] = None,
+                 redshift: Optional[pulumi.Input[Union['AwsIntegrationsRedshiftArgs', 'AwsIntegrationsRedshiftArgsDict']]] = None,
+                 route53: Optional[pulumi.Input[Union['AwsIntegrationsRoute53Args', 'AwsIntegrationsRoute53ArgsDict']]] = None,
+                 s3: Optional[pulumi.Input[Union['AwsIntegrationsS3Args', 'AwsIntegrationsS3ArgsDict']]] = None,
+                 ses: Optional[pulumi.Input[Union['AwsIntegrationsSesArgs', 'AwsIntegrationsSesArgsDict']]] = None,
+                 sns: Optional[pulumi.Input[Union['AwsIntegrationsSnsArgs', 'AwsIntegrationsSnsArgsDict']]] = None,
+                 sqs: Optional[pulumi.Input[Union['AwsIntegrationsSqsArgs', 'AwsIntegrationsSqsArgsDict']]] = None,
+                 trusted_advisor: Optional[pulumi.Input[Union['AwsIntegrationsTrustedAdvisorArgs', 'AwsIntegrationsTrustedAdvisorArgsDict']]] = None,
+                 vpc: Optional[pulumi.Input[Union['AwsIntegrationsVpcArgs', 'AwsIntegrationsVpcArgsDict']]] = None,
+                 x_ray: Optional[pulumi.Input[Union['AwsIntegrationsXRayArgs', 'AwsIntegrationsXRayArgsDict']]] = None,
                  __props__=None):
         opts = pulumi.ResourceOptions.merge(_utilities.get_resource_opts_defaults(), opts)
         if not isinstance(opts, pulumi.ResourceOptions):
@@ -2896,6 +2026,7 @@ class AwsIntegrations(pulumi.CustomResource):
             __props__.__dict__["auto_scaling"] = auto_scaling
             __props__.__dict__["aws_app_sync"] = aws_app_sync
             __props__.__dict__["aws_athena"] = aws_athena
+            __props__.__dict__["aws_auto_discovery"] = aws_auto_discovery
             __props__.__dict__["aws_cognito"] = aws_cognito
             __props__.__dict__["aws_connect"] = aws_connect
             __props__.__dict__["aws_direct_connect"] = aws_direct_connect
@@ -2956,60 +2087,61 @@ class AwsIntegrations(pulumi.CustomResource):
     def get(resource_name: str,
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
-            account_id: Optional[pulumi.Input[int]] = None,
-            alb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAlbArgs']]] = None,
-            api_gateway: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsApiGatewayArgs']]] = None,
-            auto_scaling: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAutoScalingArgs']]] = None,
-            aws_app_sync: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsAppSyncArgs']]] = None,
-            aws_athena: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsAthenaArgs']]] = None,
-            aws_cognito: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsCognitoArgs']]] = None,
-            aws_connect: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsConnectArgs']]] = None,
-            aws_direct_connect: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsDirectConnectArgs']]] = None,
-            aws_fsx: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsFsxArgs']]] = None,
-            aws_glue: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsGlueArgs']]] = None,
-            aws_kinesis_analytics: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsKinesisAnalyticsArgs']]] = None,
-            aws_media_convert: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMediaConvertArgs']]] = None,
-            aws_media_package_vod: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMediaPackageVodArgs']]] = None,
-            aws_mq: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMqArgs']]] = None,
-            aws_msk: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMskArgs']]] = None,
-            aws_neptune: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsNeptuneArgs']]] = None,
-            aws_qldb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsQldbArgs']]] = None,
-            aws_route53resolver: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsRoute53resolverArgs']]] = None,
-            aws_states: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsStatesArgs']]] = None,
-            aws_transit_gateway: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsTransitGatewayArgs']]] = None,
-            aws_waf: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsWafArgs']]] = None,
-            aws_wafv2: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsAwsWafv2Args']]] = None,
-            billing: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsBillingArgs']]] = None,
-            cloudfront: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsCloudfrontArgs']]] = None,
-            cloudtrail: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsCloudtrailArgs']]] = None,
-            doc_db: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsDocDbArgs']]] = None,
-            dynamodb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsDynamodbArgs']]] = None,
-            ebs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEbsArgs']]] = None,
-            ec2: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEc2Args']]] = None,
-            ecs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEcsArgs']]] = None,
-            efs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEfsArgs']]] = None,
-            elasticache: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElasticacheArgs']]] = None,
-            elasticbeanstalk: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElasticbeanstalkArgs']]] = None,
-            elasticsearch: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElasticsearchArgs']]] = None,
-            elb: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsElbArgs']]] = None,
-            emr: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsEmrArgs']]] = None,
-            health: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsHealthArgs']]] = None,
-            iam: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsIamArgs']]] = None,
-            iot: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsIotArgs']]] = None,
-            kinesis: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsKinesisArgs']]] = None,
-            kinesis_firehose: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsKinesisFirehoseArgs']]] = None,
-            lambda_: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsLambdaArgs']]] = None,
-            linked_account_id: Optional[pulumi.Input[int]] = None,
-            rds: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsRdsArgs']]] = None,
-            redshift: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsRedshiftArgs']]] = None,
-            route53: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsRoute53Args']]] = None,
-            s3: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsS3Args']]] = None,
-            ses: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsSesArgs']]] = None,
-            sns: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsSnsArgs']]] = None,
-            sqs: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsSqsArgs']]] = None,
-            trusted_advisor: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsTrustedAdvisorArgs']]] = None,
-            vpc: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsVpcArgs']]] = None,
-            x_ray: Optional[pulumi.Input[pulumi.InputType['AwsIntegrationsXRayArgs']]] = None) -> 'AwsIntegrations':
+            account_id: Optional[pulumi.Input[_builtins.str]] = None,
+            alb: Optional[pulumi.Input[Union['AwsIntegrationsAlbArgs', 'AwsIntegrationsAlbArgsDict']]] = None,
+            api_gateway: Optional[pulumi.Input[Union['AwsIntegrationsApiGatewayArgs', 'AwsIntegrationsApiGatewayArgsDict']]] = None,
+            auto_scaling: Optional[pulumi.Input[Union['AwsIntegrationsAutoScalingArgs', 'AwsIntegrationsAutoScalingArgsDict']]] = None,
+            aws_app_sync: Optional[pulumi.Input[Union['AwsIntegrationsAwsAppSyncArgs', 'AwsIntegrationsAwsAppSyncArgsDict']]] = None,
+            aws_athena: Optional[pulumi.Input[Union['AwsIntegrationsAwsAthenaArgs', 'AwsIntegrationsAwsAthenaArgsDict']]] = None,
+            aws_auto_discovery: Optional[pulumi.Input[Union['AwsIntegrationsAwsAutoDiscoveryArgs', 'AwsIntegrationsAwsAutoDiscoveryArgsDict']]] = None,
+            aws_cognito: Optional[pulumi.Input[Union['AwsIntegrationsAwsCognitoArgs', 'AwsIntegrationsAwsCognitoArgsDict']]] = None,
+            aws_connect: Optional[pulumi.Input[Union['AwsIntegrationsAwsConnectArgs', 'AwsIntegrationsAwsConnectArgsDict']]] = None,
+            aws_direct_connect: Optional[pulumi.Input[Union['AwsIntegrationsAwsDirectConnectArgs', 'AwsIntegrationsAwsDirectConnectArgsDict']]] = None,
+            aws_fsx: Optional[pulumi.Input[Union['AwsIntegrationsAwsFsxArgs', 'AwsIntegrationsAwsFsxArgsDict']]] = None,
+            aws_glue: Optional[pulumi.Input[Union['AwsIntegrationsAwsGlueArgs', 'AwsIntegrationsAwsGlueArgsDict']]] = None,
+            aws_kinesis_analytics: Optional[pulumi.Input[Union['AwsIntegrationsAwsKinesisAnalyticsArgs', 'AwsIntegrationsAwsKinesisAnalyticsArgsDict']]] = None,
+            aws_media_convert: Optional[pulumi.Input[Union['AwsIntegrationsAwsMediaConvertArgs', 'AwsIntegrationsAwsMediaConvertArgsDict']]] = None,
+            aws_media_package_vod: Optional[pulumi.Input[Union['AwsIntegrationsAwsMediaPackageVodArgs', 'AwsIntegrationsAwsMediaPackageVodArgsDict']]] = None,
+            aws_mq: Optional[pulumi.Input[Union['AwsIntegrationsAwsMqArgs', 'AwsIntegrationsAwsMqArgsDict']]] = None,
+            aws_msk: Optional[pulumi.Input[Union['AwsIntegrationsAwsMskArgs', 'AwsIntegrationsAwsMskArgsDict']]] = None,
+            aws_neptune: Optional[pulumi.Input[Union['AwsIntegrationsAwsNeptuneArgs', 'AwsIntegrationsAwsNeptuneArgsDict']]] = None,
+            aws_qldb: Optional[pulumi.Input[Union['AwsIntegrationsAwsQldbArgs', 'AwsIntegrationsAwsQldbArgsDict']]] = None,
+            aws_route53resolver: Optional[pulumi.Input[Union['AwsIntegrationsAwsRoute53resolverArgs', 'AwsIntegrationsAwsRoute53resolverArgsDict']]] = None,
+            aws_states: Optional[pulumi.Input[Union['AwsIntegrationsAwsStatesArgs', 'AwsIntegrationsAwsStatesArgsDict']]] = None,
+            aws_transit_gateway: Optional[pulumi.Input[Union['AwsIntegrationsAwsTransitGatewayArgs', 'AwsIntegrationsAwsTransitGatewayArgsDict']]] = None,
+            aws_waf: Optional[pulumi.Input[Union['AwsIntegrationsAwsWafArgs', 'AwsIntegrationsAwsWafArgsDict']]] = None,
+            aws_wafv2: Optional[pulumi.Input[Union['AwsIntegrationsAwsWafv2Args', 'AwsIntegrationsAwsWafv2ArgsDict']]] = None,
+            billing: Optional[pulumi.Input[Union['AwsIntegrationsBillingArgs', 'AwsIntegrationsBillingArgsDict']]] = None,
+            cloudfront: Optional[pulumi.Input[Union['AwsIntegrationsCloudfrontArgs', 'AwsIntegrationsCloudfrontArgsDict']]] = None,
+            cloudtrail: Optional[pulumi.Input[Union['AwsIntegrationsCloudtrailArgs', 'AwsIntegrationsCloudtrailArgsDict']]] = None,
+            doc_db: Optional[pulumi.Input[Union['AwsIntegrationsDocDbArgs', 'AwsIntegrationsDocDbArgsDict']]] = None,
+            dynamodb: Optional[pulumi.Input[Union['AwsIntegrationsDynamodbArgs', 'AwsIntegrationsDynamodbArgsDict']]] = None,
+            ebs: Optional[pulumi.Input[Union['AwsIntegrationsEbsArgs', 'AwsIntegrationsEbsArgsDict']]] = None,
+            ec2: Optional[pulumi.Input[Union['AwsIntegrationsEc2Args', 'AwsIntegrationsEc2ArgsDict']]] = None,
+            ecs: Optional[pulumi.Input[Union['AwsIntegrationsEcsArgs', 'AwsIntegrationsEcsArgsDict']]] = None,
+            efs: Optional[pulumi.Input[Union['AwsIntegrationsEfsArgs', 'AwsIntegrationsEfsArgsDict']]] = None,
+            elasticache: Optional[pulumi.Input[Union['AwsIntegrationsElasticacheArgs', 'AwsIntegrationsElasticacheArgsDict']]] = None,
+            elasticbeanstalk: Optional[pulumi.Input[Union['AwsIntegrationsElasticbeanstalkArgs', 'AwsIntegrationsElasticbeanstalkArgsDict']]] = None,
+            elasticsearch: Optional[pulumi.Input[Union['AwsIntegrationsElasticsearchArgs', 'AwsIntegrationsElasticsearchArgsDict']]] = None,
+            elb: Optional[pulumi.Input[Union['AwsIntegrationsElbArgs', 'AwsIntegrationsElbArgsDict']]] = None,
+            emr: Optional[pulumi.Input[Union['AwsIntegrationsEmrArgs', 'AwsIntegrationsEmrArgsDict']]] = None,
+            health: Optional[pulumi.Input[Union['AwsIntegrationsHealthArgs', 'AwsIntegrationsHealthArgsDict']]] = None,
+            iam: Optional[pulumi.Input[Union['AwsIntegrationsIamArgs', 'AwsIntegrationsIamArgsDict']]] = None,
+            iot: Optional[pulumi.Input[Union['AwsIntegrationsIotArgs', 'AwsIntegrationsIotArgsDict']]] = None,
+            kinesis: Optional[pulumi.Input[Union['AwsIntegrationsKinesisArgs', 'AwsIntegrationsKinesisArgsDict']]] = None,
+            kinesis_firehose: Optional[pulumi.Input[Union['AwsIntegrationsKinesisFirehoseArgs', 'AwsIntegrationsKinesisFirehoseArgsDict']]] = None,
+            lambda_: Optional[pulumi.Input[Union['AwsIntegrationsLambdaArgs', 'AwsIntegrationsLambdaArgsDict']]] = None,
+            linked_account_id: Optional[pulumi.Input[_builtins.str]] = None,
+            rds: Optional[pulumi.Input[Union['AwsIntegrationsRdsArgs', 'AwsIntegrationsRdsArgsDict']]] = None,
+            redshift: Optional[pulumi.Input[Union['AwsIntegrationsRedshiftArgs', 'AwsIntegrationsRedshiftArgsDict']]] = None,
+            route53: Optional[pulumi.Input[Union['AwsIntegrationsRoute53Args', 'AwsIntegrationsRoute53ArgsDict']]] = None,
+            s3: Optional[pulumi.Input[Union['AwsIntegrationsS3Args', 'AwsIntegrationsS3ArgsDict']]] = None,
+            ses: Optional[pulumi.Input[Union['AwsIntegrationsSesArgs', 'AwsIntegrationsSesArgsDict']]] = None,
+            sns: Optional[pulumi.Input[Union['AwsIntegrationsSnsArgs', 'AwsIntegrationsSnsArgsDict']]] = None,
+            sqs: Optional[pulumi.Input[Union['AwsIntegrationsSqsArgs', 'AwsIntegrationsSqsArgsDict']]] = None,
+            trusted_advisor: Optional[pulumi.Input[Union['AwsIntegrationsTrustedAdvisorArgs', 'AwsIntegrationsTrustedAdvisorArgsDict']]] = None,
+            vpc: Optional[pulumi.Input[Union['AwsIntegrationsVpcArgs', 'AwsIntegrationsVpcArgsDict']]] = None,
+            x_ray: Optional[pulumi.Input[Union['AwsIntegrationsXRayArgs', 'AwsIntegrationsXRayArgsDict']]] = None) -> 'AwsIntegrations':
         """
         Get an existing AwsIntegrations resource's state with the given name, id, and optional extra
         properties used to qualify the lookup.
@@ -3017,121 +2149,61 @@ class AwsIntegrations(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[int] account_id: The New Relic account ID to operate on.  This allows the user to override the `account_id` attribute set on the provider. Defaults to the environment variable `NEW_RELIC_ACCOUNT_ID`.
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAlbArgs']] alb: ALB integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsApiGatewayArgs']] api_gateway: API Gateway integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAutoScalingArgs']] auto_scaling: ,`aws_app_sync`,`aws_athena`,`aws_cognito`,`aws_connect`,`aws_direct_connect`,`aws_fsx`,`aws_glue`,`aws_kinesis_analytics`,`aws_media_convert`,`aws_media_package_vod`,`aws_mq`,`aws_msk`,`aws_neptune`,`aws_qldb`,`aws_route53resolver`,`aws_states`,`aws_transit_gateway`,`aws_waf`,`aws_wafv2`,`iot`,`kinesis_firehose` and `ses`.
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsAppSyncArgs']] aws_app_sync: Aws Appsync integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsAthenaArgs']] aws_athena: Aws Athena integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsCognitoArgs']] aws_cognito: Aws Cognito integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsConnectArgs']] aws_connect: Aws Connect integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsDirectConnectArgs']] aws_direct_connect: Aws Direct Connect integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsFsxArgs']] aws_fsx: Aws Fsx integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsGlueArgs']] aws_glue: Aws Glue integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsKinesisAnalyticsArgs']] aws_kinesis_analytics: Aws Kinesis Analytics integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMediaConvertArgs']] aws_media_convert: Aws Media Convert integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMediaPackageVodArgs']] aws_media_package_vod: Aws Media PackageVod integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMqArgs']] aws_mq: Aws Mq integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsMskArgs']] aws_msk: Aws Msk integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsNeptuneArgs']] aws_neptune: Aws Neptune integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsQldbArgs']] aws_qldb: Aws Qldb integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsRoute53resolverArgs']] aws_route53resolver: Aws Route53resolver integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsStatesArgs']] aws_states: Aws states integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsTransitGatewayArgs']] aws_transit_gateway: Aws Transit Gateway integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsWafArgs']] aws_waf: Aws Waf integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsAwsWafv2Args']] aws_wafv2: Aws Wafv2 integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsBillingArgs']] billing: Billing integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsCloudfrontArgs']] cloudfront: Cloudfront integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsCloudtrailArgs']] cloudtrail: CloudTrail integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsDocDbArgs']] doc_db: Doc DB integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsDynamodbArgs']] dynamodb: Dynamo DB integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsEbsArgs']] ebs: EBS integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsEc2Args']] ec2: Ec2 integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsEcsArgs']] ecs: Ecs integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsEfsArgs']] efs: Efs integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsElasticacheArgs']] elasticache: Elasticache integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsElasticbeanstalkArgs']] elasticbeanstalk: Elastic Bean Stalk integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsElasticsearchArgs']] elasticsearch: Elastic Search integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsElbArgs']] elb: Elb integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsEmrArgs']] emr: Emr integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsHealthArgs']] health: Health integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsIamArgs']] iam: Iam integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsIotArgs']] iot: Iot integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsKinesisArgs']] kinesis: Kinesis integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsKinesisFirehoseArgs']] kinesis_firehose: Kinesis Firehose integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsLambdaArgs']] lambda_: Lambda integration
-        :param pulumi.Input[int] linked_account_id: The ID of the linked AWS account in New Relic.
-               All other arguments are dependent on the services to be integrated, which have been listed in the collapsible section below. All of these are **optional** blocks that can be added in any required combination. **For details on arguments that can be used with each service, check out the `Integration` blocks section below.**
-               <details>
-               <summary>Expand this section to view all supported AWS services supported, that may be integrated via this resource.</summary>
-               | Block                   | Description                   |
-               |-------------------------|-------------------------------|
-               | `alb`                   | ALB Integration               |
-               | `api_gateway`           | API Gateway Integration       |
-               | `auto_scaling`          | Auto Scaling Integration      |
-               | `aws_app_sync`          | AppSync Integration           |
-               | `aws_athena`            | Athena Integration            |
-               | `aws_cognito`           | Cognito Integration           |
-               | `aws_connect`           | Connect Integration           |
-               | `aws_direct_connect`    | Direct Connect Integration    |
-               | `aws_fsx`               | FSx Integration               |
-               | `aws_glue`              | Glue Integration              |
-               | `aws_kinesis_analytics` | Kinesis Analytics Integration |
-               | `aws_media_convert`     | MediaConvert Integration      |
-               | `aws_media_package_vod` | Media Package VOD Integration |
-               | `aws_mq`                | MQ Integration                |
-               | `aws_msk`               | MSK Integration               |
-               | `aws_neptune`           | Neptune Integration           |
-               | `aws_qldb`              | QLDB Integration              |
-               | `aws_route53resolver`   | Route53 Resolver Integration  |
-               | `aws_states`            | States Integration            |
-               | `aws_transit_gateway`   | Transit Gateway Integration   |
-               | `aws_waf`               | WAF Integration               |
-               | `aws_wafv2`             | WAFv2 Integration             |
-               | `billing`               | Billing Integration           |
-               | `cloudfront`            | CloudFront Integration        |
-               | `cloudtrail`            | CloudTrail Integration        |
-               | `doc_db`                | DocumentDB Integration        |
-               | `dynamodb`              | DynamoDB Integration          |
-               | `ebs`                   | EBS Integration               |
-               | `ec2`                   | EC2 Integration               |
-               | `ecs`                   | ECS Integration               |
-               | `efs`                   | EFS Integration               |
-               | `elasticache`           | ElastiCache Integration       |
-               | `elasticbeanstalk`      | Elastic Beanstalk Integration |
-               | `elasticsearch`         | Elasticsearch Integration     |
-               | `elb`                   | ELB Integration               |
-               | `emr`                   | EMR Integration               |
-               | `health`                | Health Integration            |
-               | `iam`                   | IAM Integration               |
-               | `iot`                   | IoT Integration               |
-               | `kinesis`               | Kinesis Integration           |
-               | `kinesis_firehose`      | Kinesis Firehose Integration  |
-               | `lambda`                | Lambda Integration            |
-               | `rds`                   | RDS Integration               |
-               | `redshift`              | Redshift Integration          |
-               | `route53`               | Route53 Integration           |
-               | `s3`                    | S3 Integration                |
-               | `ses`                   | SES Integration               |
-               | `sns`                   | SNS Integration               |
-               | `sqs`                   | SQS Integration               |
-               | `trusted_advisor`       | Trusted Advisor Integration   |
-               | `vpc`                   | VPC Integration               |
-               | `x_ray`                 | X-Ray Integration             |
-               </details>
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsRdsArgs']] rds: Rds integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsRedshiftArgs']] redshift: Redshift integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsRoute53Args']] route53: Route53 integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsS3Args']] s3: S3 integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsSesArgs']] ses: Ses integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsSnsArgs']] sns: Sns integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsSqsArgs']] sqs: SQS integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsTrustedAdvisorArgs']] trusted_advisor: Trusted Advisor integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsVpcArgs']] vpc: VPC integration
-        :param pulumi.Input[pulumi.InputType['AwsIntegrationsXRayArgs']] x_ray: X-Ray integration
+        :param pulumi.Input[_builtins.str] account_id: The New Relic account ID to operate on.  This allows the user to override the `account_id` attribute set on the provider. Defaults to the environment variable `NEW_RELIC_ACCOUNT_ID`.
+        :param pulumi.Input[Union['AwsIntegrationsAlbArgs', 'AwsIntegrationsAlbArgsDict']] alb: ALB integration
+        :param pulumi.Input[Union['AwsIntegrationsApiGatewayArgs', 'AwsIntegrationsApiGatewayArgsDict']] api_gateway: API Gateway integration
+        :param pulumi.Input[Union['AwsIntegrationsAutoScalingArgs', 'AwsIntegrationsAutoScalingArgsDict']] auto_scaling: AutoScaling integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsAppSyncArgs', 'AwsIntegrationsAwsAppSyncArgsDict']] aws_app_sync: Aws Appsync integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsAthenaArgs', 'AwsIntegrationsAwsAthenaArgsDict']] aws_athena: Aws Athena integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsAutoDiscoveryArgs', 'AwsIntegrationsAwsAutoDiscoveryArgsDict']] aws_auto_discovery: Aws Auto Discovery Integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsCognitoArgs', 'AwsIntegrationsAwsCognitoArgsDict']] aws_cognito: Aws Cognito integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsConnectArgs', 'AwsIntegrationsAwsConnectArgsDict']] aws_connect: Aws Connect integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsDirectConnectArgs', 'AwsIntegrationsAwsDirectConnectArgsDict']] aws_direct_connect: Aws Direct Connect integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsFsxArgs', 'AwsIntegrationsAwsFsxArgsDict']] aws_fsx: Aws Fsx integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsGlueArgs', 'AwsIntegrationsAwsGlueArgsDict']] aws_glue: Aws Glue integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsKinesisAnalyticsArgs', 'AwsIntegrationsAwsKinesisAnalyticsArgsDict']] aws_kinesis_analytics: Aws Kinesis Analytics integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsMediaConvertArgs', 'AwsIntegrationsAwsMediaConvertArgsDict']] aws_media_convert: Aws Media Convert integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsMediaPackageVodArgs', 'AwsIntegrationsAwsMediaPackageVodArgsDict']] aws_media_package_vod: Aws Media PackageVod integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsMqArgs', 'AwsIntegrationsAwsMqArgsDict']] aws_mq: Aws Mq integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsMskArgs', 'AwsIntegrationsAwsMskArgsDict']] aws_msk: Aws Msk integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsNeptuneArgs', 'AwsIntegrationsAwsNeptuneArgsDict']] aws_neptune: Aws Neptune integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsQldbArgs', 'AwsIntegrationsAwsQldbArgsDict']] aws_qldb: Aws Qldb integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsRoute53resolverArgs', 'AwsIntegrationsAwsRoute53resolverArgsDict']] aws_route53resolver: Aws Route53resolver integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsStatesArgs', 'AwsIntegrationsAwsStatesArgsDict']] aws_states: Aws states integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsTransitGatewayArgs', 'AwsIntegrationsAwsTransitGatewayArgsDict']] aws_transit_gateway: Aws Transit Gateway integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsWafArgs', 'AwsIntegrationsAwsWafArgsDict']] aws_waf: Aws Waf integration
+        :param pulumi.Input[Union['AwsIntegrationsAwsWafv2Args', 'AwsIntegrationsAwsWafv2ArgsDict']] aws_wafv2: Aws Wafv2 integration
+        :param pulumi.Input[Union['AwsIntegrationsBillingArgs', 'AwsIntegrationsBillingArgsDict']] billing: Billing integration
+        :param pulumi.Input[Union['AwsIntegrationsCloudfrontArgs', 'AwsIntegrationsCloudfrontArgsDict']] cloudfront: Cloudfront integration
+        :param pulumi.Input[Union['AwsIntegrationsCloudtrailArgs', 'AwsIntegrationsCloudtrailArgsDict']] cloudtrail: CloudTrail integration
+        :param pulumi.Input[Union['AwsIntegrationsDocDbArgs', 'AwsIntegrationsDocDbArgsDict']] doc_db: Doc DB integration
+        :param pulumi.Input[Union['AwsIntegrationsDynamodbArgs', 'AwsIntegrationsDynamodbArgsDict']] dynamodb: Dynamo DB integration
+        :param pulumi.Input[Union['AwsIntegrationsEbsArgs', 'AwsIntegrationsEbsArgsDict']] ebs: EBS integration
+        :param pulumi.Input[Union['AwsIntegrationsEc2Args', 'AwsIntegrationsEc2ArgsDict']] ec2: Ec2 integration
+        :param pulumi.Input[Union['AwsIntegrationsEcsArgs', 'AwsIntegrationsEcsArgsDict']] ecs: Ecs integration
+        :param pulumi.Input[Union['AwsIntegrationsEfsArgs', 'AwsIntegrationsEfsArgsDict']] efs: Efs integration
+        :param pulumi.Input[Union['AwsIntegrationsElasticacheArgs', 'AwsIntegrationsElasticacheArgsDict']] elasticache: Elasticache integration
+        :param pulumi.Input[Union['AwsIntegrationsElasticbeanstalkArgs', 'AwsIntegrationsElasticbeanstalkArgsDict']] elasticbeanstalk: Elastic Bean Stalk integration
+        :param pulumi.Input[Union['AwsIntegrationsElasticsearchArgs', 'AwsIntegrationsElasticsearchArgsDict']] elasticsearch: Elastic Search integration
+        :param pulumi.Input[Union['AwsIntegrationsElbArgs', 'AwsIntegrationsElbArgsDict']] elb: Elb integration
+        :param pulumi.Input[Union['AwsIntegrationsEmrArgs', 'AwsIntegrationsEmrArgsDict']] emr: Emr integration
+        :param pulumi.Input[Union['AwsIntegrationsHealthArgs', 'AwsIntegrationsHealthArgsDict']] health: Health integration
+        :param pulumi.Input[Union['AwsIntegrationsIamArgs', 'AwsIntegrationsIamArgsDict']] iam: Iam integration
+        :param pulumi.Input[Union['AwsIntegrationsIotArgs', 'AwsIntegrationsIotArgsDict']] iot: Iot integration
+        :param pulumi.Input[Union['AwsIntegrationsKinesisArgs', 'AwsIntegrationsKinesisArgsDict']] kinesis: Kinesis integration
+        :param pulumi.Input[Union['AwsIntegrationsKinesisFirehoseArgs', 'AwsIntegrationsKinesisFirehoseArgsDict']] kinesis_firehose: Kinesis Firehose integration
+        :param pulumi.Input[Union['AwsIntegrationsLambdaArgs', 'AwsIntegrationsLambdaArgsDict']] lambda_: Lambda integration
+        :param pulumi.Input[_builtins.str] linked_account_id: The ID of the linked AWS account in New Relic.
+        :param pulumi.Input[Union['AwsIntegrationsRdsArgs', 'AwsIntegrationsRdsArgsDict']] rds: Rds integration
+        :param pulumi.Input[Union['AwsIntegrationsRedshiftArgs', 'AwsIntegrationsRedshiftArgsDict']] redshift: Redshift integration
+        :param pulumi.Input[Union['AwsIntegrationsRoute53Args', 'AwsIntegrationsRoute53ArgsDict']] route53: Route53 integration
+        :param pulumi.Input[Union['AwsIntegrationsS3Args', 'AwsIntegrationsS3ArgsDict']] s3: S3 integration
+        :param pulumi.Input[Union['AwsIntegrationsSesArgs', 'AwsIntegrationsSesArgsDict']] ses: Ses integration
+        :param pulumi.Input[Union['AwsIntegrationsSnsArgs', 'AwsIntegrationsSnsArgsDict']] sns: Sns integration
+        :param pulumi.Input[Union['AwsIntegrationsSqsArgs', 'AwsIntegrationsSqsArgsDict']] sqs: SQS integration
+        :param pulumi.Input[Union['AwsIntegrationsTrustedAdvisorArgs', 'AwsIntegrationsTrustedAdvisorArgsDict']] trusted_advisor: Trusted Advisor integration
+        :param pulumi.Input[Union['AwsIntegrationsVpcArgs', 'AwsIntegrationsVpcArgsDict']] vpc: VPC integration
+        :param pulumi.Input[Union['AwsIntegrationsXRayArgs', 'AwsIntegrationsXRayArgsDict']] x_ray: X-Ray integration
         """
         opts = pulumi.ResourceOptions.merge(opts, pulumi.ResourceOptions(id=id))
@@ -3143,6 +2215,7 @@ class AwsIntegrations(pulumi.CustomResource):
         __props__.__dict__["auto_scaling"] = auto_scaling
         __props__.__dict__["aws_app_sync"] = aws_app_sync
         __props__.__dict__["aws_athena"] = aws_athena
+        __props__.__dict__["aws_auto_discovery"] = aws_auto_discovery
         __props__.__dict__["aws_cognito"] = aws_cognito
         __props__.__dict__["aws_connect"] = aws_connect
         __props__.__dict__["aws_direct_connect"] = aws_direct_connect
@@ -3193,15 +2266,15 @@ class AwsIntegrations(pulumi.CustomResource):
         __props__.__dict__["x_ray"] = x_ray
         return AwsIntegrations(resource_name, opts=opts, __props__=__props__)
-    @property
+    @_builtins.property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> pulumi.Output[int]:
+    def account_id(self) -> pulumi.Output[_builtins.str]:
         """
         The New Relic account ID to operate on.  This allows the user to override the `account_id` attribute set on the provider. Defaults to the environment variable `NEW_RELIC_ACCOUNT_ID`.
         """
         return pulumi.get(self, "account_id")
-    @property
+    @_builtins.property
     @pulumi.getter
     def alb(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAlb']]:
         """
@@ -3209,7 +2282,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "alb")
-    @property
+    @_builtins.property
     @pulumi.getter(name="apiGateway")
     def api_gateway(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsApiGateway']]:
         """
@@ -3217,15 +2290,15 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "api_gateway")
-    @property
+    @_builtins.property
     @pulumi.getter(name="autoScaling")
     def auto_scaling(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAutoScaling']]:
         """
-        ,`aws_app_sync`,`aws_athena`,`aws_cognito`,`aws_connect`,`aws_direct_connect`,`aws_fsx`,`aws_glue`,`aws_kinesis_analytics`,`aws_media_convert`,`aws_media_package_vod`,`aws_mq`,`aws_msk`,`aws_neptune`,`aws_qldb`,`aws_route53resolver`,`aws_states`,`aws_transit_gateway`,`aws_waf`,`aws_wafv2`,`iot`,`kinesis_firehose` and `ses`.
+        AutoScaling integration
         """
         return pulumi.get(self, "auto_scaling")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsAppSync")
     def aws_app_sync(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsAppSync']]:
         """
@@ -3233,7 +2306,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_app_sync")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsAthena")
     def aws_athena(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsAthena']]:
         """
@@ -3241,7 +2314,15 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_athena")
-    @property
+    @_builtins.property
+    @pulumi.getter(name="awsAutoDiscovery")
+    def aws_auto_discovery(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsAutoDiscovery']]:
+        """
+        Aws Auto Discovery Integration
+        """
+        return pulumi.get(self, "aws_auto_discovery")
+    @_builtins.property
     @pulumi.getter(name="awsCognito")
     def aws_cognito(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsCognito']]:
         """
@@ -3249,7 +2330,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_cognito")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsConnect")
     def aws_connect(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsConnect']]:
         """
@@ -3257,7 +2338,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_connect")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsDirectConnect")
     def aws_direct_connect(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsDirectConnect']]:
         """
@@ -3265,7 +2346,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_direct_connect")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsFsx")
     def aws_fsx(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsFsx']]:
         """
@@ -3273,7 +2354,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_fsx")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsGlue")
     def aws_glue(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsGlue']]:
         """
@@ -3281,7 +2362,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_glue")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsKinesisAnalytics")
     def aws_kinesis_analytics(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsKinesisAnalytics']]:
         """
@@ -3289,7 +2370,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_kinesis_analytics")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMediaConvert")
     def aws_media_convert(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsMediaConvert']]:
         """
@@ -3297,7 +2378,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_media_convert")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMediaPackageVod")
     def aws_media_package_vod(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsMediaPackageVod']]:
         """
@@ -3305,7 +2386,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_media_package_vod")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMq")
     def aws_mq(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsMq']]:
         """
@@ -3313,7 +2394,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_mq")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsMsk")
     def aws_msk(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsMsk']]:
         """
@@ -3321,7 +2402,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_msk")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsNeptune")
     def aws_neptune(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsNeptune']]:
         """
@@ -3329,7 +2410,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_neptune")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsQldb")
     def aws_qldb(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsQldb']]:
         """
@@ -3337,7 +2418,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_qldb")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsRoute53resolver")
     def aws_route53resolver(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsRoute53resolver']]:
         """
@@ -3345,7 +2426,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_route53resolver")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsStates")
     def aws_states(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsStates']]:
         """
@@ -3353,7 +2434,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_states")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsTransitGateway")
     def aws_transit_gateway(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsTransitGateway']]:
         """
@@ -3361,7 +2442,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_transit_gateway")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsWaf")
     def aws_waf(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsWaf']]:
         """
@@ -3369,7 +2450,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_waf")
-    @property
+    @_builtins.property
     @pulumi.getter(name="awsWafv2")
     def aws_wafv2(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsAwsWafv2']]:
         """
@@ -3377,7 +2458,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "aws_wafv2")
-    @property
+    @_builtins.property
     @pulumi.getter
     def billing(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsBilling']]:
         """
@@ -3385,7 +2466,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "billing")
-    @property
+    @_builtins.property
     @pulumi.getter
     def cloudfront(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsCloudfront']]:
         """
@@ -3393,7 +2474,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "cloudfront")
-    @property
+    @_builtins.property
     @pulumi.getter
     def cloudtrail(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsCloudtrail']]:
         """
@@ -3401,7 +2482,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "cloudtrail")
-    @property
+    @_builtins.property
     @pulumi.getter(name="docDb")
     def doc_db(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsDocDb']]:
         """
@@ -3409,7 +2490,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "doc_db")
-    @property
+    @_builtins.property
     @pulumi.getter
     def dynamodb(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsDynamodb']]:
         """
@@ -3417,7 +2498,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "dynamodb")
-    @property
+    @_builtins.property
     @pulumi.getter
     def ebs(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsEbs']]:
         """
@@ -3425,7 +2506,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "ebs")
-    @property
+    @_builtins.property
     @pulumi.getter
     def ec2(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsEc2']]:
         """
@@ -3433,7 +2514,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "ec2")
-    @property
+    @_builtins.property
     @pulumi.getter
     def ecs(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsEcs']]:
         """
@@ -3441,7 +2522,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "ecs")
-    @property
+    @_builtins.property
     @pulumi.getter
     def efs(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsEfs']]:
         """
@@ -3449,7 +2530,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "efs")
-    @property
+    @_builtins.property
     @pulumi.getter
     def elasticache(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsElasticache']]:
         """
@@ -3457,7 +2538,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "elasticache")
-    @property
+    @_builtins.property
     @pulumi.getter
     def elasticbeanstalk(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsElasticbeanstalk']]:
         """
@@ -3465,7 +2546,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "elasticbeanstalk")
-    @property
+    @_builtins.property
     @pulumi.getter
     def elasticsearch(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsElasticsearch']]:
         """
@@ -3473,7 +2554,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "elasticsearch")
-    @property
+    @_builtins.property
     @pulumi.getter
     def elb(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsElb']]:
         """
@@ -3481,7 +2562,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "elb")
-    @property
+    @_builtins.property
     @pulumi.getter
     def emr(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsEmr']]:
         """
@@ -3489,7 +2570,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "emr")
-    @property
+    @_builtins.property
     @pulumi.getter
     def health(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsHealth']]:
         """
@@ -3497,7 +2578,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "health")
-    @property
+    @_builtins.property
     @pulumi.getter
     def iam(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsIam']]:
         """
@@ -3505,7 +2586,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "iam")
-    @property
+    @_builtins.property
     @pulumi.getter
     def iot(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsIot']]:
         """
@@ -3513,7 +2594,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "iot")
-    @property
+    @_builtins.property
     @pulumi.getter
     def kinesis(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsKinesis']]:
         """
@@ -3521,7 +2602,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "kinesis")
-    @property
+    @_builtins.property
     @pulumi.getter(name="kinesisFirehose")
     def kinesis_firehose(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsKinesisFirehose']]:
         """
@@ -3529,7 +2610,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "kinesis_firehose")
-    @property
+    @_builtins.property
     @pulumi.getter(name="lambda")
     def lambda_(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsLambda']]:
         """
@@ -3537,76 +2618,15 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "lambda_")
-    @property
+    @_builtins.property
     @pulumi.getter(name="linkedAccountId")
-    def linked_account_id(self) -> pulumi.Output[int]:
+    def linked_account_id(self) -> pulumi.Output[_builtins.str]:
         """
         The ID of the linked AWS account in New Relic.
-        All other arguments are dependent on the services to be integrated, which have been listed in the collapsible section below. All of these are **optional** blocks that can be added in any required combination. **For details on arguments that can be used with each service, check out the `Integration` blocks section below.**
-        <details>
-        <summary>Expand this section to view all supported AWS services supported, that may be integrated via this resource.</summary>
-        | Block                   | Description                   |
-        |-------------------------|-------------------------------|
-        | `alb`                   | ALB Integration               |
-        | `api_gateway`           | API Gateway Integration       |
-        | `auto_scaling`          | Auto Scaling Integration      |
-        | `aws_app_sync`          | AppSync Integration           |
-        | `aws_athena`            | Athena Integration            |
-        | `aws_cognito`           | Cognito Integration           |
-        | `aws_connect`           | Connect Integration           |
-        | `aws_direct_connect`    | Direct Connect Integration    |
-        | `aws_fsx`               | FSx Integration               |
-        | `aws_glue`              | Glue Integration              |
-        | `aws_kinesis_analytics` | Kinesis Analytics Integration |
-        | `aws_media_convert`     | MediaConvert Integration      |
-        | `aws_media_package_vod` | Media Package VOD Integration |
-        | `aws_mq`                | MQ Integration                |
-        | `aws_msk`               | MSK Integration               |
-        | `aws_neptune`           | Neptune Integration           |
-        | `aws_qldb`              | QLDB Integration              |
-        | `aws_route53resolver`   | Route53 Resolver Integration  |
-        | `aws_states`            | States Integration            |
-        | `aws_transit_gateway`   | Transit Gateway Integration   |
-        | `aws_waf`               | WAF Integration               |
-        | `aws_wafv2`             | WAFv2 Integration             |
-        | `billing`               | Billing Integration           |
-        | `cloudfront`            | CloudFront Integration        |
-        | `cloudtrail`            | CloudTrail Integration        |
-        | `doc_db`                | DocumentDB Integration        |
-        | `dynamodb`              | DynamoDB Integration          |
-        | `ebs`                   | EBS Integration               |
-        | `ec2`                   | EC2 Integration               |
-        | `ecs`                   | ECS Integration               |
-        | `efs`                   | EFS Integration               |
-        | `elasticache`           | ElastiCache Integration       |
-        | `elasticbeanstalk`      | Elastic Beanstalk Integration |
-        | `elasticsearch`         | Elasticsearch Integration     |
-        | `elb`                   | ELB Integration               |
-        | `emr`                   | EMR Integration               |
-        | `health`                | Health Integration            |
-        | `iam`                   | IAM Integration               |
-        | `iot`                   | IoT Integration               |
-        | `kinesis`               | Kinesis Integration           |
-        | `kinesis_firehose`      | Kinesis Firehose Integration  |
-        | `lambda`                | Lambda Integration            |
-        | `rds`                   | RDS Integration               |
-        | `redshift`              | Redshift Integration          |
-        | `route53`               | Route53 Integration           |
-        | `s3`                    | S3 Integration                |
-        | `ses`                   | SES Integration               |
-        | `sns`                   | SNS Integration               |
-        | `sqs`                   | SQS Integration               |
-        | `trusted_advisor`       | Trusted Advisor Integration   |
-        | `vpc`                   | VPC Integration               |
-        | `x_ray`                 | X-Ray Integration             |
-        </details>
         """
         return pulumi.get(self, "linked_account_id")
-    @property
+    @_builtins.property
     @pulumi.getter
     def rds(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsRds']]:
         """
@@ -3614,7 +2634,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "rds")
-    @property
+    @_builtins.property
     @pulumi.getter
     def redshift(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsRedshift']]:
         """
@@ -3622,7 +2642,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "redshift")
-    @property
+    @_builtins.property
     @pulumi.getter
     def route53(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsRoute53']]:
         """
@@ -3630,7 +2650,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "route53")
-    @property
+    @_builtins.property
     @pulumi.getter
     def s3(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsS3']]:
         """
@@ -3638,7 +2658,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "s3")
-    @property
+    @_builtins.property
     @pulumi.getter
     def ses(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsSes']]:
         """
@@ -3646,7 +2666,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "ses")
-    @property
+    @_builtins.property
     @pulumi.getter
     def sns(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsSns']]:
         """
@@ -3654,7 +2674,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "sns")
-    @property
+    @_builtins.property
     @pulumi.getter
     def sqs(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsSqs']]:
         """
@@ -3662,7 +2682,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "sqs")
-    @property
+    @_builtins.property
     @pulumi.getter(name="trustedAdvisor")
     def trusted_advisor(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsTrustedAdvisor']]:
         """
@@ -3670,7 +2690,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "trusted_advisor")
-    @property
+    @_builtins.property
     @pulumi.getter
     def vpc(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsVpc']]:
         """
@@ -3678,7 +2698,7 @@ class AwsIntegrations(pulumi.CustomResource):
         """
         return pulumi.get(self, "vpc")
-    @property
+    @_builtins.property
     @pulumi.getter(name="xRay")
     def x_ray(self) -> pulumi.Output[Optional['outputs.AwsIntegrationsXRay']]:
         """

pulumi-newrelic 5.22.0__py3-none-any.whl → 5.58.0a1763707205__py3-none-any.whl

Potentially problematic release.

pulumi-newrelic 5.22.0py3-none-any.whl → 5.58.0a1763707205py3-none-any.whl