cribl-control-plane 0.0.36__py3-none-any.whl → 0.0.37a1__py3-none-any.whl

cribl_control_plane/models/outputgrafanacloud.py

@@ -4,33 +4,33 @@ from __future__ import annotations
 from cribl_control_plane.types import BaseModel
 from enum import Enum
 import pydantic
-from typing import List, Optional, Union
-from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
+from typing import List, Optional
+from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-class OutputGrafanaCloudType2(str, Enum):
+class OutputGrafanaCloudType(str, Enum):
     GRAFANA_CLOUD = "grafana_cloud"
 
 
-class OutputGrafanaCloudMessageFormat2(str, Enum):
+class OutputGrafanaCloudMessageFormat(str, Enum):
     r"""Format to use when sending logs to Loki (Protobuf or JSON)"""
 
     PROTOBUF = "protobuf"
     JSON = "json"
 
 
-class OutputGrafanaCloudLabel2TypedDict(TypedDict):
+class OutputGrafanaCloudLabelTypedDict(TypedDict):
     value: str
     name: NotRequired[str]
 
 
-class OutputGrafanaCloudLabel2(BaseModel):
+class OutputGrafanaCloudLabel(BaseModel):
     value: str
 
     name: Optional[str] = ""
 
 
-class OutputGrafanaCloudPrometheusAuthAuthenticationType2(str, Enum):
+class OutputGrafanaCloudPrometheusAuthAuthenticationType(str, Enum):
     NONE = "none"
     TOKEN = "token"
     TEXT_SECRET = "textSecret"
@@ -38,8 +38,8 @@ class OutputGrafanaCloudPrometheusAuthAuthenticationType2(str, Enum):
     CREDENTIALS_SECRET = "credentialsSecret"
 
 
-class OutputGrafanaCloudPrometheusAuth2TypedDict(TypedDict):
-    auth_type: NotRequired[OutputGrafanaCloudPrometheusAuthAuthenticationType2]
+class OutputGrafanaCloudPrometheusAuthTypedDict(TypedDict):
+    auth_type: NotRequired[OutputGrafanaCloudPrometheusAuthAuthenticationType]
     token: NotRequired[str]
     r"""Bearer token to include in the authorization header. In Grafana Cloud, this is generally built by concatenating the username and the API key, separated by a colon. Example: <your-username>:<your-api-key>"""
     text_secret: NotRequired[str]
@@ -52,11 +52,11 @@ class OutputGrafanaCloudPrometheusAuth2TypedDict(TypedDict):
     r"""Select or create a secret that references your credentials"""
 
 
-class OutputGrafanaCloudPrometheusAuth2(BaseModel):
+class OutputGrafanaCloudPrometheusAuth(BaseModel):
     auth_type: Annotated[
-        Optional[OutputGrafanaCloudPrometheusAuthAuthenticationType2],
+        Optional[OutputGrafanaCloudPrometheusAuthAuthenticationType],
         pydantic.Field(alias="authType"),
-    ] = OutputGrafanaCloudPrometheusAuthAuthenticationType2.BASIC
+    ] = OutputGrafanaCloudPrometheusAuthAuthenticationType.BASIC
 
     token: Optional[str] = None
     r"""Bearer token to include in the authorization header. In Grafana Cloud, this is generally built by concatenating the username and the API key, separated by a colon. Example: <your-username>:<your-api-key>"""
@@ -76,7 +76,7 @@ class OutputGrafanaCloudPrometheusAuth2(BaseModel):
     r"""Select or create a secret that references your credentials"""
 
 
-class OutputGrafanaCloudLokiAuthAuthenticationType2(str, Enum):
+class OutputGrafanaCloudLokiAuthAuthenticationType(str, Enum):
     NONE = "none"
     TOKEN = "token"
     TEXT_SECRET = "textSecret"
@@ -84,8 +84,8 @@ class OutputGrafanaCloudLokiAuthAuthenticationType2(str, Enum):
     CREDENTIALS_SECRET = "credentialsSecret"
 
 
-class OutputGrafanaCloudLokiAuth2TypedDict(TypedDict):
-    auth_type: NotRequired[OutputGrafanaCloudLokiAuthAuthenticationType2]
+class OutputGrafanaCloudLokiAuthTypedDict(TypedDict):
+    auth_type: NotRequired[OutputGrafanaCloudLokiAuthAuthenticationType]
     token: NotRequired[str]
     r"""Bearer token to include in the authorization header. In Grafana Cloud, this is generally built by concatenating the username and the API key, separated by a colon. Example: <your-username>:<your-api-key>"""
     text_secret: NotRequired[str]
@@ -98,11 +98,11 @@ class OutputGrafanaCloudLokiAuth2TypedDict(TypedDict):
     r"""Select or create a secret that references your credentials"""
 
 
-class OutputGrafanaCloudLokiAuth2(BaseModel):
+class OutputGrafanaCloudLokiAuth(BaseModel):
     auth_type: Annotated[
-        Optional[OutputGrafanaCloudLokiAuthAuthenticationType2],
+        Optional[OutputGrafanaCloudLokiAuthAuthenticationType],
         pydantic.Field(alias="authType"),
-    ] = OutputGrafanaCloudLokiAuthAuthenticationType2.BASIC
+    ] = OutputGrafanaCloudLokiAuthAuthenticationType.BASIC
 
     token: Optional[str] = None
     r"""Bearer token to include in the authorization header. In Grafana Cloud, this is generally built by concatenating the username and the API key, separated by a colon. Example: <your-username>:<your-api-key>"""
@@ -122,18 +122,18 @@ class OutputGrafanaCloudLokiAuth2(BaseModel):
     r"""Select or create a secret that references your credentials"""
 
 
-class OutputGrafanaCloudExtraHTTPHeader2TypedDict(TypedDict):
+class OutputGrafanaCloudExtraHTTPHeaderTypedDict(TypedDict):
     value: str
     name: NotRequired[str]
 
 
-class OutputGrafanaCloudExtraHTTPHeader2(BaseModel):
+class OutputGrafanaCloudExtraHTTPHeader(BaseModel):
     value: str
 
     name: Optional[str] = None
 
 
-class OutputGrafanaCloudFailedRequestLoggingMode2(str, Enum):
+class OutputGrafanaCloudFailedRequestLoggingMode(str, Enum):
     r"""Data to log when a request fails. All headers are redacted by default, unless listed as safe headers below."""
 
     PAYLOAD = "payload"
@@ -141,7 +141,7 @@ class OutputGrafanaCloudFailedRequestLoggingMode2(str, Enum):
     NONE = "none"
 
 
-class OutputGrafanaCloudResponseRetrySetting2TypedDict(TypedDict):
+class OutputGrafanaCloudResponseRetrySettingTypedDict(TypedDict):
     http_status: float
     r"""The HTTP response status code that will trigger retries"""
     initial_backoff: NotRequired[float]
@@ -152,7 +152,7 @@ class OutputGrafanaCloudResponseRetrySetting2TypedDict(TypedDict):
     r"""The maximum backoff interval, in milliseconds, Cribl Stream should apply. Default (and minimum) is 10,000 ms (10 seconds); maximum is 180,000 ms (180 seconds)."""
 
 
-class OutputGrafanaCloudResponseRetrySetting2(BaseModel):
+class OutputGrafanaCloudResponseRetrySetting(BaseModel):
     http_status: Annotated[float, pydantic.Field(alias="httpStatus")]
     r"""The HTTP response status code that will trigger retries"""
 
@@ -168,7 +168,7 @@ class OutputGrafanaCloudResponseRetrySetting2(BaseModel):
     r"""The maximum backoff interval, in milliseconds, Cribl Stream should apply. Default (and minimum) is 10,000 ms (10 seconds); maximum is 180,000 ms (180 seconds)."""
 
 
-class OutputGrafanaCloudTimeoutRetrySettings2TypedDict(TypedDict):
+class OutputGrafanaCloudTimeoutRetrySettingsTypedDict(TypedDict):
     timeout_retry: NotRequired[bool]
     initial_backoff: NotRequired[float]
     r"""How long, in milliseconds, Cribl Stream should wait before initiating backoff. Maximum interval is 600,000 ms (10 minutes)."""
@@ -178,7 +178,7 @@ class OutputGrafanaCloudTimeoutRetrySettings2TypedDict(TypedDict):
     r"""The maximum backoff interval, in milliseconds, Cribl Stream should apply. Default (and minimum) is 10,000 ms (10 seconds); maximum is 180,000 ms (180 seconds)."""
 
 
-class OutputGrafanaCloudTimeoutRetrySettings2(BaseModel):
+class OutputGrafanaCloudTimeoutRetrySettings(BaseModel):
     timeout_retry: Annotated[Optional[bool], pydantic.Field(alias="timeoutRetry")] = (
         False
     )
@@ -195,7 +195,7 @@ class OutputGrafanaCloudTimeoutRetrySettings2(BaseModel):
     r"""The maximum backoff interval, in milliseconds, Cribl Stream should apply. Default (and minimum) is 10,000 ms (10 seconds); maximum is 180,000 ms (180 seconds)."""
 
 
-class OutputGrafanaCloudBackpressureBehavior2(str, Enum):
+class OutputGrafanaCloudBackpressureBehavior(str, Enum):
     r"""How to handle events when all receivers are exerting backpressure"""
 
     BLOCK = "block"
@@ -203,21 +203,21 @@ class OutputGrafanaCloudBackpressureBehavior2(str, Enum):
     QUEUE = "queue"
 
 
-class OutputGrafanaCloudCompression2(str, Enum):
+class OutputGrafanaCloudCompression(str, Enum):
     r"""Codec to use to compress the persisted data"""
 
     NONE = "none"
     GZIP = "gzip"
 
 
-class OutputGrafanaCloudQueueFullBehavior2(str, Enum):
+class OutputGrafanaCloudQueueFullBehavior(str, Enum):
     r"""How to handle events when the queue is exerting backpressure (full capacity or low disk). 'Block' is the same behavior as non-PQ blocking. 'Drop new data' throws away incoming data, while leaving the contents of the PQ unchanged."""
 
     BLOCK = "block"
     DROP = "drop"
 
 
-class OutputGrafanaCloudMode2(str, Enum):
+class OutputGrafanaCloudMode(str, Enum):
     r"""In Error mode, PQ writes events to the filesystem if the Destination is unavailable. In Backpressure mode, PQ writes events to the filesystem when it detects backpressure from the Destination. In Always On mode, PQ always writes events to the filesystem."""
 
     ERROR = "error"
@@ -225,18 +225,16 @@ class OutputGrafanaCloudMode2(str, Enum):
     ALWAYS = "always"
 
 
-class OutputGrafanaCloudPqControls2TypedDict(TypedDict):
+class OutputGrafanaCloudPqControlsTypedDict(TypedDict):
     pass
 
 
-class OutputGrafanaCloudPqControls2(BaseModel):
+class OutputGrafanaCloudPqControls(BaseModel):
     pass
 
 
-class OutputGrafanaCloudGrafanaCloud2TypedDict(TypedDict):
-    type: OutputGrafanaCloudType2
-    prometheus_url: str
-    r"""The remote_write endpoint to send Prometheus metrics to, such as https://prometheus-blocks-prod-us-central1.grafana.net/api/prom/push"""
+class OutputGrafanaCloudTypedDict(TypedDict):
+    type: OutputGrafanaCloudType
     id: NotRequired[str]
     r"""Unique ID for this output"""
     pipeline: NotRequired[str]
@@ -249,16 +247,18 @@ class OutputGrafanaCloudGrafanaCloud2TypedDict(TypedDict):
     r"""Tags for filtering and grouping in @{product}"""
     loki_url: NotRequired[str]
     r"""The endpoint to send logs to, such as https://logs-prod-us-central1.grafana.net"""
+    prometheus_url: NotRequired[str]
+    r"""The remote_write endpoint to send Prometheus metrics to, such as https://prometheus-blocks-prod-us-central1.grafana.net/api/prom/push"""
     message: NotRequired[str]
     r"""Name of the event field that contains the message to send. If not specified, Stream sends a JSON representation of the whole event."""
-    message_format: NotRequired[OutputGrafanaCloudMessageFormat2]
+    message_format: NotRequired[OutputGrafanaCloudMessageFormat]
     r"""Format to use when sending logs to Loki (Protobuf or JSON)"""
-    labels: NotRequired[List[OutputGrafanaCloudLabel2TypedDict]]
+    labels: NotRequired[List[OutputGrafanaCloudLabelTypedDict]]
     r"""List of labels to send with logs. Labels define Loki streams, so use static labels to avoid proliferating label value combinations and streams. Can be merged and/or overridden by the event's __labels field. Example: '__labels: {host: \"cribl.io\", level: \"error\"}'"""
     metric_rename_expr: NotRequired[str]
     r"""JavaScript expression that can be used to rename metrics. For example, name.replace(/\./g, '_') will replace all '.' characters in a metric's name with the supported '_' character. Use the 'name' global variable to access the metric's name. You can access event fields' values via __e.<fieldName>."""
-    prometheus_auth: NotRequired[OutputGrafanaCloudPrometheusAuth2TypedDict]
-    loki_auth: NotRequired[OutputGrafanaCloudLokiAuth2TypedDict]
+    prometheus_auth: NotRequired[OutputGrafanaCloudPrometheusAuthTypedDict]
+    loki_auth: NotRequired[OutputGrafanaCloudLokiAuthTypedDict]
     concurrency: NotRequired[float]
     r"""Maximum number of ongoing requests before blocking. Warning: Setting this value > 1 can cause Loki and Prometheus to complain about entries being delivered out of order."""
     max_payload_size_kb: NotRequired[float]
@@ -274,28 +274,24 @@ class OutputGrafanaCloudGrafanaCloud2TypedDict(TypedDict):
     r"""Amount of time, in seconds, to wait for a request to complete before canceling it"""
     flush_period_sec: NotRequired[float]
     r"""Maximum time between requests. Small values could cause the payload size to be smaller than the configured Maximum time between requests. Small values can reduce the payload size below the configured 'Max record size' and 'Max events per request'. Warning: Setting this too low can increase the number of ongoing requests (depending on the value of 'Request concurrency'); this can cause Loki and Prometheus to complain about entries being delivered out of order."""
-    extra_http_headers: NotRequired[List[OutputGrafanaCloudExtraHTTPHeader2TypedDict]]
+    extra_http_headers: NotRequired[List[OutputGrafanaCloudExtraHTTPHeaderTypedDict]]
     r"""Headers to add to all events"""
     use_round_robin_dns: NotRequired[bool]
     r"""Enable round-robin DNS lookup. When a DNS server returns multiple addresses, @{product} will cycle through them in the order returned. For optimal performance, consider enabling this setting for non-load balanced destinations."""
-    failed_request_logging_mode: NotRequired[
-        OutputGrafanaCloudFailedRequestLoggingMode2
-    ]
+    failed_request_logging_mode: NotRequired[OutputGrafanaCloudFailedRequestLoggingMode]
     r"""Data to log when a request fails. All headers are redacted by default, unless listed as safe headers below."""
     safe_headers: NotRequired[List[str]]
     r"""List of headers that are safe to log in plain text"""
     send_structured_metadata: NotRequired[bool]
     r"""Add structured metadata fields from __structuredMetadata to each log. Key-value pairs must be strings."""
     response_retry_settings: NotRequired[
-        List[OutputGrafanaCloudResponseRetrySetting2TypedDict]
+        List[OutputGrafanaCloudResponseRetrySettingTypedDict]
     ]
     r"""Automatically retry after unsuccessful response status codes, such as 429 (Too Many Requests) or 503 (Service Unavailable)"""
-    timeout_retry_settings: NotRequired[
-        OutputGrafanaCloudTimeoutRetrySettings2TypedDict
-    ]
+    timeout_retry_settings: NotRequired[OutputGrafanaCloudTimeoutRetrySettingsTypedDict]
     response_honor_retry_after_header: NotRequired[bool]
     r"""Honor any Retry-After header that specifies a delay (in seconds) no longer than 180 seconds after the retry request. @{product} limits the delay to 180 seconds, even if the Retry-After header specifies a longer delay. When enabled, takes precedence over user-configured retry options. When disabled, all Retry-After headers are ignored."""
-    on_backpressure: NotRequired[OutputGrafanaCloudBackpressureBehavior2]
+    on_backpressure: NotRequired[OutputGrafanaCloudBackpressureBehavior]
     r"""How to handle events when all receivers are exerting backpressure"""
     description: NotRequired[str]
     compress: NotRequired[bool]
@@ -306,20 +302,17 @@ class OutputGrafanaCloudGrafanaCloud2TypedDict(TypedDict):
     r"""The maximum disk space that the queue can consume (as an average per Worker Process) before queueing stops. Enter a numeral with units of KB, MB, etc."""
     pq_path: NotRequired[str]
     r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/<output-id>."""
-    pq_compress: NotRequired[OutputGrafanaCloudCompression2]
+    pq_compress: NotRequired[OutputGrafanaCloudCompression]
     r"""Codec to use to compress the persisted data"""
-    pq_on_backpressure: NotRequired[OutputGrafanaCloudQueueFullBehavior2]
+    pq_on_backpressure: NotRequired[OutputGrafanaCloudQueueFullBehavior]
     r"""How to handle events when the queue is exerting backpressure (full capacity or low disk). 'Block' is the same behavior as non-PQ blocking. 'Drop new data' throws away incoming data, while leaving the contents of the PQ unchanged."""
-    pq_mode: NotRequired[OutputGrafanaCloudMode2]
+    pq_mode: NotRequired[OutputGrafanaCloudMode]
     r"""In Error mode, PQ writes events to the filesystem if the Destination is unavailable. In Backpressure mode, PQ writes events to the filesystem when it detects backpressure from the Destination. In Always On mode, PQ always writes events to the filesystem."""
-    pq_controls: NotRequired[OutputGrafanaCloudPqControls2TypedDict]
-
+    pq_controls: NotRequired[OutputGrafanaCloudPqControlsTypedDict]
 
-class OutputGrafanaCloudGrafanaCloud2(BaseModel):
-    type: OutputGrafanaCloudType2
 
-    prometheus_url: Annotated[str, pydantic.Field(alias="prometheusUrl")]
-    r"""The remote_write endpoint to send Prometheus metrics to, such as https://prometheus-blocks-prod-us-central1.grafana.net/api/prom/push"""
+class OutputGrafanaCloud(BaseModel):
+    type: OutputGrafanaCloudType
 
     id: Optional[str] = None
     r"""Unique ID for this output"""
@@ -341,479 +334,6 @@ class OutputGrafanaCloudGrafanaCloud2(BaseModel):
     loki_url: Annotated[Optional[str], pydantic.Field(alias="lokiUrl")] = None
     r"""The endpoint to send logs to, such as https://logs-prod-us-central1.grafana.net"""
 
-    message: Optional[str] = None
-    r"""Name of the event field that contains the message to send. If not specified, Stream sends a JSON representation of the whole event."""
-
-    message_format: Annotated[
-        Optional[OutputGrafanaCloudMessageFormat2],
-        pydantic.Field(alias="messageFormat"),
-    ] = OutputGrafanaCloudMessageFormat2.PROTOBUF
-    r"""Format to use when sending logs to Loki (Protobuf or JSON)"""
-
-    labels: Optional[List[OutputGrafanaCloudLabel2]] = None
-    r"""List of labels to send with logs. Labels define Loki streams, so use static labels to avoid proliferating label value combinations and streams. Can be merged and/or overridden by the event's __labels field. Example: '__labels: {host: \"cribl.io\", level: \"error\"}'"""
-
-    metric_rename_expr: Annotated[
-        Optional[str], pydantic.Field(alias="metricRenameExpr")
-    ] = "name.replace(/[^a-zA-Z0-9_]/g, '_')"
-    r"""JavaScript expression that can be used to rename metrics. For example, name.replace(/\./g, '_') will replace all '.' characters in a metric's name with the supported '_' character. Use the 'name' global variable to access the metric's name. You can access event fields' values via __e.<fieldName>."""
-
-    prometheus_auth: Annotated[
-        Optional[OutputGrafanaCloudPrometheusAuth2],
-        pydantic.Field(alias="prometheusAuth"),
-    ] = None
-
-    loki_auth: Annotated[
-        Optional[OutputGrafanaCloudLokiAuth2], pydantic.Field(alias="lokiAuth")
-    ] = None
-
-    concurrency: Optional[float] = 1
-    r"""Maximum number of ongoing requests before blocking. Warning: Setting this value > 1 can cause Loki and Prometheus to complain about entries being delivered out of order."""
-
-    max_payload_size_kb: Annotated[
-        Optional[float], pydantic.Field(alias="maxPayloadSizeKB")
-    ] = 4096
-    r"""Maximum size, in KB, of the request body. Warning: Setting this too low can increase the number of ongoing requests (depending on the value of 'Request concurrency'); this can cause Loki and Prometheus to complain about entries being delivered out of order."""
-
-    max_payload_events: Annotated[
-        Optional[float], pydantic.Field(alias="maxPayloadEvents")
-    ] = 0
-    r"""Maximum number of events to include in the request body. Default is 0 (unlimited). Warning: Setting this too low can increase the number of ongoing requests (depending on the value of 'Request concurrency'); this can cause Loki and Prometheus to complain about entries being delivered out of order."""
-
-    reject_unauthorized: Annotated[
-        Optional[bool], pydantic.Field(alias="rejectUnauthorized")
-    ] = True
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's).
-    Enabled by default. When this setting is also present in TLS Settings (Client Side),
-    that value will take precedence.
-    """
-
-    timeout_sec: Annotated[Optional[float], pydantic.Field(alias="timeoutSec")] = 30
-    r"""Amount of time, in seconds, to wait for a request to complete before canceling it"""
-
-    flush_period_sec: Annotated[
-        Optional[float], pydantic.Field(alias="flushPeriodSec")
-    ] = 15
-    r"""Maximum time between requests. Small values could cause the payload size to be smaller than the configured Maximum time between requests. Small values can reduce the payload size below the configured 'Max record size' and 'Max events per request'. Warning: Setting this too low can increase the number of ongoing requests (depending on the value of 'Request concurrency'); this can cause Loki and Prometheus to complain about entries being delivered out of order."""
-
-    extra_http_headers: Annotated[
-        Optional[List[OutputGrafanaCloudExtraHTTPHeader2]],
-        pydantic.Field(alias="extraHttpHeaders"),
-    ] = None
-    r"""Headers to add to all events"""
-
-    use_round_robin_dns: Annotated[
-        Optional[bool], pydantic.Field(alias="useRoundRobinDns")
-    ] = False
-    r"""Enable round-robin DNS lookup. When a DNS server returns multiple addresses, @{product} will cycle through them in the order returned. For optimal performance, consider enabling this setting for non-load balanced destinations."""
-
-    failed_request_logging_mode: Annotated[
-        Optional[OutputGrafanaCloudFailedRequestLoggingMode2],
-        pydantic.Field(alias="failedRequestLoggingMode"),
-    ] = OutputGrafanaCloudFailedRequestLoggingMode2.NONE
-    r"""Data to log when a request fails. All headers are redacted by default, unless listed as safe headers below."""
-
-    safe_headers: Annotated[
-        Optional[List[str]], pydantic.Field(alias="safeHeaders")
-    ] = None
-    r"""List of headers that are safe to log in plain text"""
-
-    send_structured_metadata: Annotated[
-        Optional[bool], pydantic.Field(alias="sendStructuredMetadata")
-    ] = False
-    r"""Add structured metadata fields from __structuredMetadata to each log. Key-value pairs must be strings."""
-
-    response_retry_settings: Annotated[
-        Optional[List[OutputGrafanaCloudResponseRetrySetting2]],
-        pydantic.Field(alias="responseRetrySettings"),
-    ] = None
-    r"""Automatically retry after unsuccessful response status codes, such as 429 (Too Many Requests) or 503 (Service Unavailable)"""
-
-    timeout_retry_settings: Annotated[
-        Optional[OutputGrafanaCloudTimeoutRetrySettings2],
-        pydantic.Field(alias="timeoutRetrySettings"),
-    ] = None
-
-    response_honor_retry_after_header: Annotated[
-        Optional[bool], pydantic.Field(alias="responseHonorRetryAfterHeader")
-    ] = False
-    r"""Honor any Retry-After header that specifies a delay (in seconds) no longer than 180 seconds after the retry request. @{product} limits the delay to 180 seconds, even if the Retry-After header specifies a longer delay. When enabled, takes precedence over user-configured retry options. When disabled, all Retry-After headers are ignored."""
-
-    on_backpressure: Annotated[
-        Optional[OutputGrafanaCloudBackpressureBehavior2],
-        pydantic.Field(alias="onBackpressure"),
-    ] = OutputGrafanaCloudBackpressureBehavior2.BLOCK
-    r"""How to handle events when all receivers are exerting backpressure"""
-
-    description: Optional[str] = None
-
-    compress: Optional[bool] = True
-    r"""Compress the payload body before sending. Applies only to JSON payloads; the Protobuf variant for both Prometheus and Loki are snappy-compressed by default."""
-
-    pq_max_file_size: Annotated[
-        Optional[str], pydantic.Field(alias="pqMaxFileSize")
-    ] = "1 MB"
-    r"""The maximum size to store in each queue file before closing and optionally compressing (KB, MB, etc.)"""
-
-    pq_max_size: Annotated[Optional[str], pydantic.Field(alias="pqMaxSize")] = "5GB"
-    r"""The maximum disk space that the queue can consume (as an average per Worker Process) before queueing stops. Enter a numeral with units of KB, MB, etc."""
-
-    pq_path: Annotated[Optional[str], pydantic.Field(alias="pqPath")] = (
-        "$CRIBL_HOME/state/queues"
-    )
-    r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/<output-id>."""
-
-    pq_compress: Annotated[
-        Optional[OutputGrafanaCloudCompression2], pydantic.Field(alias="pqCompress")
-    ] = OutputGrafanaCloudCompression2.NONE
-    r"""Codec to use to compress the persisted data"""
-
-    pq_on_backpressure: Annotated[
-        Optional[OutputGrafanaCloudQueueFullBehavior2],
-        pydantic.Field(alias="pqOnBackpressure"),
-    ] = OutputGrafanaCloudQueueFullBehavior2.BLOCK
-    r"""How to handle events when the queue is exerting backpressure (full capacity or low disk). 'Block' is the same behavior as non-PQ blocking. 'Drop new data' throws away incoming data, while leaving the contents of the PQ unchanged."""
-
-    pq_mode: Annotated[
-        Optional[OutputGrafanaCloudMode2], pydantic.Field(alias="pqMode")
-    ] = OutputGrafanaCloudMode2.ERROR
-    r"""In Error mode, PQ writes events to the filesystem if the Destination is unavailable. In Backpressure mode, PQ writes events to the filesystem when it detects backpressure from the Destination. In Always On mode, PQ always writes events to the filesystem."""
-
-    pq_controls: Annotated[
-        Optional[OutputGrafanaCloudPqControls2], pydantic.Field(alias="pqControls")
-    ] = None
-
-
-class OutputGrafanaCloudType1(str, Enum):
-    GRAFANA_CLOUD = "grafana_cloud"
-
-
-class OutputGrafanaCloudMessageFormat1(str, Enum):
-    r"""Format to use when sending logs to Loki (Protobuf or JSON)"""
-
-    PROTOBUF = "protobuf"
-    JSON = "json"
-
-
-class OutputGrafanaCloudLabel1TypedDict(TypedDict):
-    value: str
-    name: NotRequired[str]
-
-
-class OutputGrafanaCloudLabel1(BaseModel):
-    value: str
-
-    name: Optional[str] = ""
-
-
-class OutputGrafanaCloudPrometheusAuthAuthenticationType1(str, Enum):
-    NONE = "none"
-    TOKEN = "token"
-    TEXT_SECRET = "textSecret"
-    BASIC = "basic"
-    CREDENTIALS_SECRET = "credentialsSecret"
-
-
-class OutputGrafanaCloudPrometheusAuth1TypedDict(TypedDict):
-    auth_type: NotRequired[OutputGrafanaCloudPrometheusAuthAuthenticationType1]
-    token: NotRequired[str]
-    r"""Bearer token to include in the authorization header. In Grafana Cloud, this is generally built by concatenating the username and the API key, separated by a colon. Example: <your-username>:<your-api-key>"""
-    text_secret: NotRequired[str]
-    r"""Select or create a stored text secret"""
-    username: NotRequired[str]
-    r"""Username for authentication"""
-    password: NotRequired[str]
-    r"""Password (API key in Grafana Cloud domain) for authentication"""
-    credentials_secret: NotRequired[str]
-    r"""Select or create a secret that references your credentials"""
-
-
-class OutputGrafanaCloudPrometheusAuth1(BaseModel):
-    auth_type: Annotated[
-        Optional[OutputGrafanaCloudPrometheusAuthAuthenticationType1],
-        pydantic.Field(alias="authType"),
-    ] = OutputGrafanaCloudPrometheusAuthAuthenticationType1.BASIC
-
-    token: Optional[str] = None
-    r"""Bearer token to include in the authorization header. In Grafana Cloud, this is generally built by concatenating the username and the API key, separated by a colon. Example: <your-username>:<your-api-key>"""
-
-    text_secret: Annotated[Optional[str], pydantic.Field(alias="textSecret")] = None
-    r"""Select or create a stored text secret"""
-
-    username: Optional[str] = None
-    r"""Username for authentication"""
-
-    password: Optional[str] = None
-    r"""Password (API key in Grafana Cloud domain) for authentication"""
-
-    credentials_secret: Annotated[
-        Optional[str], pydantic.Field(alias="credentialsSecret")
-    ] = None
-    r"""Select or create a secret that references your credentials"""
-
-
-class OutputGrafanaCloudLokiAuthAuthenticationType1(str, Enum):
-    NONE = "none"
-    TOKEN = "token"
-    TEXT_SECRET = "textSecret"
-    BASIC = "basic"
-    CREDENTIALS_SECRET = "credentialsSecret"
-
-
-class OutputGrafanaCloudLokiAuth1TypedDict(TypedDict):
-    auth_type: NotRequired[OutputGrafanaCloudLokiAuthAuthenticationType1]
-    token: NotRequired[str]
-    r"""Bearer token to include in the authorization header. In Grafana Cloud, this is generally built by concatenating the username and the API key, separated by a colon. Example: <your-username>:<your-api-key>"""
-    text_secret: NotRequired[str]
-    r"""Select or create a stored text secret"""
-    username: NotRequired[str]
-    r"""Username for authentication"""
-    password: NotRequired[str]
-    r"""Password (API key in Grafana Cloud domain) for authentication"""
-    credentials_secret: NotRequired[str]
-    r"""Select or create a secret that references your credentials"""
-
-
-class OutputGrafanaCloudLokiAuth1(BaseModel):
-    auth_type: Annotated[
-        Optional[OutputGrafanaCloudLokiAuthAuthenticationType1],
-        pydantic.Field(alias="authType"),
-    ] = OutputGrafanaCloudLokiAuthAuthenticationType1.BASIC
-
-    token: Optional[str] = None
-    r"""Bearer token to include in the authorization header. In Grafana Cloud, this is generally built by concatenating the username and the API key, separated by a colon. Example: <your-username>:<your-api-key>"""
-
-    text_secret: Annotated[Optional[str], pydantic.Field(alias="textSecret")] = None
-    r"""Select or create a stored text secret"""
-
-    username: Optional[str] = None
-    r"""Username for authentication"""
-
-    password: Optional[str] = None
-    r"""Password (API key in Grafana Cloud domain) for authentication"""
-
-    credentials_secret: Annotated[
-        Optional[str], pydantic.Field(alias="credentialsSecret")
-    ] = None
-    r"""Select or create a secret that references your credentials"""
-
-
-class OutputGrafanaCloudExtraHTTPHeader1TypedDict(TypedDict):
-    value: str
-    name: NotRequired[str]
-
-
-class OutputGrafanaCloudExtraHTTPHeader1(BaseModel):
-    value: str
-
-    name: Optional[str] = None
-
-
-class OutputGrafanaCloudFailedRequestLoggingMode1(str, Enum):
-    r"""Data to log when a request fails. All headers are redacted by default, unless listed as safe headers below."""
-
-    PAYLOAD = "payload"
-    PAYLOAD_AND_HEADERS = "payloadAndHeaders"
-    NONE = "none"
-
-
-class OutputGrafanaCloudResponseRetrySetting1TypedDict(TypedDict):
-    http_status: float
-    r"""The HTTP response status code that will trigger retries"""
-    initial_backoff: NotRequired[float]
-    r"""How long, in milliseconds, Cribl Stream should wait before initiating backoff. Maximum interval is 600,000 ms (10 minutes)."""
-    backoff_rate: NotRequired[float]
-    r"""Base for exponential backoff. A value of 2 (default) means Cribl Stream will retry after 2 seconds, then 4 seconds, then 8 seconds, etc."""
-    max_backoff: NotRequired[float]
-    r"""The maximum backoff interval, in milliseconds, Cribl Stream should apply. Default (and minimum) is 10,000 ms (10 seconds); maximum is 180,000 ms (180 seconds)."""
-
-
-class OutputGrafanaCloudResponseRetrySetting1(BaseModel):
-    http_status: Annotated[float, pydantic.Field(alias="httpStatus")]
-    r"""The HTTP response status code that will trigger retries"""
-
-    initial_backoff: Annotated[
-        Optional[float], pydantic.Field(alias="initialBackoff")
-    ] = 1000
-    r"""How long, in milliseconds, Cribl Stream should wait before initiating backoff. Maximum interval is 600,000 ms (10 minutes)."""
-
-    backoff_rate: Annotated[Optional[float], pydantic.Field(alias="backoffRate")] = 2
-    r"""Base for exponential backoff. A value of 2 (default) means Cribl Stream will retry after 2 seconds, then 4 seconds, then 8 seconds, etc."""
-
-    max_backoff: Annotated[Optional[float], pydantic.Field(alias="maxBackoff")] = 10000
-    r"""The maximum backoff interval, in milliseconds, Cribl Stream should apply. Default (and minimum) is 10,000 ms (10 seconds); maximum is 180,000 ms (180 seconds)."""
-
-
-class OutputGrafanaCloudTimeoutRetrySettings1TypedDict(TypedDict):
-    timeout_retry: NotRequired[bool]
-    initial_backoff: NotRequired[float]
-    r"""How long, in milliseconds, Cribl Stream should wait before initiating backoff. Maximum interval is 600,000 ms (10 minutes)."""
-    backoff_rate: NotRequired[float]
-    r"""Base for exponential backoff. A value of 2 (default) means Cribl Stream will retry after 2 seconds, then 4 seconds, then 8 seconds, etc."""
-    max_backoff: NotRequired[float]
-    r"""The maximum backoff interval, in milliseconds, Cribl Stream should apply. Default (and minimum) is 10,000 ms (10 seconds); maximum is 180,000 ms (180 seconds)."""
-
-
-class OutputGrafanaCloudTimeoutRetrySettings1(BaseModel):
-    timeout_retry: Annotated[Optional[bool], pydantic.Field(alias="timeoutRetry")] = (
-        False
-    )
-
-    initial_backoff: Annotated[
-        Optional[float], pydantic.Field(alias="initialBackoff")
-    ] = 1000
-    r"""How long, in milliseconds, Cribl Stream should wait before initiating backoff. Maximum interval is 600,000 ms (10 minutes)."""
-
-    backoff_rate: Annotated[Optional[float], pydantic.Field(alias="backoffRate")] = 2
-    r"""Base for exponential backoff. A value of 2 (default) means Cribl Stream will retry after 2 seconds, then 4 seconds, then 8 seconds, etc."""
-
-    max_backoff: Annotated[Optional[float], pydantic.Field(alias="maxBackoff")] = 10000
-    r"""The maximum backoff interval, in milliseconds, Cribl Stream should apply. Default (and minimum) is 10,000 ms (10 seconds); maximum is 180,000 ms (180 seconds)."""
-
-
-class OutputGrafanaCloudBackpressureBehavior1(str, Enum):
-    r"""How to handle events when all receivers are exerting backpressure"""
-
-    BLOCK = "block"
-    DROP = "drop"
-    QUEUE = "queue"
-
-
-class OutputGrafanaCloudCompression1(str, Enum):
-    r"""Codec to use to compress the persisted data"""
-
-    NONE = "none"
-    GZIP = "gzip"
-
-
-class OutputGrafanaCloudQueueFullBehavior1(str, Enum):
-    r"""How to handle events when the queue is exerting backpressure (full capacity or low disk). 'Block' is the same behavior as non-PQ blocking. 'Drop new data' throws away incoming data, while leaving the contents of the PQ unchanged."""
-
-    BLOCK = "block"
-    DROP = "drop"
-
-
-class OutputGrafanaCloudMode1(str, Enum):
-    r"""In Error mode, PQ writes events to the filesystem if the Destination is unavailable. In Backpressure mode, PQ writes events to the filesystem when it detects backpressure from the Destination. In Always On mode, PQ always writes events to the filesystem."""
-
-    ERROR = "error"
-    BACKPRESSURE = "backpressure"
-    ALWAYS = "always"
-
-
-class OutputGrafanaCloudPqControls1TypedDict(TypedDict):
-    pass
-
-
-class OutputGrafanaCloudPqControls1(BaseModel):
-    pass
-
-
-class OutputGrafanaCloudGrafanaCloud1TypedDict(TypedDict):
-    type: OutputGrafanaCloudType1
-    loki_url: str
-    r"""The endpoint to send logs to, such as https://logs-prod-us-central1.grafana.net"""
-    id: NotRequired[str]
-    r"""Unique ID for this output"""
-    pipeline: NotRequired[str]
-    r"""Pipeline to process data before sending out to this output"""
-    system_fields: NotRequired[List[str]]
-    r"""Fields to automatically add to events, such as cribl_pipe. Supports wildcards. These fields are added as dimensions and labels to generated metrics and logs, respectively."""
-    environment: NotRequired[str]
-    r"""Optionally, enable this config only on a specified Git branch. If empty, will be enabled everywhere."""
-    streamtags: NotRequired[List[str]]
-    r"""Tags for filtering and grouping in @{product}"""
-    prometheus_url: NotRequired[str]
-    r"""The remote_write endpoint to send Prometheus metrics to, such as https://prometheus-blocks-prod-us-central1.grafana.net/api/prom/push"""
-    message: NotRequired[str]
-    r"""Name of the event field that contains the message to send. If not specified, Stream sends a JSON representation of the whole event."""
-    message_format: NotRequired[OutputGrafanaCloudMessageFormat1]
-    r"""Format to use when sending logs to Loki (Protobuf or JSON)"""
-    labels: NotRequired[List[OutputGrafanaCloudLabel1TypedDict]]
-    r"""List of labels to send with logs. Labels define Loki streams, so use static labels to avoid proliferating label value combinations and streams. Can be merged and/or overridden by the event's __labels field. Example: '__labels: {host: \"cribl.io\", level: \"error\"}'"""
-    metric_rename_expr: NotRequired[str]
-    r"""JavaScript expression that can be used to rename metrics. For example, name.replace(/\./g, '_') will replace all '.' characters in a metric's name with the supported '_' character. Use the 'name' global variable to access the metric's name. You can access event fields' values via __e.<fieldName>."""
-    prometheus_auth: NotRequired[OutputGrafanaCloudPrometheusAuth1TypedDict]
-    loki_auth: NotRequired[OutputGrafanaCloudLokiAuth1TypedDict]
-    concurrency: NotRequired[float]
-    r"""Maximum number of ongoing requests before blocking. Warning: Setting this value > 1 can cause Loki and Prometheus to complain about entries being delivered out of order."""
-    max_payload_size_kb: NotRequired[float]
-    r"""Maximum size, in KB, of the request body. Warning: Setting this too low can increase the number of ongoing requests (depending on the value of 'Request concurrency'); this can cause Loki and Prometheus to complain about entries being delivered out of order."""
-    max_payload_events: NotRequired[float]
-    r"""Maximum number of events to include in the request body. Default is 0 (unlimited). Warning: Setting this too low can increase the number of ongoing requests (depending on the value of 'Request concurrency'); this can cause Loki and Prometheus to complain about entries being delivered out of order."""
-    reject_unauthorized: NotRequired[bool]
-    r"""Reject certificates not authorized by a CA in the CA certificate path or by another trusted CA (such as the system's).
-    Enabled by default. When this setting is also present in TLS Settings (Client Side),
-    that value will take precedence.
-    """
-    timeout_sec: NotRequired[float]
-    r"""Amount of time, in seconds, to wait for a request to complete before canceling it"""
-    flush_period_sec: NotRequired[float]
-    r"""Maximum time between requests. Small values could cause the payload size to be smaller than the configured Maximum time between requests. Small values can reduce the payload size below the configured 'Max record size' and 'Max events per request'. Warning: Setting this too low can increase the number of ongoing requests (depending on the value of 'Request concurrency'); this can cause Loki and Prometheus to complain about entries being delivered out of order."""
-    extra_http_headers: NotRequired[List[OutputGrafanaCloudExtraHTTPHeader1TypedDict]]
-    r"""Headers to add to all events"""
-    use_round_robin_dns: NotRequired[bool]
-    r"""Enable round-robin DNS lookup. When a DNS server returns multiple addresses, @{product} will cycle through them in the order returned. For optimal performance, consider enabling this setting for non-load balanced destinations."""
-    failed_request_logging_mode: NotRequired[
-        OutputGrafanaCloudFailedRequestLoggingMode1
-    ]
-    r"""Data to log when a request fails. All headers are redacted by default, unless listed as safe headers below."""
-    safe_headers: NotRequired[List[str]]
-    r"""List of headers that are safe to log in plain text"""
-    send_structured_metadata: NotRequired[bool]
-    r"""Add structured metadata fields from __structuredMetadata to each log. Key-value pairs must be strings."""
-    response_retry_settings: NotRequired[
-        List[OutputGrafanaCloudResponseRetrySetting1TypedDict]
-    ]
-    r"""Automatically retry after unsuccessful response status codes, such as 429 (Too Many Requests) or 503 (Service Unavailable)"""
-    timeout_retry_settings: NotRequired[
-        OutputGrafanaCloudTimeoutRetrySettings1TypedDict
-    ]
-    response_honor_retry_after_header: NotRequired[bool]
-    r"""Honor any Retry-After header that specifies a delay (in seconds) no longer than 180 seconds after the retry request. @{product} limits the delay to 180 seconds, even if the Retry-After header specifies a longer delay. When enabled, takes precedence over user-configured retry options. When disabled, all Retry-After headers are ignored."""
-    on_backpressure: NotRequired[OutputGrafanaCloudBackpressureBehavior1]
-    r"""How to handle events when all receivers are exerting backpressure"""
-    description: NotRequired[str]
-    compress: NotRequired[bool]
-    r"""Compress the payload body before sending. Applies only to JSON payloads; the Protobuf variant for both Prometheus and Loki are snappy-compressed by default."""
-    pq_max_file_size: NotRequired[str]
-    r"""The maximum size to store in each queue file before closing and optionally compressing (KB, MB, etc.)"""
-    pq_max_size: NotRequired[str]
-    r"""The maximum disk space that the queue can consume (as an average per Worker Process) before queueing stops. Enter a numeral with units of KB, MB, etc."""
-    pq_path: NotRequired[str]
-    r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/<output-id>."""
-    pq_compress: NotRequired[OutputGrafanaCloudCompression1]
-    r"""Codec to use to compress the persisted data"""
-    pq_on_backpressure: NotRequired[OutputGrafanaCloudQueueFullBehavior1]
-    r"""How to handle events when the queue is exerting backpressure (full capacity or low disk). 'Block' is the same behavior as non-PQ blocking. 'Drop new data' throws away incoming data, while leaving the contents of the PQ unchanged."""
-    pq_mode: NotRequired[OutputGrafanaCloudMode1]
-    r"""In Error mode, PQ writes events to the filesystem if the Destination is unavailable. In Backpressure mode, PQ writes events to the filesystem when it detects backpressure from the Destination. In Always On mode, PQ always writes events to the filesystem."""
-    pq_controls: NotRequired[OutputGrafanaCloudPqControls1TypedDict]
-
-
-class OutputGrafanaCloudGrafanaCloud1(BaseModel):
-    type: OutputGrafanaCloudType1
-
-    loki_url: Annotated[str, pydantic.Field(alias="lokiUrl")]
-    r"""The endpoint to send logs to, such as https://logs-prod-us-central1.grafana.net"""
-
-    id: Optional[str] = None
-    r"""Unique ID for this output"""
-
-    pipeline: Optional[str] = None
-    r"""Pipeline to process data before sending out to this output"""
-
-    system_fields: Annotated[
-        Optional[List[str]], pydantic.Field(alias="systemFields")
-    ] = None
-    r"""Fields to automatically add to events, such as cribl_pipe. Supports wildcards. These fields are added as dimensions and labels to generated metrics and logs, respectively."""
-
-    environment: Optional[str] = None
-    r"""Optionally, enable this config only on a specified Git branch. If empty, will be enabled everywhere."""
-
-    streamtags: Optional[List[str]] = None
-    r"""Tags for filtering and grouping in @{product}"""
-
     prometheus_url: Annotated[Optional[str], pydantic.Field(alias="prometheusUrl")] = (
         None
     )
@@ -823,12 +343,11 @@ class OutputGrafanaCloudGrafanaCloud1(BaseModel):
     r"""Name of the event field that contains the message to send. If not specified, Stream sends a JSON representation of the whole event."""
 
     message_format: Annotated[
-        Optional[OutputGrafanaCloudMessageFormat1],
-        pydantic.Field(alias="messageFormat"),
-    ] = OutputGrafanaCloudMessageFormat1.PROTOBUF
+        Optional[OutputGrafanaCloudMessageFormat], pydantic.Field(alias="messageFormat")
+    ] = OutputGrafanaCloudMessageFormat.PROTOBUF
     r"""Format to use when sending logs to Loki (Protobuf or JSON)"""
 
-    labels: Optional[List[OutputGrafanaCloudLabel1]] = None
+    labels: Optional[List[OutputGrafanaCloudLabel]] = None
     r"""List of labels to send with logs. Labels define Loki streams, so use static labels to avoid proliferating label value combinations and streams. Can be merged and/or overridden by the event's __labels field. Example: '__labels: {host: \"cribl.io\", level: \"error\"}'"""
 
     metric_rename_expr: Annotated[
@@ -837,12 +356,12 @@ class OutputGrafanaCloudGrafanaCloud1(BaseModel):
     r"""JavaScript expression that can be used to rename metrics. For example, name.replace(/\./g, '_') will replace all '.' characters in a metric's name with the supported '_' character. Use the 'name' global variable to access the metric's name. You can access event fields' values via __e.<fieldName>."""
 
     prometheus_auth: Annotated[
-        Optional[OutputGrafanaCloudPrometheusAuth1],
+        Optional[OutputGrafanaCloudPrometheusAuth],
         pydantic.Field(alias="prometheusAuth"),
     ] = None
 
     loki_auth: Annotated[
-        Optional[OutputGrafanaCloudLokiAuth1], pydantic.Field(alias="lokiAuth")
+        Optional[OutputGrafanaCloudLokiAuth], pydantic.Field(alias="lokiAuth")
     ] = None
 
     concurrency: Optional[float] = 1
@@ -875,7 +394,7 @@ class OutputGrafanaCloudGrafanaCloud1(BaseModel):
     r"""Maximum time between requests. Small values could cause the payload size to be smaller than the configured Maximum time between requests. Small values can reduce the payload size below the configured 'Max record size' and 'Max events per request'. Warning: Setting this too low can increase the number of ongoing requests (depending on the value of 'Request concurrency'); this can cause Loki and Prometheus to complain about entries being delivered out of order."""
 
     extra_http_headers: Annotated[
-        Optional[List[OutputGrafanaCloudExtraHTTPHeader1]],
+        Optional[List[OutputGrafanaCloudExtraHTTPHeader]],
         pydantic.Field(alias="extraHttpHeaders"),
     ] = None
     r"""Headers to add to all events"""
@@ -886,9 +405,9 @@ class OutputGrafanaCloudGrafanaCloud1(BaseModel):
     r"""Enable round-robin DNS lookup. When a DNS server returns multiple addresses, @{product} will cycle through them in the order returned. For optimal performance, consider enabling this setting for non-load balanced destinations."""
 
     failed_request_logging_mode: Annotated[
-        Optional[OutputGrafanaCloudFailedRequestLoggingMode1],
+        Optional[OutputGrafanaCloudFailedRequestLoggingMode],
         pydantic.Field(alias="failedRequestLoggingMode"),
-    ] = OutputGrafanaCloudFailedRequestLoggingMode1.NONE
+    ] = OutputGrafanaCloudFailedRequestLoggingMode.NONE
     r"""Data to log when a request fails. All headers are redacted by default, unless listed as safe headers below."""
 
     safe_headers: Annotated[
@@ -902,13 +421,13 @@ class OutputGrafanaCloudGrafanaCloud1(BaseModel):
     r"""Add structured metadata fields from __structuredMetadata to each log. Key-value pairs must be strings."""
 
     response_retry_settings: Annotated[
-        Optional[List[OutputGrafanaCloudResponseRetrySetting1]],
+        Optional[List[OutputGrafanaCloudResponseRetrySetting]],
         pydantic.Field(alias="responseRetrySettings"),
     ] = None
     r"""Automatically retry after unsuccessful response status codes, such as 429 (Too Many Requests) or 503 (Service Unavailable)"""
 
     timeout_retry_settings: Annotated[
-        Optional[OutputGrafanaCloudTimeoutRetrySettings1],
+        Optional[OutputGrafanaCloudTimeoutRetrySettings],
         pydantic.Field(alias="timeoutRetrySettings"),
     ] = None
 
@@ -918,9 +437,9 @@ class OutputGrafanaCloudGrafanaCloud1(BaseModel):
     r"""Honor any Retry-After header that specifies a delay (in seconds) no longer than 180 seconds after the retry request. @{product} limits the delay to 180 seconds, even if the Retry-After header specifies a longer delay. When enabled, takes precedence over user-configured retry options. When disabled, all Retry-After headers are ignored."""
 
     on_backpressure: Annotated[
-        Optional[OutputGrafanaCloudBackpressureBehavior1],
+        Optional[OutputGrafanaCloudBackpressureBehavior],
         pydantic.Field(alias="onBackpressure"),
-    ] = OutputGrafanaCloudBackpressureBehavior1.BLOCK
+    ] = OutputGrafanaCloudBackpressureBehavior.BLOCK
     r"""How to handle events when all receivers are exerting backpressure"""
 
     description: Optional[str] = None
@@ -942,36 +461,21 @@ class OutputGrafanaCloudGrafanaCloud1(BaseModel):
     r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/<output-id>."""
 
     pq_compress: Annotated[
-        Optional[OutputGrafanaCloudCompression1], pydantic.Field(alias="pqCompress")
-    ] = OutputGrafanaCloudCompression1.NONE
+        Optional[OutputGrafanaCloudCompression], pydantic.Field(alias="pqCompress")
+    ] = OutputGrafanaCloudCompression.NONE
     r"""Codec to use to compress the persisted data"""
 
     pq_on_backpressure: Annotated[
-        Optional[OutputGrafanaCloudQueueFullBehavior1],
+        Optional[OutputGrafanaCloudQueueFullBehavior],
         pydantic.Field(alias="pqOnBackpressure"),
-    ] = OutputGrafanaCloudQueueFullBehavior1.BLOCK
+    ] = OutputGrafanaCloudQueueFullBehavior.BLOCK
     r"""How to handle events when the queue is exerting backpressure (full capacity or low disk). 'Block' is the same behavior as non-PQ blocking. 'Drop new data' throws away incoming data, while leaving the contents of the PQ unchanged."""
 
     pq_mode: Annotated[
-        Optional[OutputGrafanaCloudMode1], pydantic.Field(alias="pqMode")
-    ] = OutputGrafanaCloudMode1.ERROR
+        Optional[OutputGrafanaCloudMode], pydantic.Field(alias="pqMode")
+    ] = OutputGrafanaCloudMode.ERROR
     r"""In Error mode, PQ writes events to the filesystem if the Destination is unavailable. In Backpressure mode, PQ writes events to the filesystem when it detects backpressure from the Destination. In Always On mode, PQ always writes events to the filesystem."""
 
     pq_controls: Annotated[
-        Optional[OutputGrafanaCloudPqControls1], pydantic.Field(alias="pqControls")
+        Optional[OutputGrafanaCloudPqControls], pydantic.Field(alias="pqControls")
     ] = None
-
-
-OutputGrafanaCloudTypedDict = TypeAliasType(
-    "OutputGrafanaCloudTypedDict",
-    Union[
-        OutputGrafanaCloudGrafanaCloud1TypedDict,
-        OutputGrafanaCloudGrafanaCloud2TypedDict,
-    ],
-)
-
-
-OutputGrafanaCloud = TypeAliasType(
-    "OutputGrafanaCloud",
-    Union[OutputGrafanaCloudGrafanaCloud1, OutputGrafanaCloudGrafanaCloud2],
-)