cribl-control-plane 0.0.50rc1__py3-none-any.whl → 0.0.50rc2__py3-none-any.whl

cribl_control_plane/models/inputkafka.py

@@ -103,13 +103,6 @@ class InputKafkaPq(BaseModel):
     ] = None
 
 
-class InputKafkaSchemaType(str, Enum, metaclass=utils.OpenEnumMeta):
-    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"""
 
@@ -220,8 +213,6 @@ 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]
@@ -241,14 +232,6 @@ 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[
-        Annotated[
-            Optional[InputKafkaSchemaType], PlainValidator(validate_open_enum(False))
-        ],
-        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

cribl_control_plane/models/inputmsk.py

@@ -116,13 +116,6 @@ class InputMskMetadatum(BaseModel):
     r"""JavaScript expression to compute field's value, enclosed in quotes or backticks. (Can evaluate to a constant.)"""
 
 
-class InputMskSchemaType(str, Enum, metaclass=utils.OpenEnumMeta):
-    r"""The schema format used to encode and decode event data"""
-
-    AVRO = "avro"
-    JSON = "json"
-
-
 class InputMskAuthTypedDict(TypedDict):
     r"""Credentials to use when authenticating with the schema registry using basic HTTP authentication"""
 
@@ -233,8 +226,6 @@ class InputMskKafkaSchemaRegistryAuthenticationTypedDict(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[InputMskSchemaType]
-    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]
@@ -254,14 +245,6 @@ class InputMskKafkaSchemaRegistryAuthentication(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[
-        Annotated[
-            Optional[InputMskSchemaType], PlainValidator(validate_open_enum(False))
-        ],
-        pydantic.Field(alias="schemaType"),
-    ] = InputMskSchemaType.AVRO
-    r"""The schema format used to encode and decode event data"""
-
     connection_timeout: Annotated[
         Optional[float], pydantic.Field(alias="connectionTimeout")
     ] = 30000

cribl_control_plane/models/jobinfo.py

@@ -4,14 +4,13 @@ from __future__ import annotations
 from .jobstatus import JobStatus, JobStatusTypedDict
 from .runnablejob import RunnableJob, RunnableJobTypedDict
 from cribl_control_plane.types import BaseModel
-from typing import Dict, Optional
+from typing import Optional
 from typing_extensions import NotRequired, TypedDict
 
 
 class JobInfoTypedDict(TypedDict):
     args: RunnableJobTypedDict
     id: str
-    stats: Dict[str, float]
     status: JobStatusTypedDict
     keep: NotRequired[bool]
 
@@ -21,8 +20,6 @@ class JobInfo(BaseModel):
 
     id: str
 
-    stats: Dict[str, float]
-
     status: JobStatus
 
     keep: Optional[bool] = None

cribl_control_plane/models/nodeprovidedinfo.py

@@ -5,7 +5,7 @@ from .hbcriblinfo import HBCriblInfo, HBCriblInfoTypedDict
 from .heartbeatmetadata import HeartbeatMetadata, HeartbeatMetadataTypedDict
 from cribl_control_plane.types import BaseModel
 import pydantic
-from typing import Dict, List, Optional, Union
+from typing import List, Optional, Union
 from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
 
 
@@ -19,6 +19,7 @@ class NodeProvidedInfoTags(BaseModel):
 
 class NodeProvidedInfoAwsTypedDict(TypedDict):
     enabled: bool
+    instance_id: str
     region: str
     type: str
     zone: str
@@ -28,6 +29,8 @@ class NodeProvidedInfoAwsTypedDict(TypedDict):
 class NodeProvidedInfoAws(BaseModel):
     enabled: bool
 
+    instance_id: Annotated[str, pydantic.Field(alias="instanceId")]
+
     region: str
 
     type: str
@@ -125,7 +128,6 @@ class NodeProvidedInfoTypedDict(TypedDict):
     architecture: str
     cpus: float
     cribl: HBCriblInfoTypedDict
-    env: Dict[str, str]
     free_disk_space: float
     hostname: str
     node: str
@@ -150,8 +152,6 @@ class NodeProvidedInfo(BaseModel):
 
     cribl: HBCriblInfo
 
-    env: Dict[str, str]
-
     free_disk_space: Annotated[float, pydantic.Field(alias="freeDiskSpace")]
 
     hostname: str

cribl_control_plane/models/output.py

@@ -18,6 +18,7 @@ from .outputcrowdstrikenextgensiem import (
     OutputCrowdstrikeNextGenSiem,
     OutputCrowdstrikeNextGenSiemTypedDict,
 )
+from .outputdatabricks import OutputDatabricks, OutputDatabricksTypedDict
 from .outputdatadog import OutputDatadog, OutputDatadogTypedDict
 from .outputdataset import OutputDataset, OutputDatasetTypedDict
 from .outputdefault import OutputDefault, OutputDefaultTypedDict
@@ -80,8 +81,10 @@ from .outputtcpjson import OutputTcpjson, OutputTcpjsonTypedDict
 from .outputwavefront import OutputWavefront, OutputWavefrontTypedDict
 from .outputwebhook import OutputWebhook, OutputWebhookTypedDict
 from .outputxsiam import OutputXsiam, OutputXsiamTypedDict
+from cribl_control_plane.utils import get_discriminator
+from pydantic import Discriminator, Tag
 from typing import Union
-from typing_extensions import TypeAliasType
+from typing_extensions import Annotated, TypeAliasType
 
 
 OutputTypedDict = TypeAliasType(
@@ -90,31 +93,32 @@ OutputTypedDict = TypeAliasType(
         OutputDevnullTypedDict,
         OutputDefaultTypedDict,
         OutputRouterTypedDict,
-        OutputSnmpTypedDict,
         OutputNetflowTypedDict,
+        OutputSnmpTypedDict,
         OutputDiskSpoolTypedDict,
         OutputRingTypedDict,
-        OutputStatsdExtTypedDict,
         OutputGraphiteTypedDict,
+        OutputStatsdExtTypedDict,
         OutputStatsdTypedDict,
         OutputGooglePubsubTypedDict,
-        OutputCriblTCPTypedDict,
         OutputSplunkTypedDict,
+        OutputCriblTCPTypedDict,
         OutputSnsTypedDict,
         OutputCloudwatchTypedDict,
         OutputAzureEventhubTypedDict,
-        OutputWavefrontTypedDict,
         OutputSignalfxTypedDict,
+        OutputWavefrontTypedDict,
         OutputHoneycombTypedDict,
-        OutputSumoLogicTypedDict,
-        OutputCrowdstrikeNextGenSiemTypedDict,
         OutputHumioHecTypedDict,
         OutputTcpjsonTypedDict,
+        OutputSumoLogicTypedDict,
+        OutputCrowdstrikeNextGenSiemTypedDict,
         OutputElasticCloudTypedDict,
-        OutputKinesisTypedDict,
-        OutputConfluentCloudTypedDict,
-        OutputKafkaTypedDict,
         OutputExabeamTypedDict,
+        OutputKafkaTypedDict,
+        OutputConfluentCloudTypedDict,
+        OutputKinesisTypedDict,
+        OutputDatabricksTypedDict,
         OutputNewrelicEventsTypedDict,
         OutputAzureLogsTypedDict,
         OutputSplunkLbTypedDict,
@@ -130,10 +134,10 @@ OutputTypedDict = TypeAliasType(
         OutputDynatraceHTTPTypedDict,
         OutputServiceNowTypedDict,
         OutputDynatraceOtlpTypedDict,
-        OutputElasticTypedDict,
         OutputGoogleChronicleTypedDict,
-        OutputCriblLakeTypedDict,
+        OutputElasticTypedDict,
         OutputDatadogTypedDict,
+        OutputCriblLakeTypedDict,
         OutputPrometheusTypedDict,
         OutputMskTypedDict,
         OutputSentinelOneAiSiemTypedDict,
@@ -155,72 +159,73 @@ OutputTypedDict = TypeAliasType(
 )
 
 
-Output = TypeAliasType(
-    "Output",
+Output = Annotated[
     Union[
-        OutputDevnull,
-        OutputDefault,
-        OutputRouter,
-        OutputSnmp,
-        OutputNetflow,
-        OutputDiskSpool,
-        OutputRing,
-        OutputStatsdExt,
-        OutputGraphite,
-        OutputStatsd,
-        OutputGooglePubsub,
-        OutputCriblTCP,
-        OutputSplunk,
-        OutputSns,
-        OutputCloudwatch,
-        OutputAzureEventhub,
-        OutputWavefront,
-        OutputSignalfx,
-        OutputHoneycomb,
-        OutputSumoLogic,
-        OutputCrowdstrikeNextGenSiem,
-        OutputHumioHec,
-        OutputTcpjson,
-        OutputElasticCloud,
-        OutputKinesis,
-        OutputConfluentCloud,
-        OutputKafka,
-        OutputExabeam,
-        OutputNewrelicEvents,
-        OutputAzureLogs,
-        OutputSplunkLb,
-        OutputSyslog,
-        OutputSqs,
-        OutputNewrelic,
-        OutputCriblHTTP,
-        OutputXsiam,
-        OutputFilesystem,
-        OutputDataset,
-        OutputLoki,
-        OutputSplunkHec,
-        OutputDynatraceHTTP,
-        OutputServiceNow,
-        OutputDynatraceOtlp,
-        OutputElastic,
-        OutputGoogleChronicle,
-        OutputCriblLake,
-        OutputDatadog,
-        OutputPrometheus,
-        OutputMsk,
-        OutputSentinelOneAiSiem,
-        OutputSentinel,
-        OutputInfluxdb,
-        OutputGoogleCloudStorage,
-        OutputAzureBlob,
-        OutputOpenTelemetry,
-        OutputMinio,
-        OutputClickHouse,
-        OutputSecurityLake,
-        OutputDlS3,
-        OutputS3,
-        OutputWebhook,
-        OutputAzureDataExplorer,
-        OutputGoogleCloudLogging,
-        OutputGrafanaCloud,
+        Annotated[OutputDefault, Tag("default")],
+        Annotated[OutputWebhook, Tag("webhook")],
+        Annotated[OutputSentinel, Tag("sentinel")],
+        Annotated[OutputDevnull, Tag("devnull")],
+        Annotated[OutputSyslog, Tag("syslog")],
+        Annotated[OutputSplunk, Tag("splunk")],
+        Annotated[OutputSplunkLb, Tag("splunk_lb")],
+        Annotated[OutputSplunkHec, Tag("splunk_hec")],
+        Annotated[OutputTcpjson, Tag("tcpjson")],
+        Annotated[OutputWavefront, Tag("wavefront")],
+        Annotated[OutputSignalfx, Tag("signalfx")],
+        Annotated[OutputFilesystem, Tag("filesystem")],
+        Annotated[OutputS3, Tag("s3")],
+        Annotated[OutputAzureBlob, Tag("azure_blob")],
+        Annotated[OutputAzureDataExplorer, Tag("azure_data_explorer")],
+        Annotated[OutputAzureLogs, Tag("azure_logs")],
+        Annotated[OutputKinesis, Tag("kinesis")],
+        Annotated[OutputHoneycomb, Tag("honeycomb")],
+        Annotated[OutputAzureEventhub, Tag("azure_eventhub")],
+        Annotated[OutputGoogleChronicle, Tag("google_chronicle")],
+        Annotated[OutputGoogleCloudStorage, Tag("google_cloud_storage")],
+        Annotated[OutputGoogleCloudLogging, Tag("google_cloud_logging")],
+        Annotated[OutputGooglePubsub, Tag("google_pubsub")],
+        Annotated[OutputExabeam, Tag("exabeam")],
+        Annotated[OutputKafka, Tag("kafka")],
+        Annotated[OutputConfluentCloud, Tag("confluent_cloud")],
+        Annotated[OutputMsk, Tag("msk")],
+        Annotated[OutputElastic, Tag("elastic")],
+        Annotated[OutputElasticCloud, Tag("elastic_cloud")],
+        Annotated[OutputNewrelic, Tag("newrelic")],
+        Annotated[OutputNewrelicEvents, Tag("newrelic_events")],
+        Annotated[OutputInfluxdb, Tag("influxdb")],
+        Annotated[OutputCloudwatch, Tag("cloudwatch")],
+        Annotated[OutputMinio, Tag("minio")],
+        Annotated[OutputStatsd, Tag("statsd")],
+        Annotated[OutputStatsdExt, Tag("statsd_ext")],
+        Annotated[OutputGraphite, Tag("graphite")],
+        Annotated[OutputRouter, Tag("router")],
+        Annotated[OutputSns, Tag("sns")],
+        Annotated[OutputSqs, Tag("sqs")],
+        Annotated[OutputSnmp, Tag("snmp")],
+        Annotated[OutputSumoLogic, Tag("sumo_logic")],
+        Annotated[OutputDatadog, Tag("datadog")],
+        Annotated[OutputGrafanaCloud, Tag("grafana_cloud")],
+        Annotated[OutputLoki, Tag("loki")],
+        Annotated[OutputPrometheus, Tag("prometheus")],
+        Annotated[OutputRing, Tag("ring")],
+        Annotated[OutputOpenTelemetry, Tag("open_telemetry")],
+        Annotated[OutputServiceNow, Tag("service_now")],
+        Annotated[OutputDataset, Tag("dataset")],
+        Annotated[OutputCriblTCP, Tag("cribl_tcp")],
+        Annotated[OutputCriblHTTP, Tag("cribl_http")],
+        Annotated[OutputHumioHec, Tag("humio_hec")],
+        Annotated[OutputCrowdstrikeNextGenSiem, Tag("crowdstrike_next_gen_siem")],
+        Annotated[OutputDlS3, Tag("dl_s3")],
+        Annotated[OutputSecurityLake, Tag("security_lake")],
+        Annotated[OutputCriblLake, Tag("cribl_lake")],
+        Annotated[OutputDiskSpool, Tag("disk_spool")],
+        Annotated[OutputClickHouse, Tag("click_house")],
+        Annotated[OutputXsiam, Tag("xsiam")],
+        Annotated[OutputNetflow, Tag("netflow")],
+        Annotated[OutputDynatraceHTTP, Tag("dynatrace_http")],
+        Annotated[OutputDynatraceOtlp, Tag("dynatrace_otlp")],
+        Annotated[OutputSentinelOneAiSiem, Tag("sentinel_one_ai_siem")],
+        Annotated[OutputDatabricks, Tag("databricks")],
     ],
-)
+    Discriminator(lambda m: get_discriminator(m, "type", "type")),
+]

cribl_control_plane/models/outputconfluentcloud.py

@@ -123,13 +123,6 @@ class OutputConfluentCloudCompression(str, Enum, metaclass=utils.OpenEnumMeta):
     LZ4 = "lz4"
 
 
-class OutputConfluentCloudSchemaType(str, Enum, metaclass=utils.OpenEnumMeta):
-    r"""The schema format used to encode and decode event data"""
-
-    AVRO = "avro"
-    JSON = "json"
-
-
 class OutputConfluentCloudAuthTypedDict(TypedDict):
     r"""Credentials to use when authenticating with the schema registry using basic HTTP authentication"""
 
@@ -240,8 +233,6 @@ class OutputConfluentCloudKafkaSchemaRegistryAuthenticationTypedDict(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[OutputConfluentCloudSchemaType]
-    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]
@@ -267,15 +258,6 @@ class OutputConfluentCloudKafkaSchemaRegistryAuthentication(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[
-        Annotated[
-            Optional[OutputConfluentCloudSchemaType],
-            PlainValidator(validate_open_enum(False)),
-        ],
-        pydantic.Field(alias="schemaType"),
-    ] = OutputConfluentCloudSchemaType.AVRO
-    r"""The schema format used to encode and decode event data"""
-
     connection_timeout: Annotated[
         Optional[float], pydantic.Field(alias="connectionTimeout")
     ] = 30000