pulumi-newrelic 5.20.0a1709643785__py3-none-any.whl → 5.39.0a1736834464__py3-none-any.whl

pulumi_newrelic/nrql_drop_rule.py

@@ -4,9 +4,14 @@
 
 import copy
 import warnings
+import sys
 import pulumi
 import pulumi.runtime
 from typing import Any, Mapping, Optional, Sequence, Union, overload
+if sys.version_info >= (3, 11):
+    from typing import NotRequired, TypedDict, TypeAlias
+else:
+    from typing_extensions import NotRequired, TypedDict, TypeAlias
 from . import _utilities
 
 __all__ = ['NrqlDropRuleArgs', 'NrqlDropRule']
@@ -16,13 +21,13 @@ class NrqlDropRuleArgs:
     def __init__(__self__, *,
                  action: pulumi.Input[str],
                  nrql: pulumi.Input[str],
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None):
         """
         The set of arguments for constructing a NrqlDropRule resource.
         :param pulumi.Input[str] action: An action type specifying how to apply the NRQL string (either `drop_data`, `drop_attributes`, or ` drop_attributes_from_metric_aggregates`).
         :param pulumi.Input[str] nrql: A NRQL string that specifies what data types to drop.
-        :param pulumi.Input[int] account_id: Account where the drop rule will be put. Defaults to the account associated with the API key used.
+        :param pulumi.Input[str] account_id: Account where the drop rule will be put. Defaults to the account associated with the API key used.
         :param pulumi.Input[str] description: The description of the drop rule.
         """
         pulumi.set(__self__, "action", action)
@@ -58,14 +63,14 @@ class NrqlDropRuleArgs:
 
     @property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> Optional[pulumi.Input[int]]:
+    def account_id(self) -> Optional[pulumi.Input[str]]:
         """
         Account where the drop rule will be put. Defaults to the account associated with the API key used.
         """
         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[str]]):
         pulumi.set(self, "account_id", value)
 
     @property
@@ -84,14 +89,14 @@ class NrqlDropRuleArgs:
 @pulumi.input_type
 class _NrqlDropRuleState:
     def __init__(__self__, *,
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
                  action: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  nrql: Optional[pulumi.Input[str]] = None,
                  rule_id: Optional[pulumi.Input[str]] = None):
         """
         Input properties used for looking up and filtering NrqlDropRule resources.
-        :param pulumi.Input[int] account_id: Account where the drop rule will be put. Defaults to the account associated with the API key used.
+        :param pulumi.Input[str] account_id: Account where the drop rule will be put. Defaults to the account associated with the API key used.
         :param pulumi.Input[str] action: An action type specifying how to apply the NRQL string (either `drop_data`, `drop_attributes`, or ` drop_attributes_from_metric_aggregates`).
         :param pulumi.Input[str] description: The description of the drop rule.
         :param pulumi.Input[str] nrql: A NRQL string that specifies what data types to drop.
@@ -110,14 +115,14 @@ class _NrqlDropRuleState:
 
     @property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> Optional[pulumi.Input[int]]:
+    def account_id(self) -> Optional[pulumi.Input[str]]:
         """
         Account where the drop rule will be put. Defaults to the account associated with the API key used.
         """
         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[str]]):
         pulumi.set(self, "account_id", value)
 
     @property
@@ -174,7 +179,7 @@ class NrqlDropRule(pulumi.CustomResource):
     def __init__(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
                  action: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  nrql: Optional[pulumi.Input[str]] = None,
@@ -187,29 +192,40 @@ class NrqlDropRule(pulumi.CustomResource):
         import pulumi_newrelic as newrelic
 
         foo = newrelic.NrqlDropRule("foo",
-            account_id=12345,
-            action="drop_data",
+            account_id="12345",
             description="Drops all data for MyCustomEvent that comes from the LoadGeneratingApp in the dev environment, because there is too much and we don’t look at it.",
+            action="drop_data",
             nrql="SELECT * FROM MyCustomEvent WHERE appName='LoadGeneratingApp' AND environment='development'")
         bar = newrelic.NrqlDropRule("bar",
-            account_id=12345,
-            action="drop_attributes",
+            account_id="12345",
             description="Removes the user name and email fields from MyCustomEvent",
+            action="drop_attributes",
             nrql="SELECT userEmail, userName FROM MyCustomEvent")
         baz = newrelic.NrqlDropRule("baz",
-            account_id=12345,
-            action="drop_attributes_from_metric_aggregates",
+            account_id="12345",
             description="Removes containerId from metric aggregates to reduce metric cardinality.",
+            action="drop_attributes_from_metric_aggregates",
             nrql="SELECT containerId FROM Metric")
         ```
 
+        ## Using `newrelic-cli` to List Out Drop Rules
+
+        All NRQL Drop Rules associated with a New Relic account may be listed out using the following newrelic-cli command:
+
+        This would print all drop rules associated with your New Relic account to the terminal.
+        The number of rules to be printed can be customized using the `limit` argument of this command.
+        For instance, the following command limits the number of drop rules printed to two.
+
+        More details on the command and its arguments (for instance, the format in which the droprules are to be listed in the terminal, which is JSON by default) can be found in the output of the `newrelic nrql droprules --help` command.
+        If you do not have **newrelic-cli** installed on your device already, head over to [this page](https://github.com/newrelic/newrelic-cli#installation--upgrades) for instructions.
+
         ## Import
 
         New Relic NRQL drop rules can be imported using a concatenated string of the format
 
-        `<account_id>:<rule_id>`, e.g.
+         `<account_id>:<rule_id>`, e.g.
 
-         bash
+        bash
 
         ```sh
         $ pulumi import newrelic:index/nrqlDropRule:NrqlDropRule foo 12345:34567
@@ -217,7 +233,7 @@ class NrqlDropRule(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: Account where the drop rule will be put. Defaults to the account associated with the API key used.
+        :param pulumi.Input[str] account_id: Account where the drop rule will be put. Defaults to the account associated with the API key used.
         :param pulumi.Input[str] action: An action type specifying how to apply the NRQL string (either `drop_data`, `drop_attributes`, or ` drop_attributes_from_metric_aggregates`).
         :param pulumi.Input[str] description: The description of the drop rule.
         :param pulumi.Input[str] nrql: A NRQL string that specifies what data types to drop.
@@ -236,29 +252,40 @@ class NrqlDropRule(pulumi.CustomResource):
         import pulumi_newrelic as newrelic
 
         foo = newrelic.NrqlDropRule("foo",
-            account_id=12345,
-            action="drop_data",
+            account_id="12345",
             description="Drops all data for MyCustomEvent that comes from the LoadGeneratingApp in the dev environment, because there is too much and we don’t look at it.",
+            action="drop_data",
             nrql="SELECT * FROM MyCustomEvent WHERE appName='LoadGeneratingApp' AND environment='development'")
         bar = newrelic.NrqlDropRule("bar",
-            account_id=12345,
-            action="drop_attributes",
+            account_id="12345",
             description="Removes the user name and email fields from MyCustomEvent",
+            action="drop_attributes",
             nrql="SELECT userEmail, userName FROM MyCustomEvent")
         baz = newrelic.NrqlDropRule("baz",
-            account_id=12345,
-            action="drop_attributes_from_metric_aggregates",
+            account_id="12345",
             description="Removes containerId from metric aggregates to reduce metric cardinality.",
+            action="drop_attributes_from_metric_aggregates",
             nrql="SELECT containerId FROM Metric")
         ```
 
+        ## Using `newrelic-cli` to List Out Drop Rules
+
+        All NRQL Drop Rules associated with a New Relic account may be listed out using the following newrelic-cli command:
+
+        This would print all drop rules associated with your New Relic account to the terminal.
+        The number of rules to be printed can be customized using the `limit` argument of this command.
+        For instance, the following command limits the number of drop rules printed to two.
+
+        More details on the command and its arguments (for instance, the format in which the droprules are to be listed in the terminal, which is JSON by default) can be found in the output of the `newrelic nrql droprules --help` command.
+        If you do not have **newrelic-cli** installed on your device already, head over to [this page](https://github.com/newrelic/newrelic-cli#installation--upgrades) for instructions.
+
         ## Import
 
         New Relic NRQL drop rules can be imported using a concatenated string of the format
 
-        `<account_id>:<rule_id>`, e.g.
+         `<account_id>:<rule_id>`, e.g.
 
-         bash
+        bash
 
         ```sh
         $ pulumi import newrelic:index/nrqlDropRule:NrqlDropRule foo 12345:34567
@@ -279,7 +306,7 @@ class NrqlDropRule(pulumi.CustomResource):
     def _internal_init(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
                  action: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  nrql: Optional[pulumi.Input[str]] = None,
@@ -311,7 +338,7 @@ class NrqlDropRule(pulumi.CustomResource):
     def get(resource_name: str,
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
-            account_id: Optional[pulumi.Input[int]] = None,
+            account_id: Optional[pulumi.Input[str]] = None,
             action: Optional[pulumi.Input[str]] = None,
             description: Optional[pulumi.Input[str]] = None,
             nrql: Optional[pulumi.Input[str]] = None,
@@ -323,7 +350,7 @@ class NrqlDropRule(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: Account where the drop rule will be put. Defaults to the account associated with the API key used.
+        :param pulumi.Input[str] account_id: Account where the drop rule will be put. Defaults to the account associated with the API key used.
         :param pulumi.Input[str] action: An action type specifying how to apply the NRQL string (either `drop_data`, `drop_attributes`, or ` drop_attributes_from_metric_aggregates`).
         :param pulumi.Input[str] description: The description of the drop rule.
         :param pulumi.Input[str] nrql: A NRQL string that specifies what data types to drop.
@@ -342,7 +369,7 @@ class NrqlDropRule(pulumi.CustomResource):
 
     @property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> pulumi.Output[int]:
+    def account_id(self) -> pulumi.Output[str]:
         """
         Account where the drop rule will be put. Defaults to the account associated with the API key used.
         """

pulumi_newrelic/obfuscation_expression.py

@@ -4,9 +4,14 @@
 
 import copy
 import warnings
+import sys
 import pulumi
 import pulumi.runtime
 from typing import Any, Mapping, Optional, Sequence, Union, overload
+if sys.version_info >= (3, 11):
+    from typing import NotRequired, TypedDict, TypeAlias
+else:
+    from typing_extensions import NotRequired, TypedDict, TypeAlias
 from . import _utilities
 
 __all__ = ['ObfuscationExpressionArgs', 'ObfuscationExpression']
@@ -15,13 +20,13 @@ __all__ = ['ObfuscationExpressionArgs', 'ObfuscationExpression']
 class ObfuscationExpressionArgs:
     def __init__(__self__, *,
                  regex: pulumi.Input[str],
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  name: Optional[pulumi.Input[str]] = None):
         """
         The set of arguments for constructing a ObfuscationExpression resource.
         :param pulumi.Input[str] regex: Regex of expression. Must be wrapped in parentheses, e.g. (regex.*).
-        :param pulumi.Input[int] account_id: The account id associated with the obfuscation expression.
+        :param pulumi.Input[str] account_id: The account id associated with the obfuscation expression.
         :param pulumi.Input[str] description: Description of expression.
         :param pulumi.Input[str] name: Name of expression.
         """
@@ -47,14 +52,14 @@ class ObfuscationExpressionArgs:
 
     @property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> Optional[pulumi.Input[int]]:
+    def account_id(self) -> Optional[pulumi.Input[str]]:
         """
         The account id associated with the obfuscation expression.
         """
         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[str]]):
         pulumi.set(self, "account_id", value)
 
     @property
@@ -85,13 +90,13 @@ class ObfuscationExpressionArgs:
 @pulumi.input_type
 class _ObfuscationExpressionState:
     def __init__(__self__, *,
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  regex: Optional[pulumi.Input[str]] = None):
         """
         Input properties used for looking up and filtering ObfuscationExpression resources.
-        :param pulumi.Input[int] account_id: The account id associated with the obfuscation expression.
+        :param pulumi.Input[str] account_id: The account id associated with the obfuscation expression.
         :param pulumi.Input[str] description: Description of expression.
         :param pulumi.Input[str] name: Name of expression.
         :param pulumi.Input[str] regex: Regex of expression. Must be wrapped in parentheses, e.g. (regex.*).
@@ -107,14 +112,14 @@ class _ObfuscationExpressionState:
 
     @property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> Optional[pulumi.Input[int]]:
+    def account_id(self) -> Optional[pulumi.Input[str]]:
         """
         The account id associated with the obfuscation expression.
         """
         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[str]]):
         pulumi.set(self, "account_id", value)
 
     @property
@@ -159,7 +164,7 @@ class ObfuscationExpression(pulumi.CustomResource):
     def __init__(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  regex: Optional[pulumi.Input[str]] = None,
@@ -174,7 +179,8 @@ class ObfuscationExpression(pulumi.CustomResource):
         import pulumi_newrelic as newrelic
 
         foo = newrelic.ObfuscationExpression("foo",
-            account_id=12345,
+            account_id="12345",
+            name="OExp",
             description="The description",
             regex="(regex.*)")
         ```
@@ -183,7 +189,7 @@ class ObfuscationExpression(pulumi.CustomResource):
 
         New Relic obfuscation expression can be imported using the expression ID, e.g.
 
-         bash
+        bash
 
         ```sh
         $ pulumi import newrelic:index/obfuscationExpression:ObfuscationExpression foo 34567
@@ -191,7 +197,7 @@ class ObfuscationExpression(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 account id associated with the obfuscation expression.
+        :param pulumi.Input[str] account_id: The account id associated with the obfuscation expression.
         :param pulumi.Input[str] description: Description of expression.
         :param pulumi.Input[str] name: Name of expression.
         :param pulumi.Input[str] regex: Regex of expression. Must be wrapped in parentheses, e.g. (regex.*).
@@ -212,7 +218,8 @@ class ObfuscationExpression(pulumi.CustomResource):
         import pulumi_newrelic as newrelic
 
         foo = newrelic.ObfuscationExpression("foo",
-            account_id=12345,
+            account_id="12345",
+            name="OExp",
             description="The description",
             regex="(regex.*)")
         ```
@@ -221,7 +228,7 @@ class ObfuscationExpression(pulumi.CustomResource):
 
         New Relic obfuscation expression can be imported using the expression ID, e.g.
 
-         bash
+        bash
 
         ```sh
         $ pulumi import newrelic:index/obfuscationExpression:ObfuscationExpression foo 34567
@@ -242,7 +249,7 @@ class ObfuscationExpression(pulumi.CustomResource):
     def _internal_init(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  name: Optional[pulumi.Input[str]] = None,
                  regex: Optional[pulumi.Input[str]] = None,
@@ -271,7 +278,7 @@ class ObfuscationExpression(pulumi.CustomResource):
     def get(resource_name: str,
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
-            account_id: Optional[pulumi.Input[int]] = None,
+            account_id: Optional[pulumi.Input[str]] = None,
             description: Optional[pulumi.Input[str]] = None,
             name: Optional[pulumi.Input[str]] = None,
             regex: Optional[pulumi.Input[str]] = None) -> 'ObfuscationExpression':
@@ -282,7 +289,7 @@ class ObfuscationExpression(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 account id associated with the obfuscation expression.
+        :param pulumi.Input[str] account_id: The account id associated with the obfuscation expression.
         :param pulumi.Input[str] description: Description of expression.
         :param pulumi.Input[str] name: Name of expression.
         :param pulumi.Input[str] regex: Regex of expression. Must be wrapped in parentheses, e.g. (regex.*).
@@ -299,7 +306,7 @@ class ObfuscationExpression(pulumi.CustomResource):
 
     @property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> pulumi.Output[int]:
+    def account_id(self) -> pulumi.Output[str]:
         """
         The account id associated with the obfuscation expression.
         """

pulumi_newrelic/obfuscation_rule.py

@@ -4,9 +4,14 @@
 
 import copy
 import warnings
+import sys
 import pulumi
 import pulumi.runtime
 from typing import Any, Mapping, Optional, Sequence, Union, overload
+if sys.version_info >= (3, 11):
+    from typing import NotRequired, TypedDict, TypeAlias
+else:
+    from typing_extensions import NotRequired, TypedDict, TypeAlias
 from . import _utilities
 from . import outputs
 from ._inputs import *
@@ -19,7 +24,7 @@ class ObfuscationRuleArgs:
                  actions: pulumi.Input[Sequence[pulumi.Input['ObfuscationRuleActionArgs']]],
                  enabled: pulumi.Input[bool],
                  filter: pulumi.Input[str],
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  name: Optional[pulumi.Input[str]] = None):
         """
@@ -27,7 +32,7 @@ class ObfuscationRuleArgs:
         :param pulumi.Input[Sequence[pulumi.Input['ObfuscationRuleActionArgs']]] actions: Actions for the rule. The actions will be applied in the order specified by this list.
         :param pulumi.Input[bool] enabled: Whether the rule should be applied or not to incoming data.
         :param pulumi.Input[str] filter: NRQL for determining whether a given log record should have obfuscation actions applied.
-        :param pulumi.Input[int] account_id: The account id associated with the obfuscation rule.
+        :param pulumi.Input[str] account_id: The account id associated with the obfuscation rule.
         :param pulumi.Input[str] description: Description of rule.
         :param pulumi.Input[str] name: Name of rule.
         """
@@ -79,14 +84,14 @@ class ObfuscationRuleArgs:
 
     @property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> Optional[pulumi.Input[int]]:
+    def account_id(self) -> Optional[pulumi.Input[str]]:
         """
         The account id associated with the obfuscation rule.
         """
         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[str]]):
         pulumi.set(self, "account_id", value)
 
     @property
@@ -117,7 +122,7 @@ class ObfuscationRuleArgs:
 @pulumi.input_type
 class _ObfuscationRuleState:
     def __init__(__self__, *,
-                 account_id: Optional[pulumi.Input[int]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
                  actions: Optional[pulumi.Input[Sequence[pulumi.Input['ObfuscationRuleActionArgs']]]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  enabled: Optional[pulumi.Input[bool]] = None,
@@ -125,7 +130,7 @@ class _ObfuscationRuleState:
                  name: Optional[pulumi.Input[str]] = None):
         """
         Input properties used for looking up and filtering ObfuscationRule resources.
-        :param pulumi.Input[int] account_id: The account id associated with the obfuscation rule.
+        :param pulumi.Input[str] account_id: The account id associated with the obfuscation rule.
         :param pulumi.Input[Sequence[pulumi.Input['ObfuscationRuleActionArgs']]] actions: Actions for the rule. The actions will be applied in the order specified by this list.
         :param pulumi.Input[str] description: Description of rule.
         :param pulumi.Input[bool] enabled: Whether the rule should be applied or not to incoming data.
@@ -147,14 +152,14 @@ class _ObfuscationRuleState:
 
     @property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> Optional[pulumi.Input[int]]:
+    def account_id(self) -> Optional[pulumi.Input[str]]:
         """
         The account id associated with the obfuscation rule.
         """
         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[str]]):
         pulumi.set(self, "account_id", value)
 
     @property
@@ -223,8 +228,8 @@ class ObfuscationRule(pulumi.CustomResource):
     def __init__(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
-                 account_id: Optional[pulumi.Input[int]] = None,
-                 actions: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ObfuscationRuleActionArgs']]]]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
+                 actions: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ObfuscationRuleActionArgs', 'ObfuscationRuleActionArgsDict']]]]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  enabled: Optional[pulumi.Input[bool]] = None,
                  filter: Optional[pulumi.Input[str]] = None,
@@ -240,24 +245,26 @@ class ObfuscationRule(pulumi.CustomResource):
         import pulumi_newrelic as newrelic
 
         bar = newrelic.ObfuscationExpression("bar",
+            name="expressionName",
             description="description of the expression",
             regex="(^http)")
         foo = newrelic.ObfuscationRule("foo",
+            name="ruleName",
             description="description of the rule",
             filter="hostStatus=running",
             enabled=True,
-            actions=[newrelic.ObfuscationRuleActionArgs(
-                attributes=["message"],
-                expression_id=bar.id,
-                method="MASK",
-            )])
+            actions=[{
+                "attributes": ["message"],
+                "expression_id": bar.id,
+                "method": "MASK",
+            }])
         ```
 
         ## Import
 
         New Relic obfuscation rule can be imported using the rule ID, e.g.
 
-         bash
+        bash
 
         ```sh
         $ pulumi import newrelic:index/obfuscationRule:ObfuscationRule foo 34567
@@ -265,8 +272,8 @@ class ObfuscationRule(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 account id associated with the obfuscation rule.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ObfuscationRuleActionArgs']]]] actions: Actions for the rule. The actions will be applied in the order specified by this list.
+        :param pulumi.Input[str] account_id: The account id associated with the obfuscation rule.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['ObfuscationRuleActionArgs', 'ObfuscationRuleActionArgsDict']]]] actions: Actions for the rule. The actions will be applied in the order specified by this list.
         :param pulumi.Input[str] description: Description of rule.
         :param pulumi.Input[bool] enabled: Whether the rule should be applied or not to incoming data.
         :param pulumi.Input[str] filter: NRQL for determining whether a given log record should have obfuscation actions applied.
@@ -288,24 +295,26 @@ class ObfuscationRule(pulumi.CustomResource):
         import pulumi_newrelic as newrelic
 
         bar = newrelic.ObfuscationExpression("bar",
+            name="expressionName",
             description="description of the expression",
             regex="(^http)")
         foo = newrelic.ObfuscationRule("foo",
+            name="ruleName",
             description="description of the rule",
             filter="hostStatus=running",
             enabled=True,
-            actions=[newrelic.ObfuscationRuleActionArgs(
-                attributes=["message"],
-                expression_id=bar.id,
-                method="MASK",
-            )])
+            actions=[{
+                "attributes": ["message"],
+                "expression_id": bar.id,
+                "method": "MASK",
+            }])
         ```
 
         ## Import
 
         New Relic obfuscation rule can be imported using the rule ID, e.g.
 
-         bash
+        bash
 
         ```sh
         $ pulumi import newrelic:index/obfuscationRule:ObfuscationRule foo 34567
@@ -326,8 +335,8 @@ class ObfuscationRule(pulumi.CustomResource):
     def _internal_init(__self__,
                  resource_name: str,
                  opts: Optional[pulumi.ResourceOptions] = None,
-                 account_id: Optional[pulumi.Input[int]] = None,
-                 actions: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ObfuscationRuleActionArgs']]]]] = None,
+                 account_id: Optional[pulumi.Input[str]] = None,
+                 actions: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ObfuscationRuleActionArgs', 'ObfuscationRuleActionArgsDict']]]]] = None,
                  description: Optional[pulumi.Input[str]] = None,
                  enabled: Optional[pulumi.Input[bool]] = None,
                  filter: Optional[pulumi.Input[str]] = None,
@@ -363,8 +372,8 @@ class ObfuscationRule(pulumi.CustomResource):
     def get(resource_name: str,
             id: pulumi.Input[str],
             opts: Optional[pulumi.ResourceOptions] = None,
-            account_id: Optional[pulumi.Input[int]] = None,
-            actions: Optional[pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ObfuscationRuleActionArgs']]]]] = None,
+            account_id: Optional[pulumi.Input[str]] = None,
+            actions: Optional[pulumi.Input[Sequence[pulumi.Input[Union['ObfuscationRuleActionArgs', 'ObfuscationRuleActionArgsDict']]]]] = None,
             description: Optional[pulumi.Input[str]] = None,
             enabled: Optional[pulumi.Input[bool]] = None,
             filter: Optional[pulumi.Input[str]] = None,
@@ -376,8 +385,8 @@ class ObfuscationRule(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 account id associated with the obfuscation rule.
-        :param pulumi.Input[Sequence[pulumi.Input[pulumi.InputType['ObfuscationRuleActionArgs']]]] actions: Actions for the rule. The actions will be applied in the order specified by this list.
+        :param pulumi.Input[str] account_id: The account id associated with the obfuscation rule.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['ObfuscationRuleActionArgs', 'ObfuscationRuleActionArgsDict']]]] actions: Actions for the rule. The actions will be applied in the order specified by this list.
         :param pulumi.Input[str] description: Description of rule.
         :param pulumi.Input[bool] enabled: Whether the rule should be applied or not to incoming data.
         :param pulumi.Input[str] filter: NRQL for determining whether a given log record should have obfuscation actions applied.
@@ -397,7 +406,7 @@ class ObfuscationRule(pulumi.CustomResource):
 
     @property
     @pulumi.getter(name="accountId")
-    def account_id(self) -> pulumi.Output[int]:
+    def account_id(self) -> pulumi.Output[str]:
         """
         The account id associated with the obfuscation rule.
         """