cribl-control-plane 0.0.21__py3-none-any.whl → 0.4.0b23__py3-none-any.whl

cribl_control_plane/models/{inputgrafana_union.py → inputgrafana.py}

@@ -1,10 +1,14 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
+from cribl_control_plane import models, utils
 from cribl_control_plane.types import BaseModel
+from cribl_control_plane.utils import validate_open_enum
 from enum import Enum
 import pydantic
-from typing import Any, List, Optional, Union
+from pydantic import field_serializer
+from pydantic.functional_validators import PlainValidator
+from typing import List, Optional, Union
 from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
 
 
@@ -23,20 +27,32 @@ class InputGrafanaConnection2(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputGrafanaMode2(str, Enum):
+class InputGrafanaMode2(str, Enum, metaclass=utils.OpenEnumMeta):
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
+    # Smart
     SMART = "smart"
+    # Always On
     ALWAYS = "always"
 
 
-class InputGrafanaCompression2(str, Enum):
+class InputGrafanaCompression2(str, Enum, metaclass=utils.OpenEnumMeta):
     r"""Codec to use to compress the persisted data"""
 
+    # None
     NONE = "none"
+    # Gzip
     GZIP = "gzip"
 
 
+class InputGrafanaPqControls2TypedDict(TypedDict):
+    pass
+
+
+class InputGrafanaPqControls2(BaseModel):
+    pass
+
+
 class InputGrafanaPq2TypedDict(TypedDict):
     mode: NotRequired[InputGrafanaMode2]
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
@@ -52,10 +68,13 @@ class InputGrafanaPq2TypedDict(TypedDict):
     r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/inputs/<input-id>"""
     compress: NotRequired[InputGrafanaCompression2]
     r"""Codec to use to compress the persisted data"""
+    pq_controls: NotRequired[InputGrafanaPqControls2TypedDict]
 
 
 class InputGrafanaPq2(BaseModel):
-    mode: Optional[InputGrafanaMode2] = InputGrafanaMode2.ALWAYS
+    mode: Annotated[
+        Optional[InputGrafanaMode2], PlainValidator(validate_open_enum(False))
+    ] = InputGrafanaMode2.ALWAYS
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
     max_buffer_size: Annotated[
@@ -79,18 +98,42 @@ class InputGrafanaPq2(BaseModel):
     path: Optional[str] = "$CRIBL_HOME/state/queues"
     r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/inputs/<input-id>"""
 
-    compress: Optional[InputGrafanaCompression2] = InputGrafanaCompression2.NONE
+    compress: Annotated[
+        Optional[InputGrafanaCompression2], PlainValidator(validate_open_enum(False))
+    ] = InputGrafanaCompression2.NONE
     r"""Codec to use to compress the persisted data"""
 
+    pq_controls: Annotated[
+        Optional[InputGrafanaPqControls2], pydantic.Field(alias="pqControls")
+    ] = None
 
-class InputGrafanaMinimumTLSVersion2(str, Enum):
+    @field_serializer("mode")
+    def serialize_mode(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaMode2(value)
+            except ValueError:
+                return value
+        return value
+
+    @field_serializer("compress")
+    def serialize_compress(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaCompression2(value)
+            except ValueError:
+                return value
+        return value
+
+
+class InputGrafanaMinimumTLSVersion2(str, Enum, metaclass=utils.OpenEnumMeta):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
     TL_SV1_3 = "TLSv1.3"
 
 
-class InputGrafanaMaximumTLSVersion2(str, Enum):
+class InputGrafanaMaximumTLSVersion2(str, Enum, metaclass=utils.OpenEnumMeta):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
@@ -99,6 +142,12 @@ class InputGrafanaMaximumTLSVersion2(str, Enum):
 
 class InputGrafanaTLSSettingsServerSide2TypedDict(TypedDict):
     disabled: NotRequired[bool]
+    request_cert: NotRequired[bool]
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+    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)"""
+    common_name_regex: NotRequired[str]
+    r"""Regex matching allowable common names in peer certificates' subject attribute"""
     certificate_name: NotRequired[str]
     r"""The name of the predefined certificate"""
     priv_key_path: NotRequired[str]
@@ -109,10 +158,6 @@ class InputGrafanaTLSSettingsServerSide2TypedDict(TypedDict):
     r"""Path on server containing certificates to use. PEM format. Can reference $ENV_VARS."""
     ca_path: NotRequired[str]
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
-    request_cert: NotRequired[bool]
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-    reject_unauthorized: NotRequired[Any]
-    common_name_regex: NotRequired[Any]
     min_version: NotRequired[InputGrafanaMinimumTLSVersion2]
     max_version: NotRequired[InputGrafanaMaximumTLSVersion2]
 
@@ -120,6 +165,19 @@ class InputGrafanaTLSSettingsServerSide2TypedDict(TypedDict):
 class InputGrafanaTLSSettingsServerSide2(BaseModel):
     disabled: Optional[bool] = True
 
+    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+
+    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)"""
+
+    common_name_regex: Annotated[
+        Optional[str], pydantic.Field(alias="commonNameRegex")
+    ] = "/.*/"
+    r"""Regex matching allowable common names in peer certificates' subject attribute"""
+
     certificate_name: Annotated[
         Optional[str], pydantic.Field(alias="certificateName")
     ] = None
@@ -137,27 +195,44 @@ class InputGrafanaTLSSettingsServerSide2(BaseModel):
     ca_path: Annotated[Optional[str], pydantic.Field(alias="caPath")] = None
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
 
-    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-
-    reject_unauthorized: Annotated[
-        Optional[Any], pydantic.Field(alias="rejectUnauthorized")
-    ] = None
-
-    common_name_regex: Annotated[
-        Optional[Any], pydantic.Field(alias="commonNameRegex")
-    ] = None
-
     min_version: Annotated[
-        Optional[InputGrafanaMinimumTLSVersion2], pydantic.Field(alias="minVersion")
+        Annotated[
+            Optional[InputGrafanaMinimumTLSVersion2],
+            PlainValidator(validate_open_enum(False)),
+        ],
+        pydantic.Field(alias="minVersion"),
     ] = None
 
     max_version: Annotated[
-        Optional[InputGrafanaMaximumTLSVersion2], pydantic.Field(alias="maxVersion")
+        Annotated[
+            Optional[InputGrafanaMaximumTLSVersion2],
+            PlainValidator(validate_open_enum(False)),
+        ],
+        pydantic.Field(alias="maxVersion"),
     ] = None
 
-
-class InputGrafanaPrometheusAuthAuthenticationType2(str, Enum):
+    @field_serializer("min_version")
+    def serialize_min_version(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaMinimumTLSVersion2(value)
+            except ValueError:
+                return value
+        return value
+
+    @field_serializer("max_version")
+    def serialize_max_version(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaMaximumTLSVersion2(value)
+            except ValueError:
+                return value
+        return value
+
+
+class InputGrafanaPrometheusAuthAuthenticationType2(
+    str, Enum, metaclass=utils.OpenEnumMeta
+):
     r"""Remote Write authentication type"""
 
     NONE = "none"
@@ -229,7 +304,10 @@ class InputGrafanaPrometheusAuth2TypedDict(TypedDict):
 
 class InputGrafanaPrometheusAuth2(BaseModel):
     auth_type: Annotated[
-        Optional[InputGrafanaPrometheusAuthAuthenticationType2],
+        Annotated[
+            Optional[InputGrafanaPrometheusAuthAuthenticationType2],
+            PlainValidator(validate_open_enum(False)),
+        ],
         pydantic.Field(alias="authType"),
     ] = InputGrafanaPrometheusAuthAuthenticationType2.NONE
     r"""Remote Write authentication type"""
@@ -285,8 +363,17 @@ class InputGrafanaPrometheusAuth2(BaseModel):
     ] = None
     r"""Additional headers to send in the OAuth login request. @{product} will automatically add the content-type header 'application/x-www-form-urlencoded' when sending this request."""
 
+    @field_serializer("auth_type")
+    def serialize_auth_type(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaPrometheusAuthAuthenticationType2(value)
+            except ValueError:
+                return value
+        return value
+
 
-class InputGrafanaLokiAuthAuthenticationType2(str, Enum):
+class InputGrafanaLokiAuthAuthenticationType2(str, Enum, metaclass=utils.OpenEnumMeta):
     r"""Loki logs authentication type"""
 
     NONE = "none"
@@ -358,7 +445,10 @@ class InputGrafanaLokiAuth2TypedDict(TypedDict):
 
 class InputGrafanaLokiAuth2(BaseModel):
     auth_type: Annotated[
-        Optional[InputGrafanaLokiAuthAuthenticationType2],
+        Annotated[
+            Optional[InputGrafanaLokiAuthAuthenticationType2],
+            PlainValidator(validate_open_enum(False)),
+        ],
         pydantic.Field(alias="authType"),
     ] = InputGrafanaLokiAuthAuthenticationType2.NONE
     r"""Loki logs authentication type"""
@@ -414,6 +504,15 @@ class InputGrafanaLokiAuth2(BaseModel):
     ] = None
     r"""Additional headers to send in the OAuth login request. @{product} will automatically add the content-type header 'application/x-www-form-urlencoded' when sending this request."""
 
+    @field_serializer("auth_type")
+    def serialize_auth_type(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaLokiAuthAuthenticationType2(value)
+            except ValueError:
+                return value
+        return value
+
 
 class InputGrafanaMetadatum2TypedDict(TypedDict):
     name: str
@@ -429,11 +528,11 @@ class InputGrafanaMetadatum2(BaseModel):
 
 
 class InputGrafanaGrafana2TypedDict(TypedDict):
+    type: InputGrafanaType2
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputGrafanaType2]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -485,14 +584,14 @@ class InputGrafanaGrafana2TypedDict(TypedDict):
 
 
 class InputGrafanaGrafana2(BaseModel):
+    type: InputGrafanaType2
+
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputGrafanaType2] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None
@@ -616,20 +715,32 @@ class InputGrafanaConnection1(BaseModel):
     pipeline: Optional[str] = None
 
 
-class InputGrafanaMode1(str, Enum):
+class InputGrafanaMode1(str, Enum, metaclass=utils.OpenEnumMeta):
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
+    # Smart
     SMART = "smart"
+    # Always On
     ALWAYS = "always"
 
 
-class InputGrafanaCompression1(str, Enum):
+class InputGrafanaCompression1(str, Enum, metaclass=utils.OpenEnumMeta):
     r"""Codec to use to compress the persisted data"""
 
+    # None
     NONE = "none"
+    # Gzip
     GZIP = "gzip"
 
 
+class InputGrafanaPqControls1TypedDict(TypedDict):
+    pass
+
+
+class InputGrafanaPqControls1(BaseModel):
+    pass
+
+
 class InputGrafanaPq1TypedDict(TypedDict):
     mode: NotRequired[InputGrafanaMode1]
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
@@ -645,10 +756,13 @@ class InputGrafanaPq1TypedDict(TypedDict):
     r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/inputs/<input-id>"""
     compress: NotRequired[InputGrafanaCompression1]
     r"""Codec to use to compress the persisted data"""
+    pq_controls: NotRequired[InputGrafanaPqControls1TypedDict]
 
 
 class InputGrafanaPq1(BaseModel):
-    mode: Optional[InputGrafanaMode1] = InputGrafanaMode1.ALWAYS
+    mode: Annotated[
+        Optional[InputGrafanaMode1], PlainValidator(validate_open_enum(False))
+    ] = InputGrafanaMode1.ALWAYS
     r"""With Smart mode, PQ will write events to the filesystem only when it detects backpressure from the processing engine. With Always On mode, PQ will always write events directly to the queue before forwarding them to the processing engine."""
 
     max_buffer_size: Annotated[
@@ -672,18 +786,42 @@ class InputGrafanaPq1(BaseModel):
     path: Optional[str] = "$CRIBL_HOME/state/queues"
     r"""The location for the persistent queue files. To this field's value, the system will append: /<worker-id>/inputs/<input-id>"""
 
-    compress: Optional[InputGrafanaCompression1] = InputGrafanaCompression1.NONE
+    compress: Annotated[
+        Optional[InputGrafanaCompression1], PlainValidator(validate_open_enum(False))
+    ] = InputGrafanaCompression1.NONE
     r"""Codec to use to compress the persisted data"""
 
+    pq_controls: Annotated[
+        Optional[InputGrafanaPqControls1], pydantic.Field(alias="pqControls")
+    ] = None
 
-class InputGrafanaMinimumTLSVersion1(str, Enum):
+    @field_serializer("mode")
+    def serialize_mode(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaMode1(value)
+            except ValueError:
+                return value
+        return value
+
+    @field_serializer("compress")
+    def serialize_compress(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaCompression1(value)
+            except ValueError:
+                return value
+        return value
+
+
+class InputGrafanaMinimumTLSVersion1(str, Enum, metaclass=utils.OpenEnumMeta):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
     TL_SV1_3 = "TLSv1.3"
 
 
-class InputGrafanaMaximumTLSVersion1(str, Enum):
+class InputGrafanaMaximumTLSVersion1(str, Enum, metaclass=utils.OpenEnumMeta):
     TL_SV1 = "TLSv1"
     TL_SV1_1 = "TLSv1.1"
     TL_SV1_2 = "TLSv1.2"
@@ -692,6 +830,12 @@ class InputGrafanaMaximumTLSVersion1(str, Enum):
 
 class InputGrafanaTLSSettingsServerSide1TypedDict(TypedDict):
     disabled: NotRequired[bool]
+    request_cert: NotRequired[bool]
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+    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)"""
+    common_name_regex: NotRequired[str]
+    r"""Regex matching allowable common names in peer certificates' subject attribute"""
     certificate_name: NotRequired[str]
     r"""The name of the predefined certificate"""
     priv_key_path: NotRequired[str]
@@ -702,10 +846,6 @@ class InputGrafanaTLSSettingsServerSide1TypedDict(TypedDict):
     r"""Path on server containing certificates to use. PEM format. Can reference $ENV_VARS."""
     ca_path: NotRequired[str]
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
-    request_cert: NotRequired[bool]
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-    reject_unauthorized: NotRequired[Any]
-    common_name_regex: NotRequired[Any]
     min_version: NotRequired[InputGrafanaMinimumTLSVersion1]
     max_version: NotRequired[InputGrafanaMaximumTLSVersion1]
 
@@ -713,6 +853,19 @@ class InputGrafanaTLSSettingsServerSide1TypedDict(TypedDict):
 class InputGrafanaTLSSettingsServerSide1(BaseModel):
     disabled: Optional[bool] = True
 
+    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
+    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
+
+    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)"""
+
+    common_name_regex: Annotated[
+        Optional[str], pydantic.Field(alias="commonNameRegex")
+    ] = "/.*/"
+    r"""Regex matching allowable common names in peer certificates' subject attribute"""
+
     certificate_name: Annotated[
         Optional[str], pydantic.Field(alias="certificateName")
     ] = None
@@ -730,27 +883,44 @@ class InputGrafanaTLSSettingsServerSide1(BaseModel):
     ca_path: Annotated[Optional[str], pydantic.Field(alias="caPath")] = None
     r"""Path on server containing CA certificates to use. PEM format. Can reference $ENV_VARS."""
 
-    request_cert: Annotated[Optional[bool], pydantic.Field(alias="requestCert")] = False
-    r"""Require clients to present their certificates. Used to perform client authentication using SSL certs."""
-
-    reject_unauthorized: Annotated[
-        Optional[Any], pydantic.Field(alias="rejectUnauthorized")
-    ] = None
-
-    common_name_regex: Annotated[
-        Optional[Any], pydantic.Field(alias="commonNameRegex")
-    ] = None
-
     min_version: Annotated[
-        Optional[InputGrafanaMinimumTLSVersion1], pydantic.Field(alias="minVersion")
+        Annotated[
+            Optional[InputGrafanaMinimumTLSVersion1],
+            PlainValidator(validate_open_enum(False)),
+        ],
+        pydantic.Field(alias="minVersion"),
     ] = None
 
     max_version: Annotated[
-        Optional[InputGrafanaMaximumTLSVersion1], pydantic.Field(alias="maxVersion")
+        Annotated[
+            Optional[InputGrafanaMaximumTLSVersion1],
+            PlainValidator(validate_open_enum(False)),
+        ],
+        pydantic.Field(alias="maxVersion"),
     ] = None
 
-
-class InputGrafanaPrometheusAuthAuthenticationType1(str, Enum):
+    @field_serializer("min_version")
+    def serialize_min_version(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaMinimumTLSVersion1(value)
+            except ValueError:
+                return value
+        return value
+
+    @field_serializer("max_version")
+    def serialize_max_version(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaMaximumTLSVersion1(value)
+            except ValueError:
+                return value
+        return value
+
+
+class InputGrafanaPrometheusAuthAuthenticationType1(
+    str, Enum, metaclass=utils.OpenEnumMeta
+):
     r"""Remote Write authentication type"""
 
     NONE = "none"
@@ -822,7 +992,10 @@ class InputGrafanaPrometheusAuth1TypedDict(TypedDict):
 
 class InputGrafanaPrometheusAuth1(BaseModel):
     auth_type: Annotated[
-        Optional[InputGrafanaPrometheusAuthAuthenticationType1],
+        Annotated[
+            Optional[InputGrafanaPrometheusAuthAuthenticationType1],
+            PlainValidator(validate_open_enum(False)),
+        ],
         pydantic.Field(alias="authType"),
     ] = InputGrafanaPrometheusAuthAuthenticationType1.NONE
     r"""Remote Write authentication type"""
@@ -878,8 +1051,17 @@ class InputGrafanaPrometheusAuth1(BaseModel):
     ] = None
     r"""Additional headers to send in the OAuth login request. @{product} will automatically add the content-type header 'application/x-www-form-urlencoded' when sending this request."""
 
+    @field_serializer("auth_type")
+    def serialize_auth_type(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaPrometheusAuthAuthenticationType1(value)
+            except ValueError:
+                return value
+        return value
+
 
-class InputGrafanaLokiAuthAuthenticationType1(str, Enum):
+class InputGrafanaLokiAuthAuthenticationType1(str, Enum, metaclass=utils.OpenEnumMeta):
     r"""Loki logs authentication type"""
 
     NONE = "none"
@@ -951,7 +1133,10 @@ class InputGrafanaLokiAuth1TypedDict(TypedDict):
 
 class InputGrafanaLokiAuth1(BaseModel):
     auth_type: Annotated[
-        Optional[InputGrafanaLokiAuthAuthenticationType1],
+        Annotated[
+            Optional[InputGrafanaLokiAuthAuthenticationType1],
+            PlainValidator(validate_open_enum(False)),
+        ],
         pydantic.Field(alias="authType"),
     ] = InputGrafanaLokiAuthAuthenticationType1.NONE
     r"""Loki logs authentication type"""
@@ -1007,6 +1192,15 @@ class InputGrafanaLokiAuth1(BaseModel):
     ] = None
     r"""Additional headers to send in the OAuth login request. @{product} will automatically add the content-type header 'application/x-www-form-urlencoded' when sending this request."""
 
+    @field_serializer("auth_type")
+    def serialize_auth_type(self, value):
+        if isinstance(value, str):
+            try:
+                return models.InputGrafanaLokiAuthAuthenticationType1(value)
+            except ValueError:
+                return value
+        return value
+
 
 class InputGrafanaMetadatum1TypedDict(TypedDict):
     name: str
@@ -1022,11 +1216,11 @@ class InputGrafanaMetadatum1(BaseModel):
 
 
 class InputGrafanaGrafana1TypedDict(TypedDict):
+    type: InputGrafanaType1
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputGrafanaType1]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -1078,14 +1272,14 @@ class InputGrafanaGrafana1TypedDict(TypedDict):
 
 
 class InputGrafanaGrafana1(BaseModel):
+    type: InputGrafanaType1
+
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputGrafanaType1] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None
@@ -1194,12 +1388,12 @@ class InputGrafanaGrafana1(BaseModel):
     description: Optional[str] = None
 
 
-InputGrafanaUnionTypedDict = TypeAliasType(
-    "InputGrafanaUnionTypedDict",
+InputGrafanaTypedDict = TypeAliasType(
+    "InputGrafanaTypedDict",
     Union[InputGrafanaGrafana1TypedDict, InputGrafanaGrafana2TypedDict],
 )
 
 
-InputGrafanaUnion = TypeAliasType(
-    "InputGrafanaUnion", Union[InputGrafanaGrafana1, InputGrafanaGrafana2]
+InputGrafana = TypeAliasType(
+    "InputGrafana", Union[InputGrafanaGrafana1, InputGrafanaGrafana2]
 )