cribl-control-plane 0.2.0a1__tar.gz → 0.2.0b2__tar.gz

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cribl-control-plane
-Version: 0.2.0a1
+Version: 0.2.0b2
 Summary: Python Client SDK Generated by Speakeasy.
 Author: Speakeasy
 Requires-Python: >=3.9.2

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "cribl-control-plane"
-version = "0.2.0a1"
+version = "0.2.0b2"
 description = "Python Client SDK Generated by Speakeasy."
 authors = [{ name = "Speakeasy" },]
 readme = "README-PYPI.md"

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/src/cribl_control_plane/_version.py

@@ -3,10 +3,10 @@
 import importlib.metadata
 
 __title__: str = "cribl-control-plane"
-__version__: str = "0.2.0a1"
-__openapi_doc_version__: str = "4.14.1-alpha.1760352614113-66cf8b7e"
+__version__: str = "0.2.0b2"
+__openapi_doc_version__: str = "4.15.0-alpha.1760439571529-8891ea6f"
 __gen_version__: str = "2.723.11"
-__user_agent__: str = "speakeasy-sdk/python 0.2.0a1 2.723.11 4.14.1-alpha.1760352614113-66cf8b7e cribl-control-plane"
+__user_agent__: str = "speakeasy-sdk/python 0.2.0b2 2.723.11 4.15.0-alpha.1760439571529-8891ea6f cribl-control-plane"
 
 try:
     if __package__ is not None:

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/src/cribl_control_plane/groups_sdk.py

@@ -224,7 +224,7 @@ class GroupsSDK(BaseSDK):
         config_version: Optional[str] = None,
         deploying_worker_count: Optional[float] = None,
         description: Optional[str] = None,
-        estimated_ingest_rate: Optional[float] = None,
+        estimated_ingest_rate: Optional[models.EstimatedIngestRate] = None,
         git: Optional[Union[models.Git, models.GitTypedDict]] = None,
         incompatible_worker_count: Optional[float] = None,
         inherits: Optional[str] = None,
@@ -395,7 +395,7 @@ class GroupsSDK(BaseSDK):
         config_version: Optional[str] = None,
         deploying_worker_count: Optional[float] = None,
         description: Optional[str] = None,
-        estimated_ingest_rate: Optional[float] = None,
+        estimated_ingest_rate: Optional[models.EstimatedIngestRate] = None,
         git: Optional[Union[models.Git, models.GitTypedDict]] = None,
         incompatible_worker_count: Optional[float] = None,
         inherits: Optional[str] = None,
@@ -757,7 +757,7 @@ class GroupsSDK(BaseSDK):
         config_version: Optional[str] = None,
         deploying_worker_count: Optional[float] = None,
         description: Optional[str] = None,
-        estimated_ingest_rate: Optional[float] = None,
+        estimated_ingest_rate: Optional[models.EstimatedIngestRate] = None,
         git: Optional[Union[models.Git, models.GitTypedDict]] = None,
         incompatible_worker_count: Optional[float] = None,
         inherits: Optional[str] = None,
@@ -931,7 +931,7 @@ class GroupsSDK(BaseSDK):
         config_version: Optional[str] = None,
         deploying_worker_count: Optional[float] = None,
         description: Optional[str] = None,
-        estimated_ingest_rate: Optional[float] = None,
+        estimated_ingest_rate: Optional[models.EstimatedIngestRate] = None,
         git: Optional[Union[models.Git, models.GitTypedDict]] = None,
         incompatible_worker_count: Optional[float] = None,
         inherits: Optional[str] = None,

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/src/cribl_control_plane/models/__init__.py

@@ -12,7 +12,6 @@ if TYPE_CHECKING:
         AddHecTokenRequestMetadatumTypedDict,
         AddHecTokenRequestTypedDict,
     )
-    from .appmode import AppMode
     from .authtoken import AuthToken, AuthTokenTypedDict
     from .branchinfo import BranchInfo, BranchInfoTypedDict
     from .cacheconnection import CacheConnection, CacheConnectionTypedDict
@@ -23,6 +22,7 @@ if TYPE_CHECKING:
         ConfigGroup,
         ConfigGroupType,
         ConfigGroupTypedDict,
+        EstimatedIngestRate,
         Git,
         GitTypedDict,
     )
@@ -361,7 +361,13 @@ if TYPE_CHECKING:
         Renamed,
         RenamedTypedDict,
     )
-    from .hbcriblinfo import Config, ConfigTypedDict, HBCriblInfo, HBCriblInfoTypedDict
+    from .hbcriblinfo import (
+        Config,
+        ConfigTypedDict,
+        DistMode,
+        HBCriblInfo,
+        HBCriblInfoTypedDict,
+    )
     from .hbleaderinfo import HBLeaderInfo, HBLeaderInfoTypedDict
     from .healthstatus import HealthStatus, HealthStatusTypedDict, Role, Status
     from .heartbeatmetadata import (
@@ -468,7 +474,6 @@ if TYPE_CHECKING:
         InputConfluentCloudPqControlsTypedDict,
         InputConfluentCloudPqTypedDict,
         InputConfluentCloudSASLMechanism,
-        InputConfluentCloudSchemaType,
         InputConfluentCloudTLSSettingsClientSide,
         InputConfluentCloudTLSSettingsClientSideTypedDict,
         InputConfluentCloudType,
@@ -927,7 +932,6 @@ if TYPE_CHECKING:
         InputKafkaPqControlsTypedDict,
         InputKafkaPqTypedDict,
         InputKafkaSASLMechanism,
-        InputKafkaSchemaType,
         InputKafkaTLSSettingsClientSide,
         InputKafkaTLSSettingsClientSideTypedDict,
         InputKafkaType,
@@ -1095,7 +1099,6 @@ if TYPE_CHECKING:
         InputMskPqControls,
         InputMskPqControlsTypedDict,
         InputMskPqTypedDict,
-        InputMskSchemaType,
         InputMskSignatureVersion,
         InputMskTLSSettingsClientSide,
         InputMskTLSSettingsClientSideTypedDict,
@@ -2011,7 +2014,6 @@ if TYPE_CHECKING:
         OutputConfluentCloudQueueFullBehavior,
         OutputConfluentCloudRecordDataFormat,
         OutputConfluentCloudSASLMechanism,
-        OutputConfluentCloudSchemaType,
         OutputConfluentCloudTLSSettingsClientSide,
         OutputConfluentCloudTLSSettingsClientSideTypedDict,
         OutputConfluentCloudType,
@@ -2094,6 +2096,15 @@ if TYPE_CHECKING:
         OutputCrowdstrikeNextGenSiemType,
         OutputCrowdstrikeNextGenSiemTypedDict,
     )
+    from .outputdatabricks import (
+        OutputDatabricks,
+        OutputDatabricksAuthenticationMethod,
+        OutputDatabricksBackpressureBehavior,
+        OutputDatabricksDataFormat,
+        OutputDatabricksDiskSpaceProtection,
+        OutputDatabricksType,
+        OutputDatabricksTypedDict,
+    )
     from .outputdatadog import (
         DatadogSite,
         OutputDatadog,
@@ -2512,7 +2523,6 @@ if TYPE_CHECKING:
         OutputKafkaQueueFullBehavior,
         OutputKafkaRecordDataFormat,
         OutputKafkaSASLMechanism,
-        OutputKafkaSchemaType,
         OutputKafkaTLSSettingsClientSide,
         OutputKafkaTLSSettingsClientSideTypedDict,
         OutputKafkaType,
@@ -2595,7 +2605,6 @@ if TYPE_CHECKING:
         OutputMskPqControlsTypedDict,
         OutputMskQueueFullBehavior,
         OutputMskRecordDataFormat,
-        OutputMskSchemaType,
         OutputMskSignatureVersion,
         OutputMskTLSSettingsClientSide,
         OutputMskTLSSettingsClientSideTypedDict,
@@ -3154,7 +3163,6 @@ if TYPE_CHECKING:
     from .productscore import ProductsCore
     from .rbacresource import RbacResource
     from .resourcepolicy import ResourcePolicy, ResourcePolicyTypedDict
-    from .routecloneconf import RouteCloneConf, RouteCloneConfTypedDict
     from .routeconf import RouteConf, RouteConfTypedDict
     from .routes import (
         Comment,
@@ -3315,7 +3323,6 @@ __all__ = [
     "AdditionalPropertyTypedDict",
     "Allow",
     "AllowTypedDict",
-    "AppMode",
     "Audit",
     "AuditTypedDict",
     "AuthToken",
@@ -3466,6 +3473,7 @@ __all__ = [
     "DiffFilesTypedDict",
     "DisksAndFileSystems",
     "DisksAndFileSystemsTypedDict",
+    "DistMode",
     "DistributedSummary",
     "DistributedSummaryGroups",
     "DistributedSummaryGroupsTypedDict",
@@ -3484,6 +3492,7 @@ __all__ = [
     "EndpointType",
     "Error",
     "ErrorTypedDict",
+    "EstimatedIngestRate",
     "EventFormat",
     "Executor",
     "ExecutorSpecificSettings",
@@ -3735,7 +3744,6 @@ __all__ = [
     "InputConfluentCloudPqControlsTypedDict",
     "InputConfluentCloudPqTypedDict",
     "InputConfluentCloudSASLMechanism",
-    "InputConfluentCloudSchemaType",
     "InputConfluentCloudTLSSettingsClientSide",
     "InputConfluentCloudTLSSettingsClientSideTypedDict",
     "InputConfluentCloudType",
@@ -4125,7 +4133,6 @@ __all__ = [
     "InputKafkaPqControlsTypedDict",
     "InputKafkaPqTypedDict",
     "InputKafkaSASLMechanism",
-    "InputKafkaSchemaType",
     "InputKafkaTLSSettingsClientSide",
     "InputKafkaTLSSettingsClientSideTypedDict",
     "InputKafkaType",
@@ -4275,7 +4282,6 @@ __all__ = [
     "InputMskPqControls",
     "InputMskPqControlsTypedDict",
     "InputMskPqTypedDict",
-    "InputMskSchemaType",
     "InputMskSignatureVersion",
     "InputMskTLSSettingsClientSide",
     "InputMskTLSSettingsClientSideTypedDict",
@@ -5092,7 +5098,6 @@ __all__ = [
     "OutputConfluentCloudQueueFullBehavior",
     "OutputConfluentCloudRecordDataFormat",
     "OutputConfluentCloudSASLMechanism",
-    "OutputConfluentCloudSchemaType",
     "OutputConfluentCloudTLSSettingsClientSide",
     "OutputConfluentCloudTLSSettingsClientSideTypedDict",
     "OutputConfluentCloudType",
@@ -5165,6 +5170,13 @@ __all__ = [
     "OutputCrowdstrikeNextGenSiemTimeoutRetrySettingsTypedDict",
     "OutputCrowdstrikeNextGenSiemType",
     "OutputCrowdstrikeNextGenSiemTypedDict",
+    "OutputDatabricks",
+    "OutputDatabricksAuthenticationMethod",
+    "OutputDatabricksBackpressureBehavior",
+    "OutputDatabricksDataFormat",
+    "OutputDatabricksDiskSpaceProtection",
+    "OutputDatabricksType",
+    "OutputDatabricksTypedDict",
     "OutputDatadog",
     "OutputDatadogAuthenticationMethod",
     "OutputDatadogBackpressureBehavior",
@@ -5530,7 +5542,6 @@ __all__ = [
     "OutputKafkaQueueFullBehavior",
     "OutputKafkaRecordDataFormat",
     "OutputKafkaSASLMechanism",
-    "OutputKafkaSchemaType",
     "OutputKafkaTLSSettingsClientSide",
     "OutputKafkaTLSSettingsClientSideTypedDict",
     "OutputKafkaType",
@@ -5605,7 +5616,6 @@ __all__ = [
     "OutputMskPqControlsTypedDict",
     "OutputMskQueueFullBehavior",
     "OutputMskRecordDataFormat",
-    "OutputMskSchemaType",
     "OutputMskSignatureVersion",
     "OutputMskTLSSettingsClientSide",
     "OutputMskTLSSettingsClientSideTypedDict",
@@ -6112,8 +6122,6 @@ __all__ = [
     "ResourceTypeLabel",
     "ResourceTypeLabelTypedDict",
     "Role",
-    "RouteCloneConf",
-    "RouteCloneConfTypedDict",
     "RouteConf",
     "RouteConfTypedDict",
     "Routes",
@@ -6264,7 +6272,6 @@ _dynamic_imports: dict[str, str] = {
     "AddHecTokenRequestMetadatum": ".addhectokenrequest",
     "AddHecTokenRequestMetadatumTypedDict": ".addhectokenrequest",
     "AddHecTokenRequestTypedDict": ".addhectokenrequest",
-    "AppMode": ".appmode",
     "AuthToken": ".authtoken",
     "AuthTokenTypedDict": ".authtoken",
     "BranchInfo": ".branchinfo",
@@ -6278,6 +6285,7 @@ _dynamic_imports: dict[str, str] = {
     "ConfigGroup": ".configgroup",
     "ConfigGroupType": ".configgroup",
     "ConfigGroupTypedDict": ".configgroup",
+    "EstimatedIngestRate": ".configgroup",
     "Git": ".configgroup",
     "GitTypedDict": ".configgroup",
     "ConfigGroupCloud": ".configgroupcloud",
@@ -6538,6 +6546,7 @@ _dynamic_imports: dict[str, str] = {
     "RenamedTypedDict": ".gitstatusresult",
     "Config": ".hbcriblinfo",
     "ConfigTypedDict": ".hbcriblinfo",
+    "DistMode": ".hbcriblinfo",
     "HBCriblInfo": ".hbcriblinfo",
     "HBCriblInfoTypedDict": ".hbcriblinfo",
     "HBLeaderInfo": ".hbleaderinfo",
@@ -6642,7 +6651,6 @@ _dynamic_imports: dict[str, str] = {
     "InputConfluentCloudPqControlsTypedDict": ".inputconfluentcloud",
     "InputConfluentCloudPqTypedDict": ".inputconfluentcloud",
     "InputConfluentCloudSASLMechanism": ".inputconfluentcloud",
-    "InputConfluentCloudSchemaType": ".inputconfluentcloud",
     "InputConfluentCloudTLSSettingsClientSide": ".inputconfluentcloud",
     "InputConfluentCloudTLSSettingsClientSideTypedDict": ".inputconfluentcloud",
     "InputConfluentCloudType": ".inputconfluentcloud",
@@ -7061,7 +7069,6 @@ _dynamic_imports: dict[str, str] = {
     "InputKafkaPqControlsTypedDict": ".inputkafka",
     "InputKafkaPqTypedDict": ".inputkafka",
     "InputKafkaSASLMechanism": ".inputkafka",
-    "InputKafkaSchemaType": ".inputkafka",
     "InputKafkaTLSSettingsClientSide": ".inputkafka",
     "InputKafkaTLSSettingsClientSideTypedDict": ".inputkafka",
     "InputKafkaType": ".inputkafka",
@@ -7213,7 +7220,6 @@ _dynamic_imports: dict[str, str] = {
     "InputMskPqControls": ".inputmsk",
     "InputMskPqControlsTypedDict": ".inputmsk",
     "InputMskPqTypedDict": ".inputmsk",
-    "InputMskSchemaType": ".inputmsk",
     "InputMskSignatureVersion": ".inputmsk",
     "InputMskTLSSettingsClientSide": ".inputmsk",
     "InputMskTLSSettingsClientSideTypedDict": ".inputmsk",
@@ -8059,7 +8065,6 @@ _dynamic_imports: dict[str, str] = {
     "OutputConfluentCloudQueueFullBehavior": ".outputconfluentcloud",
     "OutputConfluentCloudRecordDataFormat": ".outputconfluentcloud",
     "OutputConfluentCloudSASLMechanism": ".outputconfluentcloud",
-    "OutputConfluentCloudSchemaType": ".outputconfluentcloud",
     "OutputConfluentCloudTLSSettingsClientSide": ".outputconfluentcloud",
     "OutputConfluentCloudTLSSettingsClientSideTypedDict": ".outputconfluentcloud",
     "OutputConfluentCloudType": ".outputconfluentcloud",
@@ -8133,6 +8138,13 @@ _dynamic_imports: dict[str, str] = {
     "OutputCrowdstrikeNextGenSiemTimeoutRetrySettingsTypedDict": ".outputcrowdstrikenextgensiem",
     "OutputCrowdstrikeNextGenSiemType": ".outputcrowdstrikenextgensiem",
     "OutputCrowdstrikeNextGenSiemTypedDict": ".outputcrowdstrikenextgensiem",
+    "OutputDatabricks": ".outputdatabricks",
+    "OutputDatabricksAuthenticationMethod": ".outputdatabricks",
+    "OutputDatabricksBackpressureBehavior": ".outputdatabricks",
+    "OutputDatabricksDataFormat": ".outputdatabricks",
+    "OutputDatabricksDiskSpaceProtection": ".outputdatabricks",
+    "OutputDatabricksType": ".outputdatabricks",
+    "OutputDatabricksTypedDict": ".outputdatabricks",
     "DatadogSite": ".outputdatadog",
     "OutputDatadog": ".outputdatadog",
     "OutputDatadogAuthenticationMethod": ".outputdatadog",
@@ -8516,7 +8528,6 @@ _dynamic_imports: dict[str, str] = {
     "OutputKafkaQueueFullBehavior": ".outputkafka",
     "OutputKafkaRecordDataFormat": ".outputkafka",
     "OutputKafkaSASLMechanism": ".outputkafka",
-    "OutputKafkaSchemaType": ".outputkafka",
     "OutputKafkaTLSSettingsClientSide": ".outputkafka",
     "OutputKafkaTLSSettingsClientSideTypedDict": ".outputkafka",
     "OutputKafkaType": ".outputkafka",
@@ -8591,7 +8602,6 @@ _dynamic_imports: dict[str, str] = {
     "OutputMskPqControlsTypedDict": ".outputmsk",
     "OutputMskQueueFullBehavior": ".outputmsk",
     "OutputMskRecordDataFormat": ".outputmsk",
-    "OutputMskSchemaType": ".outputmsk",
     "OutputMskSignatureVersion": ".outputmsk",
     "OutputMskTLSSettingsClientSide": ".outputmsk",
     "OutputMskTLSSettingsClientSideTypedDict": ".outputmsk",
@@ -9087,8 +9097,6 @@ _dynamic_imports: dict[str, str] = {
     "RbacResource": ".rbacresource",
     "ResourcePolicy": ".resourcepolicy",
     "ResourcePolicyTypedDict": ".resourcepolicy",
-    "RouteCloneConf": ".routecloneconf",
-    "RouteCloneConfTypedDict": ".routecloneconf",
     "RouteConf": ".routeconf",
     "RouteConfTypedDict": ".routeconf",
     "Comment": ".routes",

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/src/cribl_control_plane/models/configgroup.py

@@ -14,6 +14,18 @@ from typing import List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
+class EstimatedIngestRate(int, Enum, metaclass=utils.OpenEnumMeta):
+    ONE_THOUSAND_AND_TWENTY_FOUR = 1024
+    FOUR_THOUSAND_AND_NINETY_SIX = 4096
+    TEN_THOUSAND_TWO_HUNDRED_AND_FORTY = 10240
+    TWO_THOUSAND_AND_FORTY_EIGHT = 2048
+    THREE_THOUSAND_AND_SEVENTY_TWO = 3072
+    FIVE_THOUSAND_ONE_HUNDRED_AND_TWENTY = 5120
+    SEVEN_THOUSAND_ONE_HUNDRED_AND_SIXTY_EIGHT = 7168
+    THIRTEEN_THOUSAND_THREE_HUNDRED_AND_TWELVE = 13312
+    FIFTEEN_THOUSAND_THREE_HUNDRED_AND_SIXTY = 15360
+
+
 class GitTypedDict(TypedDict):
     commit: NotRequired[str]
     local_changes: NotRequired[float]
@@ -40,7 +52,7 @@ class ConfigGroupTypedDict(TypedDict):
     config_version: NotRequired[str]
     deploying_worker_count: NotRequired[float]
     description: NotRequired[str]
-    estimated_ingest_rate: NotRequired[float]
+    estimated_ingest_rate: NotRequired[EstimatedIngestRate]
     git: NotRequired[GitTypedDict]
     incompatible_worker_count: NotRequired[float]
     inherits: NotRequired[str]
@@ -75,7 +87,10 @@ class ConfigGroup(BaseModel):
     description: Optional[str] = None
 
     estimated_ingest_rate: Annotated[
-        Optional[float], pydantic.Field(alias="estimatedIngestRate")
+        Annotated[
+            Optional[EstimatedIngestRate], PlainValidator(validate_open_enum(True))
+        ],
+        pydantic.Field(alias="estimatedIngestRate"),
     ] = None
 
     git: Optional[Git] = None

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/src/cribl_control_plane/models/createversionundoop.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from cribl_control_plane.types import BaseModel
 from cribl_control_plane.utils import FieldMetadata, QueryParamMetadata
 import pydantic
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
@@ -27,7 +27,7 @@ class CreateVersionUndoResponseTypedDict(TypedDict):
 
     count: NotRequired[int]
     r"""number of items present in the items array"""
-    items: NotRequired[List[str]]
+    items: NotRequired[List[Dict[str, Any]]]
 
 
 class CreateVersionUndoResponse(BaseModel):
@@ -36,4 +36,4 @@ class CreateVersionUndoResponse(BaseModel):
     count: Optional[int] = None
     r"""number of items present in the items array"""
 
-    items: Optional[List[str]] = None
+    items: Optional[List[Dict[str, Any]]] = None

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/src/cribl_control_plane/models/distributedsummary.py

@@ -9,7 +9,9 @@ from typing_extensions import Annotated, TypedDict
 class DistributedSummaryGroupsTypedDict(TypedDict):
     count: float
     destinations: float
+    packs: float
     pipelines: float
+    quick_connects: float
     routes: float
     sources: float
 
@@ -19,8 +21,12 @@ class DistributedSummaryGroups(BaseModel):
 
     destinations: float
 
+    packs: float
+
     pipelines: float
 
+    quick_connects: Annotated[float, pydantic.Field(alias="quickConnects")]
+
     routes: float
 
     sources: float

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/src/cribl_control_plane/models/hbcriblinfo.py

@@ -1,11 +1,12 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from .appmode import AppMode
 from .hbleaderinfo import HBLeaderInfo, HBLeaderInfoTypedDict
 from .lookupversions import LookupVersions, LookupVersionsTypedDict
+from cribl_control_plane import utils
 from cribl_control_plane.types import BaseModel
 from cribl_control_plane.utils import validate_open_enum
+from enum import Enum
 import pydantic
 from pydantic.functional_validators import PlainValidator
 from typing import List, Optional
@@ -36,9 +37,19 @@ class Config(BaseModel):
     version: Optional[str] = None
 
 
+class DistMode(str, Enum, metaclass=utils.OpenEnumMeta):
+    EDGE = "edge"
+    WORKER = "worker"
+    SINGLE = "single"
+    MASTER = "master"
+    MANAGED_EDGE = "managed-edge"
+    OUTPOST = "outpost"
+    SEARCH_SUPERVISOR = "search-supervisor"
+
+
 class HBCriblInfoTypedDict(TypedDict):
     config: ConfigTypedDict
-    dist_mode: AppMode
+    dist_mode: DistMode
     group: str
     guid: str
     start_time: float
@@ -58,7 +69,7 @@ class HBCriblInfo(BaseModel):
     config: Config
 
     dist_mode: Annotated[
-        Annotated[AppMode, PlainValidator(validate_open_enum(False))],
+        Annotated[DistMode, PlainValidator(validate_open_enum(False))],
         pydantic.Field(alias="distMode"),
     ]
 

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/src/cribl_control_plane/models/heartbeatmetadata.py

@@ -17,6 +17,7 @@ class HeartbeatMetadataTags(BaseModel):
 
 class HeartbeatMetadataAwsTypedDict(TypedDict):
     enabled: bool
+    instance_id: str
     region: str
     type: str
     zone: str
@@ -26,6 +27,8 @@ class HeartbeatMetadataAwsTypedDict(TypedDict):
 class HeartbeatMetadataAws(BaseModel):
     enabled: bool
 
+    instance_id: Annotated[str, pydantic.Field(alias="instanceId")]
+
     region: str
 
     type: str

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/src/cribl_control_plane/models/input.py

@@ -66,8 +66,10 @@ from .inputwineventlogs import InputWinEventLogs, InputWinEventLogsTypedDict
 from .inputwiz import InputWiz, InputWizTypedDict
 from .inputwizwebhook import InputWizWebhook, InputWizWebhookTypedDict
 from .inputzscalerhec import InputZscalerHec, InputZscalerHecTypedDict
+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
 
 
 InputTypedDict = TypeAliasType(
@@ -136,67 +138,67 @@ InputTypedDict = TypeAliasType(
 )
 
 
-Input = TypeAliasType(
-    "Input",
+Input = Annotated[
     Union[
-        InputDatagen,
-        InputKubeEvents,
-        InputCribl,
-        InputCriblmetrics,
-        InputKubeMetrics,
-        InputCollection,
-        InputSystemState,
-        InputModelDrivenTelemetry,
-        InputSystemMetrics,
-        InputWindowsMetrics,
-        InputJournalFiles,
-        InputWinEventLogs,
-        InputRawUDP,
-        InputExec,
-        InputKubeLogs,
-        InputMetrics,
-        InputSnmp,
-        InputCriblTCP,
-        InputNetflow,
-        InputTcpjson,
-        InputGooglePubsub,
-        InputOffice365Service,
-        InputWiz,
-        InputTCP,
-        InputFirehose,
-        InputCriblHTTP,
-        InputDatadogAgent,
-        InputOffice365Mgmt,
-        InputFile,
-        InputSplunk,
-        InputWef,
-        InputAppscope,
-        InputHTTPRaw,
-        InputWizWebhook,
-        InputHTTP,
-        InputCriblLakeHTTP,
-        InputAzureBlob,
-        InputSqs,
-        InputZscalerHec,
-        InputKinesis,
-        InputConfluentCloud,
-        InputEventhub,
-        InputKafka,
-        InputElastic,
-        InputOffice365MsgTrace,
-        InputSplunkHec,
-        InputLoki,
-        InputPrometheusRw,
-        InputPrometheus,
-        InputCrowdstrike,
-        InputEdgePrometheus,
-        InputOpenTelemetry,
-        InputS3,
-        InputSecurityLake,
-        InputMsk,
-        InputS3Inventory,
-        InputSplunkSearch,
-        InputSyslog,
-        InputGrafana,
+        Annotated[InputCollection, Tag("collection")],
+        Annotated[InputKafka, Tag("kafka")],
+        Annotated[InputMsk, Tag("msk")],
+        Annotated[InputHTTP, Tag("http")],
+        Annotated[InputSplunk, Tag("splunk")],
+        Annotated[InputSplunkSearch, Tag("splunk_search")],
+        Annotated[InputSplunkHec, Tag("splunk_hec")],
+        Annotated[InputAzureBlob, Tag("azure_blob")],
+        Annotated[InputElastic, Tag("elastic")],
+        Annotated[InputConfluentCloud, Tag("confluent_cloud")],
+        Annotated[InputGrafana, Tag("grafana")],
+        Annotated[InputLoki, Tag("loki")],
+        Annotated[InputPrometheusRw, Tag("prometheus_rw")],
+        Annotated[InputPrometheus, Tag("prometheus")],
+        Annotated[InputEdgePrometheus, Tag("edge_prometheus")],
+        Annotated[InputOffice365Mgmt, Tag("office365_mgmt")],
+        Annotated[InputOffice365Service, Tag("office365_service")],
+        Annotated[InputOffice365MsgTrace, Tag("office365_msg_trace")],
+        Annotated[InputEventhub, Tag("eventhub")],
+        Annotated[InputExec, Tag("exec")],
+        Annotated[InputFirehose, Tag("firehose")],
+        Annotated[InputGooglePubsub, Tag("google_pubsub")],
+        Annotated[InputCribl, Tag("cribl")],
+        Annotated[InputCriblTCP, Tag("cribl_tcp")],
+        Annotated[InputCriblHTTP, Tag("cribl_http")],
+        Annotated[InputCriblLakeHTTP, Tag("cribl_lake_http")],
+        Annotated[InputTcpjson, Tag("tcpjson")],
+        Annotated[InputSystemMetrics, Tag("system_metrics")],
+        Annotated[InputSystemState, Tag("system_state")],
+        Annotated[InputKubeMetrics, Tag("kube_metrics")],
+        Annotated[InputKubeLogs, Tag("kube_logs")],
+        Annotated[InputKubeEvents, Tag("kube_events")],
+        Annotated[InputWindowsMetrics, Tag("windows_metrics")],
+        Annotated[InputCrowdstrike, Tag("crowdstrike")],
+        Annotated[InputDatadogAgent, Tag("datadog_agent")],
+        Annotated[InputDatagen, Tag("datagen")],
+        Annotated[InputHTTPRaw, Tag("http_raw")],
+        Annotated[InputKinesis, Tag("kinesis")],
+        Annotated[InputCriblmetrics, Tag("criblmetrics")],
+        Annotated[InputMetrics, Tag("metrics")],
+        Annotated[InputS3, Tag("s3")],
+        Annotated[InputS3Inventory, Tag("s3_inventory")],
+        Annotated[InputSnmp, Tag("snmp")],
+        Annotated[InputOpenTelemetry, Tag("open_telemetry")],
+        Annotated[InputModelDrivenTelemetry, Tag("model_driven_telemetry")],
+        Annotated[InputSqs, Tag("sqs")],
+        Annotated[InputSyslog, Tag("syslog")],
+        Annotated[InputFile, Tag("file")],
+        Annotated[InputTCP, Tag("tcp")],
+        Annotated[InputAppscope, Tag("appscope")],
+        Annotated[InputWef, Tag("wef")],
+        Annotated[InputWinEventLogs, Tag("win_event_logs")],
+        Annotated[InputRawUDP, Tag("raw_udp")],
+        Annotated[InputJournalFiles, Tag("journal_files")],
+        Annotated[InputWiz, Tag("wiz")],
+        Annotated[InputWizWebhook, Tag("wiz_webhook")],
+        Annotated[InputNetflow, Tag("netflow")],
+        Annotated[InputSecurityLake, Tag("security_lake")],
+        Annotated[InputZscalerHec, Tag("zscaler_hec")],
     ],
-)
+    Discriminator(lambda m: get_discriminator(m, "type", "type")),
+]

{cribl_control_plane-0.2.0a1 → cribl_control_plane-0.2.0b2}/src/cribl_control_plane/models/inputappscope.py

@@ -29,14 +29,18 @@ class InputAppscopeConnection(BaseModel):
 class InputAppscopeMode(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 InputAppscopeCompression(str, Enum, metaclass=utils.OpenEnumMeta):
     r"""Codec to use to compress the persisted data"""
 
+    # None
     NONE = "none"
+    # Gzip
     GZIP = "gzip"