cribl-control-plane 0.2.1rc4__py3-none-any.whl → 0.2.1rc6__py3-none-any.whl

cribl_control_plane/models/inputsplunk.py

@@ -7,7 +7,7 @@ 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
+from typing import Any, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
@@ -123,12 +123,6 @@ class InputSplunkMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputSplunkTLSSettingsServerSideTypedDict(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]
@@ -139,6 +133,10 @@ class InputSplunkTLSSettingsServerSideTypedDict(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[InputSplunkMinimumTLSVersion]
     max_version: NotRequired[InputSplunkMaximumTLSVersion]
 
@@ -146,19 +144,6 @@ class InputSplunkTLSSettingsServerSideTypedDict(TypedDict):
 class InputSplunkTLSSettingsServerSide(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
@@ -176,6 +161,17 @@ class InputSplunkTLSSettingsServerSide(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[
         Annotated[
             Optional[InputSplunkMinimumTLSVersion],

cribl_control_plane/models/inputsplunkhec.py

@@ -185,12 +185,6 @@ class InputSplunkHecMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputSplunkHecTLSSettingsServerSideTypedDict(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]
@@ -201,6 +195,10 @@ class InputSplunkHecTLSSettingsServerSideTypedDict(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[InputSplunkHecMinimumTLSVersion]
     max_version: NotRequired[InputSplunkHecMaximumTLSVersion]
 
@@ -208,19 +206,6 @@ class InputSplunkHecTLSSettingsServerSideTypedDict(TypedDict):
 class InputSplunkHecTLSSettingsServerSide(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
@@ -238,6 +223,17 @@ class InputSplunkHecTLSSettingsServerSide(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[
         Annotated[
             Optional[InputSplunkHecMinimumTLSVersion],

cribl_control_plane/models/inputsyslog.py

@@ -7,7 +7,7 @@ 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, Union
+from typing import Any, List, Optional, Union
 from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
 
 
@@ -123,12 +123,6 @@ class InputSyslogMaximumTLSVersion2(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputSyslogTLSSettingsServerSide2TypedDict(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]
@@ -139,6 +133,10 @@ class InputSyslogTLSSettingsServerSide2TypedDict(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[InputSyslogMinimumTLSVersion2]
     max_version: NotRequired[InputSyslogMaximumTLSVersion2]
 
@@ -146,19 +144,6 @@ class InputSyslogTLSSettingsServerSide2TypedDict(TypedDict):
 class InputSyslogTLSSettingsServerSide2(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
@@ -176,6 +161,17 @@ class InputSyslogTLSSettingsServerSide2(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[
         Annotated[
             Optional[InputSyslogMinimumTLSVersion2],
@@ -514,12 +510,6 @@ class InputSyslogMaximumTLSVersion1(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputSyslogTLSSettingsServerSide1TypedDict(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]
@@ -530,6 +520,10 @@ class InputSyslogTLSSettingsServerSide1TypedDict(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[InputSyslogMinimumTLSVersion1]
     max_version: NotRequired[InputSyslogMaximumTLSVersion1]
 
@@ -537,19 +531,6 @@ class InputSyslogTLSSettingsServerSide1TypedDict(TypedDict):
 class InputSyslogTLSSettingsServerSide1(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
@@ -567,6 +548,17 @@ class InputSyslogTLSSettingsServerSide1(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[
         Annotated[
             Optional[InputSyslogMinimumTLSVersion1],

cribl_control_plane/models/inputsystemmetrics.py

@@ -239,14 +239,12 @@ class InputSystemMetricsNetworkMode(str, Enum, metaclass=utils.OpenEnumMeta):
 class InputSystemMetricsNetworkTypedDict(TypedDict):
     mode: NotRequired[InputSystemMetricsNetworkMode]
     r"""Select the level of detail for network metrics"""
-    detail: NotRequired[bool]
-    r"""Generate full network metrics"""
-    protocols: NotRequired[bool]
-    r"""Generate protocol metrics for ICMP, ICMPMsg, IP, TCP, UDP and UDPLite"""
     devices: NotRequired[List[str]]
     r"""Network interfaces to include/exclude. Examples: eth0, !lo. All interfaces are included if this list is empty."""
     per_interface: NotRequired[bool]
     r"""Generate separate metrics for each interface"""
+    detail: NotRequired[bool]
+    r"""Generate full network metrics"""
 
 
 class InputSystemMetricsNetwork(BaseModel):
@@ -256,12 +254,6 @@ class InputSystemMetricsNetwork(BaseModel):
     ] = InputSystemMetricsNetworkMode.BASIC
     r"""Select the level of detail for network metrics"""
 
-    detail: Optional[bool] = False
-    r"""Generate full network metrics"""
-
-    protocols: Optional[bool] = False
-    r"""Generate protocol metrics for ICMP, ICMPMsg, IP, TCP, UDP and UDPLite"""
-
     devices: Optional[List[str]] = None
     r"""Network interfaces to include/exclude. Examples: eth0, !lo. All interfaces are included if this list is empty."""
 
@@ -270,6 +262,9 @@ class InputSystemMetricsNetwork(BaseModel):
     )
     r"""Generate separate metrics for each interface"""
 
+    detail: Optional[bool] = False
+    r"""Generate full network metrics"""
+
 
 class InputSystemMetricsDiskMode(str, Enum, metaclass=utils.OpenEnumMeta):
     r"""Select the level of detail for disk metrics"""
@@ -287,10 +282,6 @@ class InputSystemMetricsDiskMode(str, Enum, metaclass=utils.OpenEnumMeta):
 class InputSystemMetricsDiskTypedDict(TypedDict):
     mode: NotRequired[InputSystemMetricsDiskMode]
     r"""Select the level of detail for disk metrics"""
-    detail: NotRequired[bool]
-    r"""Generate full disk metrics"""
-    inodes: NotRequired[bool]
-    r"""Generate filesystem inode metrics"""
     devices: NotRequired[List[str]]
     r"""Block devices to include/exclude. Examples: sda*, !loop*. Wildcards and ! (not) operators are supported. All devices are included if this list is empty."""
     mountpoints: NotRequired[List[str]]
@@ -299,6 +290,8 @@ class InputSystemMetricsDiskTypedDict(TypedDict):
     r"""Filesystem types to include/exclude. Examples: ext4, !*tmpfs, !squashfs. Wildcards and ! (not) operators are supported. All types are included if this list is empty."""
     per_device: NotRequired[bool]
     r"""Generate separate metrics for each device"""
+    detail: NotRequired[bool]
+    r"""Generate full disk metrics"""
 
 
 class InputSystemMetricsDisk(BaseModel):
@@ -307,12 +300,6 @@ class InputSystemMetricsDisk(BaseModel):
     ] = InputSystemMetricsDiskMode.BASIC
     r"""Select the level of detail for disk metrics"""
 
-    detail: Optional[bool] = False
-    r"""Generate full disk metrics"""
-
-    inodes: Optional[bool] = False
-    r"""Generate filesystem inode metrics"""
-
     devices: Optional[List[str]] = None
     r"""Block devices to include/exclude. Examples: sda*, !loop*. Wildcards and ! (not) operators are supported. All devices are included if this list is empty."""
 
@@ -325,6 +312,9 @@ class InputSystemMetricsDisk(BaseModel):
     per_device: Annotated[Optional[bool], pydantic.Field(alias="perDevice")] = False
     r"""Generate separate metrics for each device"""
 
+    detail: Optional[bool] = False
+    r"""Generate full disk metrics"""
+
 
 class InputSystemMetricsCustomTypedDict(TypedDict):
     system: NotRequired[InputSystemMetricsSystemTypedDict]

cribl_control_plane/models/inputtcp.py

@@ -7,7 +7,7 @@ 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
+from typing import Any, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
@@ -123,12 +123,6 @@ class InputTCPMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputTCPTLSSettingsServerSideTypedDict(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]
@@ -139,6 +133,10 @@ class InputTCPTLSSettingsServerSideTypedDict(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[InputTCPMinimumTLSVersion]
     max_version: NotRequired[InputTCPMaximumTLSVersion]
 
@@ -146,19 +144,6 @@ class InputTCPTLSSettingsServerSideTypedDict(TypedDict):
 class InputTCPTLSSettingsServerSide(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
@@ -176,6 +161,17 @@ class InputTCPTLSSettingsServerSide(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[
         Annotated[
             Optional[InputTCPMinimumTLSVersion],
@@ -276,12 +272,8 @@ class InputTCPTypedDict(TypedDict):
     r"""Client will pass the header record with every new connection. The header can contain an authToken, and an object with a list of fields and values to add to every event. These fields can be used to simplify Event Breaker selection, routing, etc. Header has this format, and must be followed by a newline: { \"authToken\" : \"myToken\", \"fields\": { \"field1\": \"value1\", \"field2\": \"value2\" } }"""
     preprocess: NotRequired[InputTCPPreprocessTypedDict]
     description: NotRequired[str]
-    auth_token: NotRequired[str]
-    r"""Shared secret to be provided by any client (in authToken header field). If empty, unauthorized access is permitted."""
     auth_type: NotRequired[InputTCPAuthenticationMethod]
     r"""Select Manual to enter an auth token directly, or select Secret to use a text secret to authenticate"""
-    text_secret: NotRequired[str]
-    r"""Select or create a stored text secret"""
 
 
 class InputTCP(BaseModel):
@@ -374,9 +366,6 @@ class InputTCP(BaseModel):
 
     description: Optional[str] = None
 
-    auth_token: Annotated[Optional[str], pydantic.Field(alias="authToken")] = ""
-    r"""Shared secret to be provided by any client (in authToken header field). If empty, unauthorized access is permitted."""
-
     auth_type: Annotated[
         Annotated[
             Optional[InputTCPAuthenticationMethod],
@@ -385,6 +374,3 @@ class InputTCP(BaseModel):
         pydantic.Field(alias="authType"),
     ] = InputTCPAuthenticationMethod.MANUAL
     r"""Select Manual to enter an auth token directly, or select Secret to use a text secret to authenticate"""
-
-    text_secret: Annotated[Optional[str], pydantic.Field(alias="textSecret")] = None
-    r"""Select or create a stored text secret"""

cribl_control_plane/models/inputtcpjson.py

@@ -7,7 +7,7 @@ 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
+from typing import Any, List, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
@@ -123,12 +123,6 @@ class InputTcpjsonMaximumTLSVersion(str, Enum, metaclass=utils.OpenEnumMeta):
 
 class InputTcpjsonTLSSettingsServerSideTypedDict(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]
@@ -139,6 +133,10 @@ class InputTcpjsonTLSSettingsServerSideTypedDict(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[InputTcpjsonMinimumTLSVersion]
     max_version: NotRequired[InputTcpjsonMaximumTLSVersion]
 
@@ -146,19 +144,6 @@ class InputTcpjsonTLSSettingsServerSideTypedDict(TypedDict):
 class InputTcpjsonTLSSettingsServerSide(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
@@ -176,6 +161,17 @@ class InputTcpjsonTLSSettingsServerSide(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[
         Annotated[
             Optional[InputTcpjsonMinimumTLSVersion],

cribl_control_plane/models/inputwindowsmetrics.py

@@ -239,14 +239,12 @@ class InputWindowsMetricsNetworkMode(str, Enum, metaclass=utils.OpenEnumMeta):
 class InputWindowsMetricsNetworkTypedDict(TypedDict):
     mode: NotRequired[InputWindowsMetricsNetworkMode]
     r"""Select the level of details for network metrics"""
-    detail: NotRequired[bool]
-    r"""Generate full network metrics"""
-    protocols: NotRequired[bool]
-    r"""Generate protocol metrics for ICMP, ICMPMsg, IP, TCP, UDP and UDPLite"""
     devices: NotRequired[List[str]]
     r"""Network interfaces to include/exclude. All interfaces are included if this list is empty."""
     per_interface: NotRequired[bool]
     r"""Generate separate metrics for each interface"""
+    detail: NotRequired[bool]
+    r"""Generate full network metrics"""
 
 
 class InputWindowsMetricsNetwork(BaseModel):
@@ -256,12 +254,6 @@ class InputWindowsMetricsNetwork(BaseModel):
     ] = InputWindowsMetricsNetworkMode.BASIC
     r"""Select the level of details for network metrics"""
 
-    detail: Optional[bool] = False
-    r"""Generate full network metrics"""
-
-    protocols: Optional[bool] = False
-    r"""Generate protocol metrics for ICMP, ICMPMsg, IP, TCP, UDP and UDPLite"""
-
     devices: Optional[List[str]] = None
     r"""Network interfaces to include/exclude. All interfaces are included if this list is empty."""
 
@@ -270,6 +262,9 @@ class InputWindowsMetricsNetwork(BaseModel):
     )
     r"""Generate separate metrics for each interface"""
 
+    detail: Optional[bool] = False
+    r"""Generate full network metrics"""
+
 
 class InputWindowsMetricsDiskMode(str, Enum, metaclass=utils.OpenEnumMeta):
     r"""Select the level of details for disk metrics"""
@@ -287,12 +282,10 @@ class InputWindowsMetricsDiskMode(str, Enum, metaclass=utils.OpenEnumMeta):
 class InputWindowsMetricsDiskTypedDict(TypedDict):
     mode: NotRequired[InputWindowsMetricsDiskMode]
     r"""Select the level of details for disk metrics"""
-    per_volume: NotRequired[bool]
-    r"""Generate separate metrics for each volume"""
-    detail: NotRequired[bool]
-    r"""Generate full disk metrics"""
     volumes: NotRequired[List[str]]
     r"""Windows volumes to include/exclude. E.g.: C:, !E:, etc. Wildcards and ! (not) operators are supported. All volumes are included if this list is empty."""
+    per_volume: NotRequired[bool]
+    r"""Generate separate metrics for each volume"""
 
 
 class InputWindowsMetricsDisk(BaseModel):
@@ -301,15 +294,12 @@ class InputWindowsMetricsDisk(BaseModel):
     ] = InputWindowsMetricsDiskMode.BASIC
     r"""Select the level of details for disk metrics"""
 
-    per_volume: Annotated[Optional[bool], pydantic.Field(alias="perVolume")] = False
-    r"""Generate separate metrics for each volume"""
-
-    detail: Optional[bool] = False
-    r"""Generate full disk metrics"""
-
     volumes: Optional[List[str]] = None
     r"""Windows volumes to include/exclude. E.g.: C:, !E:, etc. Wildcards and ! (not) operators are supported. All volumes are included if this list is empty."""
 
+    per_volume: Annotated[Optional[bool], pydantic.Field(alias="perVolume")] = False
+    r"""Generate separate metrics for each volume"""
+
 
 class InputWindowsMetricsCustomTypedDict(TypedDict):
     system: NotRequired[InputWindowsMetricsSystemTypedDict]

cribl_control_plane/models/inputwineventlogs.py

@@ -174,10 +174,6 @@ class InputWinEventLogsTypedDict(TypedDict):
     max_event_bytes: NotRequired[float]
     r"""The maximum number of bytes in an event before it is flushed to the pipelines"""
     description: NotRequired[str]
-    disable_json_rendering: NotRequired[bool]
-    r"""Enable/disable the rendering of localized event message strings (Applicable for 4.8.0 nodes and newer that use the Native API)"""
-    disable_xml_rendering: NotRequired[bool]
-    r"""Enable/disable the rendering of localized event message strings (Applicable for 4.8.0 nodes and newer that use the Native API)"""
 
 
 class InputWinEventLogs(BaseModel):
@@ -245,13 +241,3 @@ class InputWinEventLogs(BaseModel):
     r"""The maximum number of bytes in an event before it is flushed to the pipelines"""
 
     description: Optional[str] = None
-
-    disable_json_rendering: Annotated[
-        Optional[bool], pydantic.Field(alias="disableJsonRendering")
-    ] = False
-    r"""Enable/disable the rendering of localized event message strings (Applicable for 4.8.0 nodes and newer that use the Native API)"""
-
-    disable_xml_rendering: Annotated[
-        Optional[bool], pydantic.Field(alias="disableXmlRendering")
-    ] = True
-    r"""Enable/disable the rendering of localized event message strings (Applicable for 4.8.0 nodes and newer that use the Native API)"""