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

cribl_control_plane/models/outputcribltcp.py

@@ -170,9 +170,9 @@ class OutputCriblTCPPqControls(BaseModel):
 
 
 class OutputCriblTCPTypedDict(TypedDict):
-    id: str
-    r"""Unique ID for this output"""
     type: OutputCriblTCPType
+    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]]
@@ -231,11 +231,11 @@ class OutputCriblTCPTypedDict(TypedDict):
 
 
 class OutputCriblTCP(BaseModel):
-    id: str
-    r"""Unique ID for this output"""
-
     type: OutputCriblTCPType
 
+    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"""
 

cribl_control_plane/models/outputcrowdstrikenextgensiem.py

@@ -138,13 +138,13 @@ class OutputCrowdstrikeNextGenSiemPqControls(BaseModel):
 
 
 class OutputCrowdstrikeNextGenSiemTypedDict(TypedDict):
+    type: OutputCrowdstrikeNextGenSiemType
     url: str
     r"""URL provided from a CrowdStrike data connector.
     Example: https://ingest.<region>.crowdstrike.com/api/ingest/hec/<connection-id>/v1/services/collector
     """
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputCrowdstrikeNextGenSiemType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -217,6 +217,8 @@ class OutputCrowdstrikeNextGenSiemTypedDict(TypedDict):
 
 
 class OutputCrowdstrikeNextGenSiem(BaseModel):
+    type: OutputCrowdstrikeNextGenSiemType
+
     url: str
     r"""URL provided from a CrowdStrike data connector.
     Example: https://ingest.<region>.crowdstrike.com/api/ingest/hec/<connection-id>/v1/services/collector
@@ -225,8 +227,6 @@ class OutputCrowdstrikeNextGenSiem(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputCrowdstrikeNextGenSiemType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputdatadog.py

@@ -163,9 +163,9 @@ class OutputDatadogPqControls(BaseModel):
 
 
 class OutputDatadogTypedDict(TypedDict):
-    id: str
-    r"""Unique ID for this output"""
     type: OutputDatadogType
+    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]]
@@ -256,11 +256,11 @@ class OutputDatadogTypedDict(TypedDict):
 
 
 class OutputDatadog(BaseModel):
-    id: str
-    r"""Unique ID for this output"""
-
     type: OutputDatadogType
 
+    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"""
 

cribl_control_plane/models/outputdataset.py

@@ -151,9 +151,9 @@ class OutputDatasetPqControls(BaseModel):
 
 
 class OutputDatasetTypedDict(TypedDict):
-    id: str
-    r"""Unique ID for this output"""
     type: OutputDatasetType
+    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]]
@@ -234,11 +234,11 @@ class OutputDatasetTypedDict(TypedDict):
 
 
 class OutputDataset(BaseModel):
-    id: str
-    r"""Unique ID for this output"""
-
     type: OutputDatasetType
 
+    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"""
 

cribl_control_plane/models/outputdevnull.py

@@ -13,9 +13,9 @@ class OutputDevnullType(str, Enum):
 
 
 class OutputDevnullTypedDict(TypedDict):
-    id: str
-    r"""Unique ID for this output"""
     type: OutputDevnullType
+    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]]
@@ -27,11 +27,11 @@ class OutputDevnullTypedDict(TypedDict):
 
 
 class OutputDevnull(BaseModel):
-    id: str
-    r"""Unique ID for this output"""
-
     type: OutputDevnullType
 
+    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"""
 

cribl_control_plane/models/outputdiskspool.py

@@ -20,9 +20,9 @@ class OutputDiskSpoolCompression(str, Enum):
 
 
 class OutputDiskSpoolTypedDict(TypedDict):
-    id: str
-    r"""Unique ID for this output"""
     type: OutputDiskSpoolType
+    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]]
@@ -45,11 +45,11 @@ class OutputDiskSpoolTypedDict(TypedDict):
 
 
 class OutputDiskSpool(BaseModel):
-    id: str
-    r"""Unique ID for this output"""
-
     type: OutputDiskSpoolType
 
+    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"""
 

cribl_control_plane/models/outputdls3.py

@@ -121,11 +121,11 @@ class OutputDlS3KeyValueMetadatum(BaseModel):
 
 
 class OutputDlS3TypedDict(TypedDict):
+    type: OutputDlS3Type
     bucket: str
     r"""Name of the destination S3 bucket. Must be a JavaScript expression (which can evaluate to a constant value), enclosed in quotes or backticks. Can be evaluated only at initialization time. Example referencing a Global Variable: `myBucket-${C.vars.myVar}`"""
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputDlS3Type]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -243,14 +243,14 @@ class OutputDlS3TypedDict(TypedDict):
 
 
 class OutputDlS3(BaseModel):
+    type: OutputDlS3Type
+
     bucket: str
     r"""Name of the destination S3 bucket. Must be a JavaScript expression (which can evaluate to a constant value), enclosed in quotes or backticks. Can be evaluated only at initialization time. Example referencing a Global Variable: `myBucket-${C.vars.myVar}`"""
 
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputDlS3Type] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputdynatracehttp.py

@@ -155,9 +155,9 @@ class OutputDynatraceHTTPPqControls(BaseModel):
 
 
 class OutputDynatraceHTTPTypedDict(TypedDict):
+    type: OutputDynatraceHTTPType
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputDynatraceHTTPType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -242,11 +242,11 @@ class OutputDynatraceHTTPTypedDict(TypedDict):
 
 
 class OutputDynatraceHTTP(BaseModel):
+    type: OutputDynatraceHTTPType
+
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputDynatraceHTTPType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputdynatraceotlp.py

@@ -169,11 +169,11 @@ class OutputDynatraceOtlpPqControls(BaseModel):
 
 
 class OutputDynatraceOtlpTypedDict(TypedDict):
+    type: OutputDynatraceOtlpType
     token_secret: str
     r"""Select or create a stored text secret"""
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputDynatraceOtlpType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -260,14 +260,14 @@ class OutputDynatraceOtlpTypedDict(TypedDict):
 
 
 class OutputDynatraceOtlp(BaseModel):
+    type: OutputDynatraceOtlpType
+
     token_secret: Annotated[str, pydantic.Field(alias="tokenSecret")]
     r"""Select or create a stored text secret"""
 
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputDynatraceOtlpType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputelasticcloud.py

@@ -160,13 +160,13 @@ class OutputElasticCloudPqControls(BaseModel):
 
 
 class OutputElasticCloudTypedDict(TypedDict):
+    type: OutputElasticCloudType
     url: str
     r"""Enter Cloud ID of the Elastic Cloud environment to send events to"""
     index: str
     r"""Data stream or index to send events to. Must be a JavaScript expression (which can evaluate to a constant value), enclosed in quotes or backticks. Can be overwritten by an event's __index field."""
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputElasticCloudType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -231,6 +231,8 @@ class OutputElasticCloudTypedDict(TypedDict):
 
 
 class OutputElasticCloud(BaseModel):
+    type: OutputElasticCloudType
+
     url: str
     r"""Enter Cloud ID of the Elastic Cloud environment to send events to"""
 
@@ -240,8 +242,6 @@ class OutputElasticCloud(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputElasticCloudType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputexabeam.py

@@ -54,6 +54,7 @@ class OutputExabeamDiskSpaceProtection(str, Enum):
 
 
 class OutputExabeamTypedDict(TypedDict):
+    type: OutputExabeamType
     bucket: str
     r"""Name of the destination bucket. A constant or a JavaScript expression that can only be evaluated at init time. Example of referencing a JavaScript Global Variable: `myBucket-${C.vars.myVar}`."""
     region: str
@@ -64,7 +65,6 @@ class OutputExabeamTypedDict(TypedDict):
     """
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputExabeamType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -126,6 +126,8 @@ class OutputExabeamTypedDict(TypedDict):
 
 
 class OutputExabeam(BaseModel):
+    type: OutputExabeamType
+
     bucket: str
     r"""Name of the destination bucket. A constant or a JavaScript expression that can only be evaluated at init time. Example of referencing a JavaScript Global Variable: `myBucket-${C.vars.myVar}`."""
 
@@ -140,8 +142,6 @@ class OutputExabeam(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputExabeamType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputgooglecloudlogging.py

@@ -103,6 +103,7 @@ class OutputGoogleCloudLoggingPqControls(BaseModel):
 
 
 class OutputGoogleCloudLoggingTypedDict(TypedDict):
+    type: OutputGoogleCloudLoggingType
     log_location_type: LogLocationType
     log_name_expression: str
     r"""JavaScript expression to compute the value of the log name."""
@@ -110,7 +111,6 @@ class OutputGoogleCloudLoggingTypedDict(TypedDict):
     r"""JavaScript expression to compute the value of the folder ID with which log entries should be associated."""
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputGoogleCloudLoggingType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -230,6 +230,8 @@ class OutputGoogleCloudLoggingTypedDict(TypedDict):
 
 
 class OutputGoogleCloudLogging(BaseModel):
+    type: OutputGoogleCloudLoggingType
+
     log_location_type: Annotated[
         LogLocationType, pydantic.Field(alias="logLocationType")
     ]
@@ -245,8 +247,6 @@ class OutputGoogleCloudLogging(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputGoogleCloudLoggingType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputgooglecloudstorage.py

@@ -109,13 +109,13 @@ class OutputGoogleCloudStorageKeyValueMetadatum(BaseModel):
 
 
 class OutputGoogleCloudStorageTypedDict(TypedDict):
+    type: OutputGoogleCloudStorageType
     bucket: str
     r"""Name of the destination bucket. This value can be a constant or a JavaScript expression that can only be evaluated at init time. Example of referencing a Global Variable: `myBucket-${C.vars.myVar}`."""
     region: str
     r"""Region where the bucket is located"""
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputGoogleCloudStorageType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -215,6 +215,8 @@ class OutputGoogleCloudStorageTypedDict(TypedDict):
 
 
 class OutputGoogleCloudStorage(BaseModel):
+    type: OutputGoogleCloudStorageType
+
     bucket: str
     r"""Name of the destination bucket. This value can be a constant or a JavaScript expression that can only be evaluated at init time. Example of referencing a Global Variable: `myBucket-${C.vars.myVar}`."""
 
@@ -224,8 +226,6 @@ class OutputGoogleCloudStorage(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputGoogleCloudStorageType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputgrafanacloud.py

@@ -234,11 +234,11 @@ class OutputGrafanaCloudPqControls2(BaseModel):
 
 
 class OutputGrafanaCloudGrafanaCloud2TypedDict(TypedDict):
-    id: str
-    r"""Unique ID for this output"""
     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"""
+    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]]
@@ -316,14 +316,14 @@ class OutputGrafanaCloudGrafanaCloud2TypedDict(TypedDict):
 
 
 class OutputGrafanaCloudGrafanaCloud2(BaseModel):
-    id: str
-    r"""Unique ID for this output"""
-
     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"""
 
+    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"""
 
@@ -710,11 +710,11 @@ class OutputGrafanaCloudPqControls1(BaseModel):
 
 
 class OutputGrafanaCloudGrafanaCloud1TypedDict(TypedDict):
-    id: str
-    r"""Unique ID for this output"""
     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]]
@@ -792,14 +792,14 @@ class OutputGrafanaCloudGrafanaCloud1TypedDict(TypedDict):
 
 
 class OutputGrafanaCloudGrafanaCloud1(BaseModel):
-    id: str
-    r"""Unique ID for this output"""
-
     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"""
 

cribl_control_plane/models/outputgraphite.py

@@ -58,11 +58,11 @@ class OutputGraphitePqControls(BaseModel):
 
 
 class OutputGraphiteTypedDict(TypedDict):
+    type: OutputGraphiteType
     host: str
     r"""The hostname of the destination."""
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputGraphiteType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -106,14 +106,14 @@ class OutputGraphiteTypedDict(TypedDict):
 
 
 class OutputGraphite(BaseModel):
+    type: OutputGraphiteType
+
     host: str
     r"""The hostname of the destination."""
 
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputGraphiteType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputhumiohec.py

@@ -138,9 +138,9 @@ class OutputHumioHecPqControls(BaseModel):
 
 
 class OutputHumioHecTypedDict(TypedDict):
+    type: OutputHumioHecType
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputHumioHecType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -210,11 +210,11 @@ class OutputHumioHecTypedDict(TypedDict):
 
 
 class OutputHumioHec(BaseModel):
+    type: OutputHumioHecType
+
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputHumioHecType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputkafka.py

@@ -339,13 +339,13 @@ class OutputKafkaPqControls(BaseModel):
 
 
 class OutputKafkaTypedDict(TypedDict):
+    type: OutputKafkaType
     brokers: List[str]
     r"""Enter each Kafka bootstrap server you want to use. Specify hostname and port, e.g., mykafkabroker:9092, or just hostname, in which case @{product} will assign port 9092."""
     topic: str
     r"""The topic to publish events to. Can be overridden using the __topicOut field."""
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputKafkaType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -409,6 +409,8 @@ class OutputKafkaTypedDict(TypedDict):
 
 
 class OutputKafka(BaseModel):
+    type: OutputKafkaType
+
     brokers: List[str]
     r"""Enter each Kafka bootstrap server you want to use. Specify hostname and port, e.g., mykafkabroker:9092, or just hostname, in which case @{product} will assign port 9092."""
 
@@ -418,8 +420,6 @@ class OutputKafka(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputKafkaType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputkinesis.py

@@ -73,13 +73,13 @@ class OutputKinesisPqControls(BaseModel):
 
 
 class OutputKinesisTypedDict(TypedDict):
+    type: OutputKinesisType
     stream_name: str
     r"""Kinesis stream name to send events to."""
     region: str
     r"""Region where the Kinesis stream is located"""
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputKinesisType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -141,6 +141,8 @@ class OutputKinesisTypedDict(TypedDict):
 
 
 class OutputKinesis(BaseModel):
+    type: OutputKinesisType
+
     stream_name: Annotated[str, pydantic.Field(alias="streamName")]
     r"""Kinesis stream name to send events to."""
 
@@ -150,8 +152,6 @@ class OutputKinesis(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputKinesisType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputminio.py

@@ -116,13 +116,13 @@ class OutputMinioKeyValueMetadatum(BaseModel):
 
 
 class OutputMinioTypedDict(TypedDict):
+    type: OutputMinioType
     endpoint: str
     r"""MinIO service url (e.g. http://minioHost:9000)"""
     bucket: str
     r"""Name of the destination MinIO bucket. This value can be a constant or a JavaScript expression that can only be evaluated at init time. Example referencing a Global Variable: `myBucket-${C.vars.myVar}`"""
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputMinioType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -225,6 +225,8 @@ class OutputMinioTypedDict(TypedDict):
 
 
 class OutputMinio(BaseModel):
+    type: OutputMinioType
+
     endpoint: str
     r"""MinIO service url (e.g. http://minioHost:9000)"""
 
@@ -234,8 +236,6 @@ class OutputMinio(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputMinioType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputmsk.py

@@ -332,6 +332,7 @@ class OutputMskPqControls(BaseModel):
 
 
 class OutputMskTypedDict(TypedDict):
+    type: OutputMskType
     brokers: List[str]
     r"""Enter each Kafka bootstrap server you want to use. Specify hostname and port, e.g., mykafkabroker:9092, or just hostname, in which case @{product} will assign port 9092."""
     topic: str
@@ -340,7 +341,6 @@ class OutputMskTypedDict(TypedDict):
     r"""Region where the MSK cluster is located"""
     id: NotRequired[str]
     r"""Unique ID for this output"""
-    type: NotRequired[OutputMskType]
     pipeline: NotRequired[str]
     r"""Pipeline to process data before sending out to this output"""
     system_fields: NotRequired[List[str]]
@@ -424,6 +424,8 @@ class OutputMskTypedDict(TypedDict):
 
 
 class OutputMsk(BaseModel):
+    type: OutputMskType
+
     brokers: List[str]
     r"""Enter each Kafka bootstrap server you want to use. Specify hostname and port, e.g., mykafkabroker:9092, or just hostname, in which case @{product} will assign port 9092."""
 
@@ -436,8 +438,6 @@ class OutputMsk(BaseModel):
     id: Optional[str] = None
     r"""Unique ID for this output"""
 
-    type: Optional[OutputMskType] = None
-
     pipeline: Optional[str] = None
     r"""Pipeline to process data before sending out to this output"""
 

cribl_control_plane/models/outputnewrelic.py

@@ -159,9 +159,9 @@ class OutputNewrelicPqControls(BaseModel):
 
 
 class OutputNewrelicTypedDict(TypedDict):
-    id: str
-    r"""Unique ID for this output"""
     type: OutputNewrelicType
+    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]]
@@ -238,11 +238,11 @@ class OutputNewrelicTypedDict(TypedDict):
 
 
 class OutputNewrelic(BaseModel):
-    id: str
-    r"""Unique ID for this output"""
-
     type: OutputNewrelicType
 
+    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"""