cribl-control-plane 0.0.24__py3-none-any.whl → 0.0.26__py3-none-any.whl

cribl_control_plane/models/inputcribllakehttp.py

@@ -175,11 +175,11 @@ class InputCriblLakeHTTPMetadatum(BaseModel):
 
 
 class InputCriblLakeHTTPTypedDict(TypedDict):
+    type: InputCriblLakeHTTPType
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputCriblLakeHTTPType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -227,14 +227,14 @@ class InputCriblLakeHTTPTypedDict(TypedDict):
 
 
 class InputCriblLakeHTTP(BaseModel):
+    type: InputCriblLakeHTTPType
+
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputCriblLakeHTTPType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputcriblmetrics.py

@@ -97,9 +97,9 @@ class InputCriblmetricsMetadatum(BaseModel):
 
 
 class InputCriblmetricsTypedDict(TypedDict):
-    id: str
-    r"""Unique ID for this input"""
     type: InputCriblmetricsType
+    id: NotRequired[str]
+    r"""Unique ID for this input"""
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -124,11 +124,11 @@ class InputCriblmetricsTypedDict(TypedDict):
 
 
 class InputCriblmetrics(BaseModel):
-    id: str
-    r"""Unique ID for this input"""
-
     type: InputCriblmetricsType
 
+    id: Optional[str] = None
+    r"""Unique ID for this input"""
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputcribltcp.py

@@ -171,11 +171,11 @@ class InputCriblTCPMetadatum(BaseModel):
 
 
 class InputCriblTCPTypedDict(TypedDict):
+    type: InputCriblTCPType
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputCriblTCPType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -211,14 +211,14 @@ class InputCriblTCPTypedDict(TypedDict):
 
 
 class InputCriblTCP(BaseModel):
+    type: InputCriblTCPType
+
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputCriblTCPType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputdatadogagent.py

@@ -188,11 +188,11 @@ class InputDatadogAgentProxyMode(BaseModel):
 
 
 class InputDatadogAgentTypedDict(TypedDict):
+    type: InputDatadogAgentType
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputDatadogAgentType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -241,14 +241,14 @@ class InputDatadogAgentTypedDict(TypedDict):
 
 
 class InputDatadogAgent(BaseModel):
+    type: InputDatadogAgentType
+
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputDatadogAgentType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputedgeprometheus.py

@@ -248,9 +248,9 @@ class PodFilter(BaseModel):
 
 
 class InputEdgePrometheusTypedDict(TypedDict):
+    type: InputEdgePrometheusType
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputEdgePrometheusType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -338,11 +338,11 @@ class InputEdgePrometheusTypedDict(TypedDict):
 
 
 class InputEdgePrometheus(BaseModel):
+    type: InputEdgePrometheusType
+
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputEdgePrometheusType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputelastic.py

@@ -246,11 +246,11 @@ class InputElasticProxyMode(BaseModel):
 
 
 class InputElasticTypedDict(TypedDict):
+    type: InputElasticType
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputElasticType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -312,14 +312,14 @@ class InputElasticTypedDict(TypedDict):
 
 
 class InputElastic(BaseModel):
+    type: InputElasticType
+
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputElasticType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputeventhub.py

@@ -132,13 +132,13 @@ class InputEventhubMetadatum(BaseModel):
 
 
 class InputEventhubTypedDict(TypedDict):
+    type: InputEventhubType
     brokers: List[str]
     r"""List of Event Hubs Kafka brokers to connect to (example: yourdomain.servicebus.windows.net:9093). The hostname can be found in the host portion of the primary or secondary connection string in Shared Access Policies."""
     topics: List[str]
     r"""The name of the Event Hub (Kafka topic) to subscribe to. Warning: To optimize performance, Cribl suggests subscribing each Event Hubs Source to only a single topic."""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputEventhubType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -210,6 +210,8 @@ class InputEventhubTypedDict(TypedDict):
 
 
 class InputEventhub(BaseModel):
+    type: InputEventhubType
+
     brokers: List[str]
     r"""List of Event Hubs Kafka brokers to connect to (example: yourdomain.servicebus.windows.net:9093). The hostname can be found in the host portion of the primary or secondary connection string in Shared Access Policies."""
 
@@ -219,8 +221,6 @@ class InputEventhub(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputEventhubType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputfile.py

@@ -104,9 +104,9 @@ class InputFileMetadatum(BaseModel):
 
 
 class InputFileTypedDict(TypedDict):
-    id: str
-    r"""Unique ID for this input"""
     type: InputFileType
+    id: NotRequired[str]
+    r"""Unique ID for this input"""
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -158,11 +158,11 @@ class InputFileTypedDict(TypedDict):
 
 
 class InputFile(BaseModel):
-    id: str
-    r"""Unique ID for this input"""
-
     type: InputFileType
 
+    id: Optional[str] = None
+    r"""Unique ID for this input"""
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputfirehose.py

@@ -171,11 +171,11 @@ class InputFirehoseMetadatum(BaseModel):
 
 
 class InputFirehoseTypedDict(TypedDict):
+    type: InputFirehoseType
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputFirehoseType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -223,14 +223,14 @@ class InputFirehoseTypedDict(TypedDict):
 
 
 class InputFirehose(BaseModel):
+    type: InputFirehoseType
+
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputFirehoseType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputgooglepubsub.py

@@ -105,13 +105,11 @@ class InputGooglePubsubMetadatum(BaseModel):
 
 
 class InputGooglePubsubTypedDict(TypedDict):
-    topic_name: str
-    r"""ID of the topic to receive events from"""
+    type: InputGooglePubsubType
     subscription_name: str
-    r"""ID of the subscription to use when receiving events"""
+    r"""ID of the subscription to use when receiving events. When Monitor subscription is enabled, the fully qualified subscription name must be entered. Example: projects/myProject/subscriptions/mySubscription"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputGooglePubsubType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -126,6 +124,10 @@ class InputGooglePubsubTypedDict(TypedDict):
     connections: NotRequired[List[InputGooglePubsubConnectionTypedDict]]
     r"""Direct connections to Destinations, and optionally via a Pipeline or a Pack"""
     pq: NotRequired[InputGooglePubsubPqTypedDict]
+    topic_name: NotRequired[str]
+    r"""ID of the topic to receive events from. When Monitor subscription is enabled, any value may be entered."""
+    monitor_subscription: NotRequired[bool]
+    r"""Use when the subscription is not created by this Source and topic is not known"""
     create_topic: NotRequired[bool]
     r"""Create topic if it does not exist"""
     create_subscription: NotRequired[bool]
@@ -152,17 +154,14 @@ class InputGooglePubsubTypedDict(TypedDict):
 
 
 class InputGooglePubsub(BaseModel):
-    topic_name: Annotated[str, pydantic.Field(alias="topicName")]
-    r"""ID of the topic to receive events from"""
+    type: InputGooglePubsubType
 
     subscription_name: Annotated[str, pydantic.Field(alias="subscriptionName")]
-    r"""ID of the subscription to use when receiving events"""
+    r"""ID of the subscription to use when receiving events. When Monitor subscription is enabled, the fully qualified subscription name must be entered. Example: projects/myProject/subscriptions/mySubscription"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputGooglePubsubType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None
@@ -187,6 +186,14 @@ class InputGooglePubsub(BaseModel):
 
     pq: Optional[InputGooglePubsubPq] = None
 
+    topic_name: Annotated[Optional[str], pydantic.Field(alias="topicName")] = "cribl"
+    r"""ID of the topic to receive events from. When Monitor subscription is enabled, any value may be entered."""
+
+    monitor_subscription: Annotated[
+        Optional[bool], pydantic.Field(alias="monitorSubscription")
+    ] = False
+    r"""Use when the subscription is not created by this Source and topic is not known"""
+
     create_topic: Annotated[Optional[bool], pydantic.Field(alias="createTopic")] = False
     r"""Create topic if it does not exist"""
 

cribl_control_plane/models/inputgrafana.py

@@ -429,11 +429,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"""
@@ -477,6 +477,8 @@ class InputGrafanaGrafana2TypedDict(TypedDict):
     r"""Absolute path on which to listen for Grafana Agent's Remote Write requests. Defaults to /api/prom/push, which will expand as: 'http://<your‑upstream‑URL>:<your‑port>/api/prom/push'. Either this field or 'Logs API endpoint' must be configured."""
     loki_api: NotRequired[str]
     r"""Absolute path on which to listen for Loki logs requests. Defaults to /loki/api/v1/push, which will (in this example) expand as: 'http://<your‑upstream‑URL>:<your‑port>/loki/api/v1/push'. Either this field or 'Remote Write API endpoint' must be configured."""
+    extract_structured_metadata: NotRequired[bool]
+    r"""Extract structured metadata from the Loki 3.5.3+ format and place it in the __structuredMetadata field. When disabled, uses legacy Loki parsing for backward compatibility."""
     prometheus_auth: NotRequired[InputGrafanaPrometheusAuth2TypedDict]
     loki_auth: NotRequired[InputGrafanaLokiAuth2TypedDict]
     metadata: NotRequired[List[InputGrafanaMetadatum2TypedDict]]
@@ -485,14 +487,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
@@ -587,6 +589,11 @@ class InputGrafanaGrafana2(BaseModel):
     )
     r"""Absolute path on which to listen for Loki logs requests. Defaults to /loki/api/v1/push, which will (in this example) expand as: 'http://<your‑upstream‑URL>:<your‑port>/loki/api/v1/push'. Either this field or 'Remote Write API endpoint' must be configured."""
 
+    extract_structured_metadata: Annotated[
+        Optional[bool], pydantic.Field(alias="extractStructuredMetadata")
+    ] = False
+    r"""Extract structured metadata from the Loki 3.5.3+ format and place it in the __structuredMetadata field. When disabled, uses legacy Loki parsing for backward compatibility."""
+
     prometheus_auth: Annotated[
         Optional[InputGrafanaPrometheusAuth2], pydantic.Field(alias="prometheusAuth")
     ] = None
@@ -1022,11 +1029,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"""
@@ -1070,6 +1077,8 @@ class InputGrafanaGrafana1TypedDict(TypedDict):
     r"""Absolute path on which to listen for Grafana Agent's Remote Write requests. Defaults to /api/prom/push, which will expand as: 'http://<your‑upstream‑URL>:<your‑port>/api/prom/push'. Either this field or 'Logs API endpoint' must be configured."""
     loki_api: NotRequired[str]
     r"""Absolute path on which to listen for Loki logs requests. Defaults to /loki/api/v1/push, which will (in this example) expand as: 'http://<your‑upstream‑URL>:<your‑port>/loki/api/v1/push'. Either this field or 'Remote Write API endpoint' must be configured."""
+    extract_structured_metadata: NotRequired[bool]
+    r"""Extract structured metadata from the Loki 3.5.3+ format and place it in the __structuredMetadata field. When disabled, uses legacy Loki parsing for backward compatibility."""
     prometheus_auth: NotRequired[InputGrafanaPrometheusAuth1TypedDict]
     loki_auth: NotRequired[InputGrafanaLokiAuth1TypedDict]
     metadata: NotRequired[List[InputGrafanaMetadatum1TypedDict]]
@@ -1078,14 +1087,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
@@ -1180,6 +1189,11 @@ class InputGrafanaGrafana1(BaseModel):
     )
     r"""Absolute path on which to listen for Loki logs requests. Defaults to /loki/api/v1/push, which will (in this example) expand as: 'http://<your‑upstream‑URL>:<your‑port>/loki/api/v1/push'. Either this field or 'Remote Write API endpoint' must be configured."""
 
+    extract_structured_metadata: Annotated[
+        Optional[bool], pydantic.Field(alias="extractStructuredMetadata")
+    ] = False
+    r"""Extract structured metadata from the Loki 3.5.3+ format and place it in the __structuredMetadata field. When disabled, uses legacy Loki parsing for backward compatibility."""
+
     prometheus_auth: Annotated[
         Optional[InputGrafanaPrometheusAuth1], pydantic.Field(alias="prometheusAuth")
     ] = None

cribl_control_plane/models/inputhttp.py

@@ -202,11 +202,11 @@ class InputHTTPAuthTokensExt(BaseModel):
 
 
 class InputHTTPTypedDict(TypedDict):
+    type: InputHTTPType
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputHTTPType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -263,14 +263,14 @@ class InputHTTPTypedDict(TypedDict):
 
 
 class InputHTTP(BaseModel):
+    type: InputHTTPType
+
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputHTTPType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputhttpraw.py

@@ -202,11 +202,11 @@ class InputHTTPRawAuthTokensExt(BaseModel):
 
 
 class InputHTTPRawTypedDict(TypedDict):
+    type: InputHTTPRawType
     port: float
     r"""Port to listen on"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputHTTPRawType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -264,14 +264,14 @@ class InputHTTPRawTypedDict(TypedDict):
 
 
 class InputHTTPRaw(BaseModel):
+    type: InputHTTPRawType
+
     port: float
     r"""Port to listen on"""
 
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputHTTPRawType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputjournalfiles.py

@@ -112,13 +112,13 @@ class InputJournalFilesMetadatum(BaseModel):
 
 
 class InputJournalFilesTypedDict(TypedDict):
+    type: InputJournalFilesType
     path: str
     r"""Directory path to search for journals. Environment variables will be resolved, e.g. $CRIBL_EDGE_FS_ROOT/var/log/journal/$MACHINE_ID."""
     journals: List[str]
     r"""The full path of discovered journals are matched against this wildcard list."""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputJournalFilesType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -147,6 +147,8 @@ class InputJournalFilesTypedDict(TypedDict):
 
 
 class InputJournalFiles(BaseModel):
+    type: InputJournalFilesType
+
     path: str
     r"""Directory path to search for journals. Environment variables will be resolved, e.g. $CRIBL_EDGE_FS_ROOT/var/log/journal/$MACHINE_ID."""
 
@@ -156,8 +158,6 @@ class InputJournalFiles(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputJournalFilesType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputkafka.py

@@ -83,6 +83,13 @@ class InputKafkaPq(BaseModel):
     r"""Codec to use to compress the persisted data"""
 
 
+class InputKafkaSchemaType(str, Enum):
+    r"""The schema format used to encode and decode event data"""
+
+    AVRO = "avro"
+    JSON = "json"
+
+
 class InputKafkaAuthTypedDict(TypedDict):
     r"""Credentials to use when authenticating with the schema registry using basic HTTP authentication"""
 
@@ -183,6 +190,8 @@ class InputKafkaKafkaSchemaRegistryAuthenticationTypedDict(TypedDict):
     disabled: NotRequired[bool]
     schema_registry_url: NotRequired[str]
     r"""URL for accessing the Confluent Schema Registry. Example: http://localhost:8081. To connect over TLS, use https instead of http."""
+    schema_type: NotRequired[InputKafkaSchemaType]
+    r"""The schema format used to encode and decode event data"""
     connection_timeout: NotRequired[float]
     r"""Maximum time to wait for a Schema Registry connection to complete successfully"""
     request_timeout: NotRequired[float]
@@ -202,6 +211,11 @@ class InputKafkaKafkaSchemaRegistryAuthentication(BaseModel):
     ] = "http://localhost:8081"
     r"""URL for accessing the Confluent Schema Registry. Example: http://localhost:8081. To connect over TLS, use https instead of http."""
 
+    schema_type: Annotated[
+        Optional[InputKafkaSchemaType], pydantic.Field(alias="schemaType")
+    ] = InputKafkaSchemaType.AVRO
+    r"""The schema format used to encode and decode event data"""
+
     connection_timeout: Annotated[
         Optional[float], pydantic.Field(alias="connectionTimeout")
     ] = 30000
@@ -332,13 +346,13 @@ class InputKafkaMetadatum(BaseModel):
 
 
 class InputKafkaTypedDict(TypedDict):
+    type: InputKafkaType
     brokers: List[str]
     r"""Enter each Kafka bootstrap server you want to use. Specify the hostname and port (such as mykafkabroker:9092) or just the hostname (in which case @{product} will assign port 9092)."""
     topics: List[str]
     r"""Topic to subscribe to. Warning: To optimize performance, Cribl suggests subscribing each Kafka Source to a single topic only."""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputKafkaType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -412,6 +426,8 @@ class InputKafkaTypedDict(TypedDict):
 
 
 class InputKafka(BaseModel):
+    type: InputKafkaType
+
     brokers: List[str]
     r"""Enter each Kafka bootstrap server you want to use. Specify the hostname and port (such as mykafkabroker:9092) or just the hostname (in which case @{product} will assign port 9092)."""
 
@@ -421,8 +437,6 @@ class InputKafka(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputKafkaType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputkinesis.py

@@ -135,13 +135,13 @@ class InputKinesisMetadatum(BaseModel):
 
 
 class InputKinesisTypedDict(TypedDict):
+    type: InputKinesisType
     stream_name: str
     r"""Kinesis Data Stream to read data from"""
     region: str
     r"""Region where the Kinesis stream is located"""
     id: NotRequired[str]
     r"""Unique ID for this input"""
-    type: NotRequired[InputKinesisType]
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -202,6 +202,8 @@ class InputKinesisTypedDict(TypedDict):
 
 
 class InputKinesis(BaseModel):
+    type: InputKinesisType
+
     stream_name: Annotated[str, pydantic.Field(alias="streamName")]
     r"""Kinesis Data Stream to read data from"""
 
@@ -211,8 +213,6 @@ class InputKinesis(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this input"""
 
-    type: Optional[InputKinesisType] = None
-
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None

cribl_control_plane/models/inputkubeevents.py

@@ -112,9 +112,9 @@ class InputKubeEventsMetadatum(BaseModel):
 
 
 class InputKubeEventsTypedDict(TypedDict):
-    id: str
-    r"""Unique ID for this input"""
     type: InputKubeEventsType
+    id: NotRequired[str]
+    r"""Unique ID for this input"""
     disabled: NotRequired[bool]
     pipeline: NotRequired[str]
     r"""Pipeline to process data from this Source before sending it through the Routes"""
@@ -137,11 +137,11 @@ class InputKubeEventsTypedDict(TypedDict):
 
 
 class InputKubeEvents(BaseModel):
-    id: str
-    r"""Unique ID for this input"""
-
     type: InputKubeEventsType
 
+    id: Optional[str] = None
+    r"""Unique ID for this input"""
+
     disabled: Optional[bool] = False
 
     pipeline: Optional[str] = None