diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 481c9d3972..9e89f56c99 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,25 @@ Change Log All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_. +==================== +2.125.2 - 2024-04-09 +==================== + +Added +----- + +* Support for calling Oracle Cloud Infrastructure services in the ap-dcc-gazipur-1 region +* Support for the DNS-based backend health check in the Network Load Balancer service +* Support for Fail Open in the Network Load Balancer service +* Support for adding and updating Instant failover in the Network Load Balancer service +* Support for adding and updating source type and resource category for resource types in the Stack Monitoring service +* Support for searching resources based on resource category, source type, multiple compartments, multiple lifecycle states in the Stack Monitoring service +* Support for filtering listed resources based on lifecycle status in the Stack Monitoring service +* Support for creating tasks with new config parameters in the Stack Monitoring service +* Support for Composite Resource Principal integration in the Data Flow service + + + ==================== 2.125.1 - 2024-04-02 ==================== diff --git a/docs/api/network_load_balancer.rst b/docs/api/network_load_balancer.rst index 2b068cd0c8..813269be51 100644 --- a/docs/api/network_load_balancer.rst +++ b/docs/api/network_load_balancer.rst @@ -33,6 +33,7 @@ Network Load Balancer oci.network_load_balancer.models.CreateBackendSetDetails oci.network_load_balancer.models.CreateListenerDetails oci.network_load_balancer.models.CreateNetworkLoadBalancerDetails + oci.network_load_balancer.models.DnsHealthCheckerDetails oci.network_load_balancer.models.HealthCheckResult oci.network_load_balancer.models.HealthChecker oci.network_load_balancer.models.HealthCheckerDetails diff --git a/docs/api/network_load_balancer/models/oci.network_load_balancer.models.DnsHealthCheckerDetails.rst b/docs/api/network_load_balancer/models/oci.network_load_balancer.models.DnsHealthCheckerDetails.rst new file mode 100644 index 0000000000..aef1265782 --- /dev/null +++ b/docs/api/network_load_balancer/models/oci.network_load_balancer.models.DnsHealthCheckerDetails.rst @@ -0,0 +1,11 @@ +DnsHealthCheckerDetails +======================= + +.. currentmodule:: oci.network_load_balancer.models + +.. autoclass:: DnsHealthCheckerDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/examples/showoci/CHANGELOG.rst b/examples/showoci/CHANGELOG.rst index 6d7cf5ab32..b82e338305 100644 --- a/examples/showoci/CHANGELOG.rst +++ b/examples/showoci/CHANGELOG.rst @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_. +===================== +24.04.09 - 24.04.09 +===================== +* Exclude GENAI until the service deployed on all regions to avoid process hung + +===================== +24.04.02 - 24.04.02 +===================== +* Added is_symmetric_hash_enabled flag for network load balancers + ===================== 24.04.02 - 24.04.02 ===================== diff --git a/examples/showoci/showoci.py b/examples/showoci/showoci.py index 202dcb3f01..681ea2269c 100644 --- a/examples/showoci/showoci.py +++ b/examples/showoci/showoci.py @@ -128,7 +128,7 @@ import os import time -version = "24.04.02" +version = "24.04.09" ########################################################################## # check OCI version diff --git a/examples/showoci/showoci_data.py b/examples/showoci/showoci_data.py index 98f96a6d51..1bae499a02 100644 --- a/examples/showoci/showoci_data.py +++ b/examples/showoci/showoci_data.py @@ -20,7 +20,7 @@ class ShowOCIData(object): - version = "24.04.02" + version = "24.04.09" ############################################ # ShowOCIService - Service object to query @@ -3875,6 +3875,8 @@ def __get_load_balancer_network_details(self, load_balance_obj): data['time_created'] = lb['time_created'] data['time_updated'] = lb['time_updated'] data['is_preserve_source_destination'] = lb['is_preserve_source_destination'] + data['nlb_ip_version'] = lb['nlb_ip_version'] + data['is_symmetric_hash_enabled'] = lb['is_symmetric_hash_enabled'] data['is_private'] = lb['is_private'] data['ips'] = lb['ip_addresses'] data['nsg_ids'] = lb['nsg_ids'] diff --git a/examples/showoci/showoci_output.py b/examples/showoci/showoci_output.py index 169d63f3fe..171fd83f70 100644 --- a/examples/showoci/showoci_output.py +++ b/examples/showoci/showoci_output.py @@ -22,7 +22,7 @@ class ShowOCIOutput(object): - version = "24.04.02" + version = "24.04.09" ########################################################################## # spaces for align @@ -1047,9 +1047,12 @@ def __print_load_balancer_details(self, load_balance_obj): def __print_load_balancer_network_details(self, load_balance_obj): try: lb = load_balance_obj + sym = lb['is_symmetric_hash_enabled'] if lb['is_symmetric_hash_enabled'] else "False" + prsv = lb['is_preserve_source_destination'] if lb['is_preserve_source_destination'] else "False" print(self.taba + "Name : " + lb['name']) print(self.tabs + "Status : " + lb['status']) print(self.tabs + "Subnet : " + lb['subnet_name']) + print(self.tabs + "Flags : is_symmetric_hash_enabled = " + sym + ", is_preserve_source_destination = " + prsv) if 'nsg_names' in lb: if lb['nsg_names']: @@ -7858,6 +7861,8 @@ def __csv_load_balancer_details(self, region_name, load_balance_obj): 'shape': lb['shape_name'], 'type': ("Private" if lb['is_private'] else "Public"), 'is_preserve_source_destination': "", + 'nlb_ip_version': "", + 'is_symmetric_hash_enabled': "", 'ip_addresses': str(', '.join(x for x in lb['ips'])), 'listeners': str(', '.join(x['desc'] for x in lb['listeners'])), 'log_errors': log_errors, @@ -7936,6 +7941,8 @@ def __csv_network_load_balancer_main(self, region_name, network_load_balancers): 'time_updated': lb['time_updated'], 'type': ("Private" if lb['is_private'] else "Public"), 'is_preserve_source_destination': lb['is_preserve_source_destination'], + 'nlb_ip_version': lb['nlb_ip_version'], + 'is_symmetric_hash_enabled': lb['is_symmetric_hash_enabled'], 'subnets': lb['subnet_name'], 'nsg_names': lb['nsg_names'], 'ip_addresses': str(', '.join(x for x in lb['ips'])), diff --git a/examples/showoci/showoci_service.py b/examples/showoci/showoci_service.py index 9dba3dbee6..a806e4e5ee 100644 --- a/examples/showoci/showoci_service.py +++ b/examples/showoci/showoci_service.py @@ -39,8 +39,8 @@ # class ShowOCIService ########################################################################## class ShowOCIService(object): - version = "24.04.02" - oci_compatible_version = "2.119.1" + version = "24.04.09" + oci_compatible_version = "2.125.0" thread_lock = threading.Lock() ########################################################################## @@ -684,6 +684,11 @@ def generate_signer_from_delegation_token(self): # get signer from delegation token self.signer = oci.auth.signers.InstancePrincipalsDelegationTokenSigner(delegation_token=delegation_token) + print('**********************************************************************') + print('* Cloud Shell has 20 minutes timeout, this process may not complete! *') + print('* Please use dedicated VM if hung *') + print('**********************************************************************') + except KeyError: print('**********************************************************************') print('* Key Error obtaining delegation_token_file') @@ -7545,6 +7550,8 @@ def __load_load_balancers_network(self, network_load_balancer, compartments): 'time_updated': self.get_value(arr.time_updated)[0:16], 'is_private': self.get_value(arr.is_private), 'is_preserve_source_destination': self.get_value(arr.is_preserve_source_destination), + 'nlb_ip_version': self.get_value(arr.nlb_ip_version), + 'is_symmetric_hash_enabled': self.get_value(arr.is_symmetric_hash_enabled), 'subnet_id': self.get_value(arr.subnet_id), 'subnet_name': "" if arr.subnet_id is None else self.get_network_subnet(arr.subnet_id, True), 'status': str(status), @@ -15202,7 +15209,7 @@ def __load_section_native_data_ai_main(self): oda_client = self.__create_client(oci.oda.OdaClient, key=self.EXCLUDE_ODA) bds_client = self.__create_client(oci.bds.BdsClient, key=self.EXCLUDE_BDS) di_client = self.__create_client(oci.data_integration.DataIntegrationClient, key=self.EXCLUDE_DI) - genai_client = self.__create_client(oci.generative_ai.GenerativeAiClient, key=self.EXCLUDE_GENAI) + # genai_client = self.__create_client(oci.generative_ai.GenerativeAiClient, key=self.EXCLUDE_GENAI) # reference to compartments compartments = self.get_compartments() @@ -15244,7 +15251,7 @@ def __load_section_native_data_ai_main(self): data_ai[self.C_DATA_AI_ODA] += self.__load_data_ai_oda(oda_client, compartments) data_ai[self.C_DATA_AI_BDS] += self.__load_data_ai_bds(bds_client, compartments) data_ai[self.C_DATA_AI_DI] += self.__load_data_ai_data_integration(di_client, compartments) - data_ai[self.C_DATA_AI_GENAI] += self.__load_data_ai_data_genai(genai_client, compartments) + # data_ai[self.C_DATA_AI_GENAI] += self.__load_data_ai_data_genai(genai_client, compartments) ########################## # if parallel execution @@ -15265,7 +15272,7 @@ def __load_section_native_data_ai_main(self): future_DATA_AI_ODA = executor.submit(self.__load_data_ai_oda, oda_client, compartments) future_DATA_AI_BDS = executor.submit(self.__load_data_ai_bds, bds_client, compartments) future_DATA_AI_DI = executor.submit(self.__load_data_ai_data_integration, di_client, compartments) - future_DATA_AI_GENAI = executor.submit(self.__load_data_ai_data_genai, genai_client, compartments) + # future_DATA_AI_GENAI = executor.submit(self.__load_data_ai_data_genai, genai_client, compartments) paas = self.data[self.C_PAAS_NATIVE] paas[self.C_PAAS_NATIVE_OCVS] += next(as_completed([future_PAAS_NATIVE_OCVS])).result() @@ -15283,7 +15290,7 @@ def __load_section_native_data_ai_main(self): data_ai[self.C_DATA_AI_ODA] += next(as_completed([future_DATA_AI_ODA])).result() data_ai[self.C_DATA_AI_BDS] += next(as_completed([future_DATA_AI_BDS])).result() data_ai[self.C_DATA_AI_DI] += next(as_completed([future_DATA_AI_DI])).result() - data_ai[self.C_DATA_AI_GENAI] += next(as_completed([future_DATA_AI_GENAI])).result() + # data_ai[self.C_DATA_AI_GENAI] += next(as_completed([future_DATA_AI_GENAI])).result() self.__load_print_section_time(section_start_time) print("") diff --git a/examples/showoci/step_by_step_howto.md b/examples/showoci/step_by_step_howto.md deleted file mode 100644 index bb5769f46b..0000000000 --- a/examples/showoci/step_by_step_howto.md +++ /dev/null @@ -1,122 +0,0 @@ -# showoci - Oracle Cloud Infrastructure Reporting Tool - -## How To Manual - -SHOWOCI is a reporting tool which uses the Python SDK to extract list of resources from your tenant. -It covers most of OCI components, -Authentication by User or Compute using instance principals, -Output can be printer friendly, CSV files or JSON file. - -**DISCLAIMER – This is not an official Oracle application, It does not supported by Oracle Support, It should NOT be used for utilization calculation purposes, and rather OCI's official -[cost analysis](https://docs.oracle.com/en-us/iaas/Content/Billing/Concepts/costanalysisoverview.htm) -and [usage reports](https://docs.oracle.com/en-us/iaas/Content/Billing/Concepts/usagereportsoverview.htm) features should be used instead.** - -**Developed by Adi Zohar, 2018-2023** - -## Content -[1. Step by Step installation Guide on OCI VM](#1-step-by-step-installation-guide-on-oci-vm) - -[2. How to Upgrade or install showoci code](#2-how-to-upgrade-or-install-showoci-from-adi-zohar-github) - -[3. How to Upgrade OCI SDK drivers](#3-how-to-upgrade-oci-sdk-drivers) - - -## 1. Step by Step installation Guide on OCI VM - -### 1.1 Deploy VM Compute instance to run the python script -``` -OCI -> Menu -> Compute -> Instances -Create Instance ---> Name = ShowOCIVM ---> Image = Oracle Linux 7 ---> Shape = Any Shape ---> Choose your network VCN and Subnet (any type of VCN and Subnet) ---> Assign public IP - Optional if on public subnet ---> Add your public SSH key ---> Press Create - -Copy Instance Info: ---> Compute OCID to be used for Dynamic Group Permission ---> Compute IP -``` - -### 1.2. Create Dynamic Group for Instance Principles - -``` -OCI -> Menu -> Identity -> Dynamic Groups -> Create Dynamic Group ---> Name = ShowOCIDynamicGroup ---> Desc = Dynamic Group for the showoci VM ---> Rule 1 = ANY { instance.id = 'OCID_Of_Step_1_Instance' } -``` - -### 1.3. Create Policy to allow the Dynamic Group to run showoci report - -``` -OCI -> Menu -> Identity -> Policies -Choose Root Compartment -Create Policy ---> Name = showociPolicy ---> Desc = Allow Dynamic Group ShowOCIDynamicGroup to extract tenant information using showoci ---> Statement = allow dynamic-group ShowOCIDynamicGroup to read all-resources in tenancy -``` - -### 1.4. Login to Linux Machine - -``` -Using the SSH key you provided, SSH to the linux machine from step #1 -ssh opc@UsageVM -``` - -### 1.5. Install Python 3, GIT and OCI packages - -``` -sudo yum install -y python3 git -sudo pip3 install --upgrade oci oci-cli oracledb -``` - -Test instance principle is working using oci-cli -``` -oci os ns get --auth instance_principal -``` - -### 1.6. Clone the OCI SDK Repo from Git Hub or install using bash file - -Clone from OCI SDK Repo and Create symbolink link - -``` -git clone https://github.com/oracle/oci-python-sdk -ln -s oci-python-sdk/examples/showoci . -``` - -Or Install using Bash - -``` -bash -c "$(curl -L https://raw.githubusercontent.com/adizohar/showoci/master/showoci_upgrade.sh)" -``` - -### 1.7. Execute the python script - showoci.py - -``` -cd showoci -python3 showoci.py -ip -ani -``` - -## 2. How to upgrade or install showoci from Adi Zohar github - -Run on OCI VM: -``` -bash -c "$(curl -L https://raw.githubusercontent.com/adizohar/showoci/master/showoci_upgrade.sh)" -``` - -## 3. How to upgrade OCI SDK drivers - -``` -python3 -m pip install --upgrade oci oci-cli oracledb pip -``` - -## License -``` - -Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. -This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl -or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. diff --git a/examples/showrewards/README.md b/examples/showrewards/README.md index 0a52f7049b..b755c077ad 100644 --- a/examples/showrewards/README.md +++ b/examples/showrewards/README.md @@ -85,6 +85,7 @@ optional arguments: ## Below example of reports from demo tenancy (random info generated) +``` ######################################################################################################################## # Running Show Rewards # ######################################################################################################################## diff --git a/src/oci/application_migration/application_migration_client.py b/src/oci/application_migration/application_migration_client.py index 668a0b11f2..2db78afd0f 100644 --- a/src/oci/application_migration/application_migration_client.py +++ b/src/oci/application_migration/application_migration_client.py @@ -164,7 +164,7 @@ def cancel_work_request(self, work_request_id, **kwargs): resource_path = "/workRequests/{workRequestId}" method = "DELETE" operation_name = "cancel_work_request" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/WorkRequest/CancelWorkRequest" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -281,7 +281,7 @@ def change_migration_compartment(self, migration_id, change_migration_compartmen resource_path = "/migrations/{migrationId}/actions/changeCompartment" method = "POST" operation_name = "change_migration_compartment" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/Migration/ChangeMigrationCompartment" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -403,7 +403,7 @@ def change_source_compartment(self, source_id, change_source_compartment_details resource_path = "/sources/{sourceId}/actions/changeCompartment" method = "POST" operation_name = "change_source_compartment" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/Source/ChangeSourceCompartment" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -750,7 +750,7 @@ def delete_migration(self, migration_id, **kwargs): resource_path = "/migrations/{migrationId}" method = "DELETE" operation_name = "delete_migration" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/Migration/DeleteMigration" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -858,7 +858,7 @@ def delete_source(self, source_id, **kwargs): resource_path = "/sources/{sourceId}" method = "DELETE" operation_name = "delete_source" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/Source/DeleteSource" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -957,7 +957,7 @@ def get_migration(self, migration_id, **kwargs): resource_path = "/migrations/{migrationId}" method = "GET" operation_name = "get_migration" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/Migration/GetMigration" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1056,7 +1056,7 @@ def get_source(self, source_id, **kwargs): resource_path = "/sources/{sourceId}" method = "GET" operation_name = "get_source" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/Source/GetSource" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1155,7 +1155,7 @@ def get_work_request(self, work_request_id, **kwargs): resource_path = "/workRequests/{workRequestId}" method = "GET" operation_name = "get_work_request" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/WorkRequest/GetWorkRequest" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1291,7 +1291,7 @@ def list_migrations(self, compartment_id, **kwargs): resource_path = "/migrations" method = "GET" operation_name = "list_migrations" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/MigrationSummary/ListMigrations" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1454,7 +1454,7 @@ def list_source_applications(self, source_id, compartment_id, **kwargs): resource_path = "/sources/{sourceId}/applications" method = "GET" operation_name = "list_source_applications" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/SourceApplicationSummary/ListSourceApplications" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1624,7 +1624,7 @@ def list_sources(self, compartment_id, **kwargs): resource_path = "/sources" method = "GET" operation_name = "list_sources" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/SourceSummary/ListSources" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1770,7 +1770,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): resource_path = "/workRequests/{workRequestId}/errors" method = "GET" operation_name = "list_work_request_errors" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/WorkRequestError/ListWorkRequestErrors" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -1905,7 +1905,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): resource_path = "/workRequests/{workRequestId}/logs" method = "GET" operation_name = "list_work_request_logs" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/WorkRequestLogEntry/ListWorkRequestLogs" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -2040,7 +2040,7 @@ def list_work_requests(self, compartment_id, **kwargs): resource_path = "/workRequests" method = "GET" operation_name = "list_work_requests" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/WorkRequestSummary/ListWorkRequests" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -2162,7 +2162,7 @@ def migrate_application(self, migration_id, **kwargs): resource_path = "/migrations/{migrationId}/actions/migrate" method = "POST" operation_name = "migrate_application" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/Migration/MigrateApplication" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -2309,7 +2309,7 @@ def update_migration(self, migration_id, update_migration_details, **kwargs): resource_path = "/migrations/{migrationId}" method = "PUT" operation_name = "update_migration" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/Migration/UpdateMigration" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ @@ -2424,7 +2424,7 @@ def update_source(self, source_id, update_source_details, **kwargs): resource_path = "/sources/{sourceId}" method = "PUT" operation_name = "update_source" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/applicationmigration/20191031/Source/UpdateSource" + api_reference_link = "" # Don't accept unknown kwargs expected_kwargs = [ diff --git a/src/oci/data_flow/data_flow_client.py b/src/oci/data_flow/data_flow_client.py index 35117bccd7..730a18780a 100644 --- a/src/oci/data_flow/data_flow_client.py +++ b/src/oci/data_flow/data_flow_client.py @@ -1004,6 +1004,10 @@ def create_run(self, create_run_details, **kwargs): Unique identifier for the request. If provided, the returned request ID will include this value. Otherwise, a random request ID will be generated by the service. + :param str opc_parent_rpt_url: (optional) + (Optional header param, required for Resource Principal version 3.0+) + Parent resource control plane endpoint used to exchange for upper level resource principal token. + :param obj retry_strategy: (optional) A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. @@ -1034,7 +1038,8 @@ def create_run(self, create_run_details, **kwargs): "allow_control_chars", "retry_strategy", "opc_retry_token", - "opc_request_id" + "opc_request_id", + "opc_parent_rpt_url" ] extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] if extra_kwargs: @@ -1045,7 +1050,8 @@ def create_run(self, create_run_details, **kwargs): "accept": "application/json", "content-type": "application/json", "opc-retry-token": kwargs.get("opc_retry_token", missing), - "opc-request-id": kwargs.get("opc_request_id", missing) + "opc-request-id": kwargs.get("opc_request_id", missing), + "opc-parent-rpt-url": kwargs.get("opc_parent_rpt_url", missing) } header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} @@ -3485,7 +3491,7 @@ def list_sql_endpoints(self, **kwargs): :param str lifecycle_state: (optional) A filter to return only those resources whose sqlEndpointLifecycleState matches the given sqlEndpointLifecycleState. - Allowed values are: "CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED" + Allowed values are: "CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", "UPDATING", "NEEDS_ATTENTION" :param str display_name: (optional) The query parameter for the Spark application name. @@ -3555,7 +3561,7 @@ def list_sql_endpoints(self, **kwargs): f"list_sql_endpoints got unknown kwargs: {extra_kwargs!r}") if 'lifecycle_state' in kwargs: - lifecycle_state_allowed_values = ["CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED"] + lifecycle_state_allowed_values = ["CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", "UPDATING", "NEEDS_ATTENTION"] if kwargs['lifecycle_state'] not in lifecycle_state_allowed_values: raise ValueError( f"Invalid value for `lifecycle_state`, must be one of { lifecycle_state_allowed_values }" diff --git a/src/oci/data_flow/models/sql_endpoint.py b/src/oci/data_flow/models/sql_endpoint.py index 0c5a62cdba..ee194d8fd5 100644 --- a/src/oci/data_flow/models/sql_endpoint.py +++ b/src/oci/data_flow/models/sql_endpoint.py @@ -35,6 +35,14 @@ class SqlEndpoint(object): #: This constant has a value of "FAILED" LIFECYCLE_STATE_FAILED = "FAILED" + #: A constant which can be used with the lifecycle_state property of a SqlEndpoint. + #: This constant has a value of "UPDATING" + LIFECYCLE_STATE_UPDATING = "UPDATING" + + #: A constant which can be used with the lifecycle_state property of a SqlEndpoint. + #: This constant has a value of "NEEDS_ATTENTION" + LIFECYCLE_STATE_NEEDS_ATTENTION = "NEEDS_ATTENTION" + def __init__(self, **kwargs): """ Initializes a new SqlEndpoint object with values from keyword arguments. @@ -66,7 +74,7 @@ def __init__(self, **kwargs): :param lifecycle_state: The value to assign to the lifecycle_state property of this SqlEndpoint. - Allowed values for this property are: "CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", "UPDATING", "NEEDS_ATTENTION", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type lifecycle_state: str @@ -138,6 +146,10 @@ def __init__(self, **kwargs): The value to assign to the spark_advanced_configurations property of this SqlEndpoint. :type spark_advanced_configurations: dict(str, str) + :param banner_message: + The value to assign to the banner_message property of this SqlEndpoint. + :type banner_message: str + :param network_configuration: The value to assign to the network_configuration property of this SqlEndpoint. :type network_configuration: oci.data_flow.models.SqlEndpointNetworkConfiguration @@ -168,6 +180,7 @@ def __init__(self, **kwargs): 'defined_tags': 'dict(str, dict(str, object))', 'system_tags': 'dict(str, dict(str, object))', 'spark_advanced_configurations': 'dict(str, str)', + 'banner_message': 'str', 'network_configuration': 'SqlEndpointNetworkConfiguration' } @@ -196,6 +209,7 @@ def __init__(self, **kwargs): 'defined_tags': 'definedTags', 'system_tags': 'systemTags', 'spark_advanced_configurations': 'sparkAdvancedConfigurations', + 'banner_message': 'bannerMessage', 'network_configuration': 'networkConfiguration' } @@ -223,6 +237,7 @@ def __init__(self, **kwargs): self._defined_tags = None self._system_tags = None self._spark_advanced_configurations = None + self._banner_message = None self._network_configuration = None @property @@ -375,7 +390,7 @@ def lifecycle_state(self): Gets the lifecycle_state of this SqlEndpoint. The current state of the Sql Endpoint. - Allowed values for this property are: "CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", "UPDATING", "NEEDS_ATTENTION", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -394,7 +409,7 @@ def lifecycle_state(self, lifecycle_state): :param lifecycle_state: The lifecycle_state of this SqlEndpoint. :type: str """ - allowed_values = ["CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED"] + allowed_values = ["CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", "UPDATING", "NEEDS_ATTENTION"] if not value_allowed_none_or_none_sentinel(lifecycle_state, allowed_values): lifecycle_state = 'UNKNOWN_ENUM_VALUE' self._lifecycle_state = lifecycle_state @@ -829,6 +844,30 @@ def spark_advanced_configurations(self, spark_advanced_configurations): """ self._spark_advanced_configurations = spark_advanced_configurations + @property + def banner_message(self): + """ + Gets the banner_message of this SqlEndpoint. + The SQL Endpoint message displayed as a banner to provide user with any action items required on the resource. + + + :return: The banner_message of this SqlEndpoint. + :rtype: str + """ + return self._banner_message + + @banner_message.setter + def banner_message(self, banner_message): + """ + Sets the banner_message of this SqlEndpoint. + The SQL Endpoint message displayed as a banner to provide user with any action items required on the resource. + + + :param banner_message: The banner_message of this SqlEndpoint. + :type: str + """ + self._banner_message = banner_message + @property def network_configuration(self): """ diff --git a/src/oci/data_flow/models/sql_endpoint_summary.py b/src/oci/data_flow/models/sql_endpoint_summary.py index 516ebb60a0..a03ebf1965 100644 --- a/src/oci/data_flow/models/sql_endpoint_summary.py +++ b/src/oci/data_flow/models/sql_endpoint_summary.py @@ -35,6 +35,14 @@ class SqlEndpointSummary(object): #: This constant has a value of "FAILED" LIFECYCLE_STATE_FAILED = "FAILED" + #: A constant which can be used with the lifecycle_state property of a SqlEndpointSummary. + #: This constant has a value of "UPDATING" + LIFECYCLE_STATE_UPDATING = "UPDATING" + + #: A constant which can be used with the lifecycle_state property of a SqlEndpointSummary. + #: This constant has a value of "NEEDS_ATTENTION" + LIFECYCLE_STATE_NEEDS_ATTENTION = "NEEDS_ATTENTION" + def __init__(self, **kwargs): """ Initializes a new SqlEndpointSummary object with values from keyword arguments. @@ -66,7 +74,7 @@ def __init__(self, **kwargs): :param lifecycle_state: The value to assign to the lifecycle_state property of this SqlEndpointSummary. - Allowed values for this property are: "CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", "UPDATING", "NEEDS_ATTENTION", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type lifecycle_state: str @@ -382,7 +390,7 @@ def lifecycle_state(self): Gets the lifecycle_state of this SqlEndpointSummary. The current state of the Sql Endpoint. - Allowed values for this property are: "CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", "UPDATING", "NEEDS_ATTENTION", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -401,7 +409,7 @@ def lifecycle_state(self, lifecycle_state): :param lifecycle_state: The lifecycle_state of this SqlEndpointSummary. :type: str """ - allowed_values = ["CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED"] + allowed_values = ["CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", "UPDATING", "NEEDS_ATTENTION"] if not value_allowed_none_or_none_sentinel(lifecycle_state, allowed_values): lifecycle_state = 'UNKNOWN_ENUM_VALUE' self._lifecycle_state = lifecycle_state diff --git a/src/oci/email_data_plane/email_dp_client.py b/src/oci/email_data_plane/email_dp_client.py index 06d8a3e1cd..9faa8c0b1f 100644 --- a/src/oci/email_data_plane/email_dp_client.py +++ b/src/oci/email_data_plane/email_dp_client.py @@ -151,7 +151,7 @@ def submit_email(self, submit_email_details, **kwargs): resource_path = "/actions/submitEmail" method = "POST" operation_name = "submit_email" - api_reference_link = "" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/emaildeliverysubmission/20220926/EmailSubmittedResponse/SubmitEmail" # Don't accept unknown kwargs expected_kwargs = [ diff --git a/src/oci/network_load_balancer/models/__init__.py b/src/oci/network_load_balancer/models/__init__.py index 1f2abbe8ce..037af0aeb8 100644 --- a/src/oci/network_load_balancer/models/__init__.py +++ b/src/oci/network_load_balancer/models/__init__.py @@ -21,6 +21,7 @@ from .create_backend_set_details import CreateBackendSetDetails from .create_listener_details import CreateListenerDetails from .create_network_load_balancer_details import CreateNetworkLoadBalancerDetails +from .dns_health_checker_details import DnsHealthCheckerDetails from .health_check_result import HealthCheckResult from .health_checker import HealthChecker from .health_checker_details import HealthCheckerDetails @@ -70,6 +71,7 @@ "CreateBackendSetDetails": CreateBackendSetDetails, "CreateListenerDetails": CreateListenerDetails, "CreateNetworkLoadBalancerDetails": CreateNetworkLoadBalancerDetails, + "DnsHealthCheckerDetails": DnsHealthCheckerDetails, "HealthCheckResult": HealthCheckResult, "HealthChecker": HealthChecker, "HealthCheckerDetails": HealthCheckerDetails, diff --git a/src/oci/network_load_balancer/models/backend_set.py b/src/oci/network_load_balancer/models/backend_set.py index 800e82bd48..6d2e6a399e 100644 --- a/src/oci/network_load_balancer/models/backend_set.py +++ b/src/oci/network_load_balancer/models/backend_set.py @@ -60,6 +60,14 @@ def __init__(self, **kwargs): The value to assign to the is_preserve_source property of this BackendSet. :type is_preserve_source: bool + :param is_fail_open: + The value to assign to the is_fail_open property of this BackendSet. + :type is_fail_open: bool + + :param is_instant_failover_enabled: + The value to assign to the is_instant_failover_enabled property of this BackendSet. + :type is_instant_failover_enabled: bool + :param ip_version: The value to assign to the ip_version property of this BackendSet. Allowed values for this property are: "IPV4", "IPV6", 'UNKNOWN_ENUM_VALUE'. @@ -79,6 +87,8 @@ def __init__(self, **kwargs): 'name': 'str', 'policy': 'str', 'is_preserve_source': 'bool', + 'is_fail_open': 'bool', + 'is_instant_failover_enabled': 'bool', 'ip_version': 'str', 'backends': 'list[Backend]', 'health_checker': 'HealthChecker' @@ -88,6 +98,8 @@ def __init__(self, **kwargs): 'name': 'name', 'policy': 'policy', 'is_preserve_source': 'isPreserveSource', + 'is_fail_open': 'isFailOpen', + 'is_instant_failover_enabled': 'isInstantFailoverEnabled', 'ip_version': 'ipVersion', 'backends': 'backends', 'health_checker': 'healthChecker' @@ -96,6 +108,8 @@ def __init__(self, **kwargs): self._name = None self._policy = None self._is_preserve_source = None + self._is_fail_open = None + self._is_instant_failover_enabled = None self._ip_version = None self._backends = None self._health_checker = None @@ -196,6 +210,56 @@ def is_preserve_source(self, is_preserve_source): """ self._is_preserve_source = is_preserve_source + @property + def is_fail_open(self): + """ + Gets the is_fail_open of this BackendSet. + If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy. + The value is false by default. + + + :return: The is_fail_open of this BackendSet. + :rtype: bool + """ + return self._is_fail_open + + @is_fail_open.setter + def is_fail_open(self, is_fail_open): + """ + Sets the is_fail_open of this BackendSet. + If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy. + The value is false by default. + + + :param is_fail_open: The is_fail_open of this BackendSet. + :type: bool + """ + self._is_fail_open = is_fail_open + + @property + def is_instant_failover_enabled(self): + """ + Gets the is_instant_failover_enabled of this BackendSet. + If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy. + + + :return: The is_instant_failover_enabled of this BackendSet. + :rtype: bool + """ + return self._is_instant_failover_enabled + + @is_instant_failover_enabled.setter + def is_instant_failover_enabled(self, is_instant_failover_enabled): + """ + Sets the is_instant_failover_enabled of this BackendSet. + If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy. + + + :param is_instant_failover_enabled: The is_instant_failover_enabled of this BackendSet. + :type: bool + """ + self._is_instant_failover_enabled = is_instant_failover_enabled + @property def ip_version(self): """ diff --git a/src/oci/network_load_balancer/models/backend_set_details.py b/src/oci/network_load_balancer/models/backend_set_details.py index 8f5c3fae02..cabab37b1e 100644 --- a/src/oci/network_load_balancer/models/backend_set_details.py +++ b/src/oci/network_load_balancer/models/backend_set_details.py @@ -60,6 +60,14 @@ def __init__(self, **kwargs): The value to assign to the is_preserve_source property of this BackendSetDetails. :type is_preserve_source: bool + :param is_fail_open: + The value to assign to the is_fail_open property of this BackendSetDetails. + :type is_fail_open: bool + + :param is_instant_failover_enabled: + The value to assign to the is_instant_failover_enabled property of this BackendSetDetails. + :type is_instant_failover_enabled: bool + :param backends: The value to assign to the backends property of this BackendSetDetails. :type backends: list[oci.network_load_balancer.models.Backend] @@ -73,6 +81,8 @@ def __init__(self, **kwargs): 'policy': 'str', 'ip_version': 'str', 'is_preserve_source': 'bool', + 'is_fail_open': 'bool', + 'is_instant_failover_enabled': 'bool', 'backends': 'list[Backend]', 'health_checker': 'HealthChecker' } @@ -81,6 +91,8 @@ def __init__(self, **kwargs): 'policy': 'policy', 'ip_version': 'ipVersion', 'is_preserve_source': 'isPreserveSource', + 'is_fail_open': 'isFailOpen', + 'is_instant_failover_enabled': 'isInstantFailoverEnabled', 'backends': 'backends', 'health_checker': 'healthChecker' } @@ -88,6 +100,8 @@ def __init__(self, **kwargs): self._policy = None self._ip_version = None self._is_preserve_source = None + self._is_fail_open = None + self._is_instant_failover_enabled = None self._backends = None self._health_checker = None @@ -185,6 +199,56 @@ def is_preserve_source(self, is_preserve_source): """ self._is_preserve_source = is_preserve_source + @property + def is_fail_open(self): + """ + Gets the is_fail_open of this BackendSetDetails. + If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy. + The value is false by default. + + + :return: The is_fail_open of this BackendSetDetails. + :rtype: bool + """ + return self._is_fail_open + + @is_fail_open.setter + def is_fail_open(self, is_fail_open): + """ + Sets the is_fail_open of this BackendSetDetails. + If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy. + The value is false by default. + + + :param is_fail_open: The is_fail_open of this BackendSetDetails. + :type: bool + """ + self._is_fail_open = is_fail_open + + @property + def is_instant_failover_enabled(self): + """ + Gets the is_instant_failover_enabled of this BackendSetDetails. + If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy. + + + :return: The is_instant_failover_enabled of this BackendSetDetails. + :rtype: bool + """ + return self._is_instant_failover_enabled + + @is_instant_failover_enabled.setter + def is_instant_failover_enabled(self, is_instant_failover_enabled): + """ + Sets the is_instant_failover_enabled of this BackendSetDetails. + If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy. + + + :param is_instant_failover_enabled: The is_instant_failover_enabled of this BackendSetDetails. + :type: bool + """ + self._is_instant_failover_enabled = is_instant_failover_enabled + @property def backends(self): """ diff --git a/src/oci/network_load_balancer/models/backend_set_summary.py b/src/oci/network_load_balancer/models/backend_set_summary.py index 5bf975fd2e..757f6b55f3 100644 --- a/src/oci/network_load_balancer/models/backend_set_summary.py +++ b/src/oci/network_load_balancer/models/backend_set_summary.py @@ -60,6 +60,14 @@ def __init__(self, **kwargs): The value to assign to the is_preserve_source property of this BackendSetSummary. :type is_preserve_source: bool + :param is_fail_open: + The value to assign to the is_fail_open property of this BackendSetSummary. + :type is_fail_open: bool + + :param is_instant_failover_enabled: + The value to assign to the is_instant_failover_enabled property of this BackendSetSummary. + :type is_instant_failover_enabled: bool + :param ip_version: The value to assign to the ip_version property of this BackendSetSummary. Allowed values for this property are: "IPV4", "IPV6", 'UNKNOWN_ENUM_VALUE'. @@ -79,6 +87,8 @@ def __init__(self, **kwargs): 'name': 'str', 'policy': 'str', 'is_preserve_source': 'bool', + 'is_fail_open': 'bool', + 'is_instant_failover_enabled': 'bool', 'ip_version': 'str', 'backends': 'list[Backend]', 'health_checker': 'HealthChecker' @@ -88,6 +98,8 @@ def __init__(self, **kwargs): 'name': 'name', 'policy': 'policy', 'is_preserve_source': 'isPreserveSource', + 'is_fail_open': 'isFailOpen', + 'is_instant_failover_enabled': 'isInstantFailoverEnabled', 'ip_version': 'ipVersion', 'backends': 'backends', 'health_checker': 'healthChecker' @@ -96,6 +108,8 @@ def __init__(self, **kwargs): self._name = None self._policy = None self._is_preserve_source = None + self._is_fail_open = None + self._is_instant_failover_enabled = None self._ip_version = None self._backends = None self._health_checker = None @@ -196,6 +210,56 @@ def is_preserve_source(self, is_preserve_source): """ self._is_preserve_source = is_preserve_source + @property + def is_fail_open(self): + """ + Gets the is_fail_open of this BackendSetSummary. + If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy. + The value is false by default. + + + :return: The is_fail_open of this BackendSetSummary. + :rtype: bool + """ + return self._is_fail_open + + @is_fail_open.setter + def is_fail_open(self, is_fail_open): + """ + Sets the is_fail_open of this BackendSetSummary. + If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy. + The value is false by default. + + + :param is_fail_open: The is_fail_open of this BackendSetSummary. + :type: bool + """ + self._is_fail_open = is_fail_open + + @property + def is_instant_failover_enabled(self): + """ + Gets the is_instant_failover_enabled of this BackendSetSummary. + If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy. + + + :return: The is_instant_failover_enabled of this BackendSetSummary. + :rtype: bool + """ + return self._is_instant_failover_enabled + + @is_instant_failover_enabled.setter + def is_instant_failover_enabled(self, is_instant_failover_enabled): + """ + Sets the is_instant_failover_enabled of this BackendSetSummary. + If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy. + + + :param is_instant_failover_enabled: The is_instant_failover_enabled of this BackendSetSummary. + :type: bool + """ + self._is_instant_failover_enabled = is_instant_failover_enabled + @property def ip_version(self): """ diff --git a/src/oci/network_load_balancer/models/create_backend_set_details.py b/src/oci/network_load_balancer/models/create_backend_set_details.py index b818afbfc8..09144df8d5 100644 --- a/src/oci/network_load_balancer/models/create_backend_set_details.py +++ b/src/oci/network_load_balancer/models/create_backend_set_details.py @@ -59,6 +59,14 @@ def __init__(self, **kwargs): The value to assign to the is_preserve_source property of this CreateBackendSetDetails. :type is_preserve_source: bool + :param is_fail_open: + The value to assign to the is_fail_open property of this CreateBackendSetDetails. + :type is_fail_open: bool + + :param is_instant_failover_enabled: + The value to assign to the is_instant_failover_enabled property of this CreateBackendSetDetails. + :type is_instant_failover_enabled: bool + :param ip_version: The value to assign to the ip_version property of this CreateBackendSetDetails. Allowed values for this property are: "IPV4", "IPV6" @@ -77,6 +85,8 @@ def __init__(self, **kwargs): 'name': 'str', 'policy': 'str', 'is_preserve_source': 'bool', + 'is_fail_open': 'bool', + 'is_instant_failover_enabled': 'bool', 'ip_version': 'str', 'backends': 'list[BackendDetails]', 'health_checker': 'HealthCheckerDetails' @@ -86,6 +96,8 @@ def __init__(self, **kwargs): 'name': 'name', 'policy': 'policy', 'is_preserve_source': 'isPreserveSource', + 'is_fail_open': 'isFailOpen', + 'is_instant_failover_enabled': 'isInstantFailoverEnabled', 'ip_version': 'ipVersion', 'backends': 'backends', 'health_checker': 'healthChecker' @@ -94,6 +106,8 @@ def __init__(self, **kwargs): self._name = None self._policy = None self._is_preserve_source = None + self._is_fail_open = None + self._is_instant_failover_enabled = None self._ip_version = None self._backends = None self._health_checker = None @@ -195,6 +209,56 @@ def is_preserve_source(self, is_preserve_source): """ self._is_preserve_source = is_preserve_source + @property + def is_fail_open(self): + """ + Gets the is_fail_open of this CreateBackendSetDetails. + If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy. + The value is false by default. + + + :return: The is_fail_open of this CreateBackendSetDetails. + :rtype: bool + """ + return self._is_fail_open + + @is_fail_open.setter + def is_fail_open(self, is_fail_open): + """ + Sets the is_fail_open of this CreateBackendSetDetails. + If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy. + The value is false by default. + + + :param is_fail_open: The is_fail_open of this CreateBackendSetDetails. + :type: bool + """ + self._is_fail_open = is_fail_open + + @property + def is_instant_failover_enabled(self): + """ + Gets the is_instant_failover_enabled of this CreateBackendSetDetails. + If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy. + + + :return: The is_instant_failover_enabled of this CreateBackendSetDetails. + :rtype: bool + """ + return self._is_instant_failover_enabled + + @is_instant_failover_enabled.setter + def is_instant_failover_enabled(self, is_instant_failover_enabled): + """ + Sets the is_instant_failover_enabled of this CreateBackendSetDetails. + If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy. + + + :param is_instant_failover_enabled: The is_instant_failover_enabled of this CreateBackendSetDetails. + :type: bool + """ + self._is_instant_failover_enabled = is_instant_failover_enabled + @property def ip_version(self): """ diff --git a/src/oci/network_load_balancer/models/dns_health_checker_details.py b/src/oci/network_load_balancer/models/dns_health_checker_details.py new file mode 100644 index 0000000000..bde6649069 --- /dev/null +++ b/src/oci/network_load_balancer/models/dns_health_checker_details.py @@ -0,0 +1,264 @@ +# coding: utf-8 +# Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +# NOTE: This class is auto generated by OracleSDKGenerator. DO NOT EDIT. API Version: 20200501 + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class DnsHealthCheckerDetails(object): + """ + DNS healthcheck configurations. + """ + + #: A constant which can be used with the transport_protocol property of a DnsHealthCheckerDetails. + #: This constant has a value of "UDP" + TRANSPORT_PROTOCOL_UDP = "UDP" + + #: A constant which can be used with the transport_protocol property of a DnsHealthCheckerDetails. + #: This constant has a value of "TCP" + TRANSPORT_PROTOCOL_TCP = "TCP" + + #: A constant which can be used with the query_class property of a DnsHealthCheckerDetails. + #: This constant has a value of "IN" + QUERY_CLASS_IN = "IN" + + #: A constant which can be used with the query_class property of a DnsHealthCheckerDetails. + #: This constant has a value of "CH" + QUERY_CLASS_CH = "CH" + + #: A constant which can be used with the query_type property of a DnsHealthCheckerDetails. + #: This constant has a value of "A" + QUERY_TYPE_A = "A" + + #: A constant which can be used with the query_type property of a DnsHealthCheckerDetails. + #: This constant has a value of "TXT" + QUERY_TYPE_TXT = "TXT" + + #: A constant which can be used with the query_type property of a DnsHealthCheckerDetails. + #: This constant has a value of "AAAA" + QUERY_TYPE_AAAA = "AAAA" + + def __init__(self, **kwargs): + """ + Initializes a new DnsHealthCheckerDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param transport_protocol: + The value to assign to the transport_protocol property of this DnsHealthCheckerDetails. + Allowed values for this property are: "UDP", "TCP", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type transport_protocol: str + + :param domain_name: + The value to assign to the domain_name property of this DnsHealthCheckerDetails. + :type domain_name: str + + :param query_class: + The value to assign to the query_class property of this DnsHealthCheckerDetails. + Allowed values for this property are: "IN", "CH", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type query_class: str + + :param query_type: + The value to assign to the query_type property of this DnsHealthCheckerDetails. + Allowed values for this property are: "A", "TXT", "AAAA", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type query_type: str + + :param rcodes: + The value to assign to the rcodes property of this DnsHealthCheckerDetails. + :type rcodes: list[oci.network_load_balancer.models.DnsHealthCheckRCodes] + + """ + self.swagger_types = { + 'transport_protocol': 'str', + 'domain_name': 'str', + 'query_class': 'str', + 'query_type': 'str', + 'rcodes': 'list[DnsHealthCheckRCodes]' + } + + self.attribute_map = { + 'transport_protocol': 'transportProtocol', + 'domain_name': 'domainName', + 'query_class': 'queryClass', + 'query_type': 'queryType', + 'rcodes': 'rcodes' + } + + self._transport_protocol = None + self._domain_name = None + self._query_class = None + self._query_type = None + self._rcodes = None + + @property + def transport_protocol(self): + """ + Gets the transport_protocol of this DnsHealthCheckerDetails. + DNS transport protocol; either UDP or TCP. + + Example: `UDP` + + Allowed values for this property are: "UDP", "TCP", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The transport_protocol of this DnsHealthCheckerDetails. + :rtype: str + """ + return self._transport_protocol + + @transport_protocol.setter + def transport_protocol(self, transport_protocol): + """ + Sets the transport_protocol of this DnsHealthCheckerDetails. + DNS transport protocol; either UDP or TCP. + + Example: `UDP` + + + :param transport_protocol: The transport_protocol of this DnsHealthCheckerDetails. + :type: str + """ + allowed_values = ["UDP", "TCP"] + if not value_allowed_none_or_none_sentinel(transport_protocol, allowed_values): + transport_protocol = 'UNKNOWN_ENUM_VALUE' + self._transport_protocol = transport_protocol + + @property + def domain_name(self): + """ + **[Required]** Gets the domain_name of this DnsHealthCheckerDetails. + The absolute fully-qualified domain name to perform periodic DNS queries. + If not provided, an extra dot will be added at the end of a domain name during the query. + + + :return: The domain_name of this DnsHealthCheckerDetails. + :rtype: str + """ + return self._domain_name + + @domain_name.setter + def domain_name(self, domain_name): + """ + Sets the domain_name of this DnsHealthCheckerDetails. + The absolute fully-qualified domain name to perform periodic DNS queries. + If not provided, an extra dot will be added at the end of a domain name during the query. + + + :param domain_name: The domain_name of this DnsHealthCheckerDetails. + :type: str + """ + self._domain_name = domain_name + + @property + def query_class(self): + """ + Gets the query_class of this DnsHealthCheckerDetails. + The class the dns health check query to use; either IN or CH. + + Example: `IN` + + Allowed values for this property are: "IN", "CH", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The query_class of this DnsHealthCheckerDetails. + :rtype: str + """ + return self._query_class + + @query_class.setter + def query_class(self, query_class): + """ + Sets the query_class of this DnsHealthCheckerDetails. + The class the dns health check query to use; either IN or CH. + + Example: `IN` + + + :param query_class: The query_class of this DnsHealthCheckerDetails. + :type: str + """ + allowed_values = ["IN", "CH"] + if not value_allowed_none_or_none_sentinel(query_class, allowed_values): + query_class = 'UNKNOWN_ENUM_VALUE' + self._query_class = query_class + + @property + def query_type(self): + """ + Gets the query_type of this DnsHealthCheckerDetails. + The type the dns health check query to use; A, AAAA, TXT. + + Example: `A` + + Allowed values for this property are: "A", "TXT", "AAAA", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The query_type of this DnsHealthCheckerDetails. + :rtype: str + """ + return self._query_type + + @query_type.setter + def query_type(self, query_type): + """ + Sets the query_type of this DnsHealthCheckerDetails. + The type the dns health check query to use; A, AAAA, TXT. + + Example: `A` + + + :param query_type: The query_type of this DnsHealthCheckerDetails. + :type: str + """ + allowed_values = ["A", "TXT", "AAAA"] + if not value_allowed_none_or_none_sentinel(query_type, allowed_values): + query_type = 'UNKNOWN_ENUM_VALUE' + self._query_type = query_type + + @property + def rcodes(self): + """ + Gets the rcodes of this DnsHealthCheckerDetails. + An array that represents accepetable RCODE values for DNS query response. + Example: [\"NOERROR\", \"NXDOMAIN\"] + + + :return: The rcodes of this DnsHealthCheckerDetails. + :rtype: list[oci.network_load_balancer.models.DnsHealthCheckRCodes] + """ + return self._rcodes + + @rcodes.setter + def rcodes(self, rcodes): + """ + Sets the rcodes of this DnsHealthCheckerDetails. + An array that represents accepetable RCODE values for DNS query response. + Example: [\"NOERROR\", \"NXDOMAIN\"] + + + :param rcodes: The rcodes of this DnsHealthCheckerDetails. + :type: list[oci.network_load_balancer.models.DnsHealthCheckRCodes] + """ + self._rcodes = rcodes + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/network_load_balancer/models/health_checker.py b/src/oci/network_load_balancer/models/health_checker.py index 3cde4eea4e..cf7cfb8503 100644 --- a/src/oci/network_load_balancer/models/health_checker.py +++ b/src/oci/network_load_balancer/models/health_checker.py @@ -34,6 +34,10 @@ class HealthChecker(object): #: This constant has a value of "UDP" PROTOCOL_UDP = "UDP" + #: A constant which can be used with the protocol property of a HealthChecker. + #: This constant has a value of "DNS" + PROTOCOL_DNS = "DNS" + def __init__(self, **kwargs): """ Initializes a new HealthChecker object with values from keyword arguments. @@ -41,7 +45,7 @@ def __init__(self, **kwargs): :param protocol: The value to assign to the protocol property of this HealthChecker. - Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP", "DNS", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type protocol: str @@ -81,6 +85,10 @@ def __init__(self, **kwargs): The value to assign to the response_data property of this HealthChecker. :type response_data: str + :param dns: + The value to assign to the dns property of this HealthChecker. + :type dns: oci.network_load_balancer.models.DnsHealthCheckerDetails + """ self.swagger_types = { 'protocol': 'str', @@ -92,7 +100,8 @@ def __init__(self, **kwargs): 'response_body_regex': 'str', 'return_code': 'int', 'request_data': 'str', - 'response_data': 'str' + 'response_data': 'str', + 'dns': 'DnsHealthCheckerDetails' } self.attribute_map = { @@ -105,7 +114,8 @@ def __init__(self, **kwargs): 'response_body_regex': 'responseBodyRegex', 'return_code': 'returnCode', 'request_data': 'requestData', - 'response_data': 'responseData' + 'response_data': 'responseData', + 'dns': 'dns' } self._protocol = None @@ -118,6 +128,7 @@ def __init__(self, **kwargs): self._return_code = None self._request_data = None self._response_data = None + self._dns = None @property def protocol(self): @@ -127,7 +138,7 @@ def protocol(self): Example: `HTTP` - Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP", "DNS", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -148,7 +159,7 @@ def protocol(self, protocol): :param protocol: The protocol of this HealthChecker. :type: str """ - allowed_values = ["HTTP", "HTTPS", "TCP", "UDP"] + allowed_values = ["HTTP", "HTTPS", "TCP", "UDP", "DNS"] if not value_allowed_none_or_none_sentinel(protocol, allowed_values): protocol = 'UNKNOWN_ENUM_VALUE' self._protocol = protocol @@ -405,6 +416,26 @@ def response_data(self, response_data): """ self._response_data = response_data + @property + def dns(self): + """ + Gets the dns of this HealthChecker. + + :return: The dns of this HealthChecker. + :rtype: oci.network_load_balancer.models.DnsHealthCheckerDetails + """ + return self._dns + + @dns.setter + def dns(self, dns): + """ + Sets the dns of this HealthChecker. + + :param dns: The dns of this HealthChecker. + :type: oci.network_load_balancer.models.DnsHealthCheckerDetails + """ + self._dns = dns + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/network_load_balancer/models/health_checker_details.py b/src/oci/network_load_balancer/models/health_checker_details.py index 7845cc4f59..191f07b10d 100644 --- a/src/oci/network_load_balancer/models/health_checker_details.py +++ b/src/oci/network_load_balancer/models/health_checker_details.py @@ -34,6 +34,10 @@ class HealthCheckerDetails(object): #: This constant has a value of "UDP" PROTOCOL_UDP = "UDP" + #: A constant which can be used with the protocol property of a HealthCheckerDetails. + #: This constant has a value of "DNS" + PROTOCOL_DNS = "DNS" + def __init__(self, **kwargs): """ Initializes a new HealthCheckerDetails object with values from keyword arguments. @@ -41,7 +45,7 @@ def __init__(self, **kwargs): :param protocol: The value to assign to the protocol property of this HealthCheckerDetails. - Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP" + Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP", "DNS" :type protocol: str :param port: @@ -80,6 +84,10 @@ def __init__(self, **kwargs): The value to assign to the response_data property of this HealthCheckerDetails. :type response_data: str + :param dns: + The value to assign to the dns property of this HealthCheckerDetails. + :type dns: oci.network_load_balancer.models.DnsHealthCheckerDetails + """ self.swagger_types = { 'protocol': 'str', @@ -91,7 +99,8 @@ def __init__(self, **kwargs): 'response_body_regex': 'str', 'return_code': 'int', 'request_data': 'str', - 'response_data': 'str' + 'response_data': 'str', + 'dns': 'DnsHealthCheckerDetails' } self.attribute_map = { @@ -104,7 +113,8 @@ def __init__(self, **kwargs): 'response_body_regex': 'responseBodyRegex', 'return_code': 'returnCode', 'request_data': 'requestData', - 'response_data': 'responseData' + 'response_data': 'responseData', + 'dns': 'dns' } self._protocol = None @@ -117,6 +127,7 @@ def __init__(self, **kwargs): self._return_code = None self._request_data = None self._response_data = None + self._dns = None @property def protocol(self): @@ -126,7 +137,7 @@ def protocol(self): Example: `HTTP` - Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP" + Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP", "DNS" :return: The protocol of this HealthCheckerDetails. @@ -146,7 +157,7 @@ def protocol(self, protocol): :param protocol: The protocol of this HealthCheckerDetails. :type: str """ - allowed_values = ["HTTP", "HTTPS", "TCP", "UDP"] + allowed_values = ["HTTP", "HTTPS", "TCP", "UDP", "DNS"] if not value_allowed_none_or_none_sentinel(protocol, allowed_values): raise ValueError( f"Invalid value for `protocol`, must be None or one of {allowed_values}" @@ -405,6 +416,26 @@ def response_data(self, response_data): """ self._response_data = response_data + @property + def dns(self): + """ + Gets the dns of this HealthCheckerDetails. + + :return: The dns of this HealthCheckerDetails. + :rtype: oci.network_load_balancer.models.DnsHealthCheckerDetails + """ + return self._dns + + @dns.setter + def dns(self, dns): + """ + Sets the dns of this HealthCheckerDetails. + + :param dns: The dns of this HealthCheckerDetails. + :type: oci.network_load_balancer.models.DnsHealthCheckerDetails + """ + self._dns = dns + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/network_load_balancer/models/update_backend_set_details.py b/src/oci/network_load_balancer/models/update_backend_set_details.py index 0032c4d868..93ae0b3267 100644 --- a/src/oci/network_load_balancer/models/update_backend_set_details.py +++ b/src/oci/network_load_balancer/models/update_backend_set_details.py @@ -42,6 +42,14 @@ def __init__(self, **kwargs): The value to assign to the is_preserve_source property of this UpdateBackendSetDetails. :type is_preserve_source: bool + :param is_fail_open: + The value to assign to the is_fail_open property of this UpdateBackendSetDetails. + :type is_fail_open: bool + + :param is_instant_failover_enabled: + The value to assign to the is_instant_failover_enabled property of this UpdateBackendSetDetails. + :type is_instant_failover_enabled: bool + :param ip_version: The value to assign to the ip_version property of this UpdateBackendSetDetails. Allowed values for this property are: "IPV4", "IPV6" @@ -59,6 +67,8 @@ def __init__(self, **kwargs): self.swagger_types = { 'policy': 'str', 'is_preserve_source': 'bool', + 'is_fail_open': 'bool', + 'is_instant_failover_enabled': 'bool', 'ip_version': 'str', 'backends': 'list[BackendDetails]', 'health_checker': 'HealthCheckerDetails' @@ -67,6 +77,8 @@ def __init__(self, **kwargs): self.attribute_map = { 'policy': 'policy', 'is_preserve_source': 'isPreserveSource', + 'is_fail_open': 'isFailOpen', + 'is_instant_failover_enabled': 'isInstantFailoverEnabled', 'ip_version': 'ipVersion', 'backends': 'backends', 'health_checker': 'healthChecker' @@ -74,6 +86,8 @@ def __init__(self, **kwargs): self._policy = None self._is_preserve_source = None + self._is_fail_open = None + self._is_instant_failover_enabled = None self._ip_version = None self._backends = None self._health_checker = None @@ -136,6 +150,56 @@ def is_preserve_source(self, is_preserve_source): """ self._is_preserve_source = is_preserve_source + @property + def is_fail_open(self): + """ + Gets the is_fail_open of this UpdateBackendSetDetails. + If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy. + The value is false by default. + + + :return: The is_fail_open of this UpdateBackendSetDetails. + :rtype: bool + """ + return self._is_fail_open + + @is_fail_open.setter + def is_fail_open(self, is_fail_open): + """ + Sets the is_fail_open of this UpdateBackendSetDetails. + If enabled, the network load balancer will continue to distribute traffic in the configured distribution in the event all backends are unhealthy. + The value is false by default. + + + :param is_fail_open: The is_fail_open of this UpdateBackendSetDetails. + :type: bool + """ + self._is_fail_open = is_fail_open + + @property + def is_instant_failover_enabled(self): + """ + Gets the is_instant_failover_enabled of this UpdateBackendSetDetails. + If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy. + + + :return: The is_instant_failover_enabled of this UpdateBackendSetDetails. + :rtype: bool + """ + return self._is_instant_failover_enabled + + @is_instant_failover_enabled.setter + def is_instant_failover_enabled(self, is_instant_failover_enabled): + """ + Sets the is_instant_failover_enabled of this UpdateBackendSetDetails. + If enabled existing connections will be forwarded to an alternative healthy backend as soon as current backend becomes unhealthy. + + + :param is_instant_failover_enabled: The is_instant_failover_enabled of this UpdateBackendSetDetails. + :type: bool + """ + self._is_instant_failover_enabled = is_instant_failover_enabled + @property def ip_version(self): """ diff --git a/src/oci/network_load_balancer/models/update_health_checker_details.py b/src/oci/network_load_balancer/models/update_health_checker_details.py index 5d2f48423e..11c832f1c8 100644 --- a/src/oci/network_load_balancer/models/update_health_checker_details.py +++ b/src/oci/network_load_balancer/models/update_health_checker_details.py @@ -31,6 +31,10 @@ class UpdateHealthCheckerDetails(object): #: This constant has a value of "UDP" PROTOCOL_UDP = "UDP" + #: A constant which can be used with the protocol property of a UpdateHealthCheckerDetails. + #: This constant has a value of "DNS" + PROTOCOL_DNS = "DNS" + def __init__(self, **kwargs): """ Initializes a new UpdateHealthCheckerDetails object with values from keyword arguments. @@ -38,7 +42,7 @@ def __init__(self, **kwargs): :param protocol: The value to assign to the protocol property of this UpdateHealthCheckerDetails. - Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP" + Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP", "DNS" :type protocol: str :param port: @@ -77,6 +81,10 @@ def __init__(self, **kwargs): The value to assign to the response_data property of this UpdateHealthCheckerDetails. :type response_data: str + :param dns: + The value to assign to the dns property of this UpdateHealthCheckerDetails. + :type dns: oci.network_load_balancer.models.DnsHealthCheckerDetails + """ self.swagger_types = { 'protocol': 'str', @@ -88,7 +96,8 @@ def __init__(self, **kwargs): 'response_body_regex': 'str', 'return_code': 'int', 'request_data': 'str', - 'response_data': 'str' + 'response_data': 'str', + 'dns': 'DnsHealthCheckerDetails' } self.attribute_map = { @@ -101,7 +110,8 @@ def __init__(self, **kwargs): 'response_body_regex': 'responseBodyRegex', 'return_code': 'returnCode', 'request_data': 'requestData', - 'response_data': 'responseData' + 'response_data': 'responseData', + 'dns': 'dns' } self._protocol = None @@ -114,6 +124,7 @@ def __init__(self, **kwargs): self._return_code = None self._request_data = None self._response_data = None + self._dns = None @property def protocol(self): @@ -123,7 +134,7 @@ def protocol(self): Example: `HTTP` - Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP" + Allowed values for this property are: "HTTP", "HTTPS", "TCP", "UDP", "DNS" :return: The protocol of this UpdateHealthCheckerDetails. @@ -143,7 +154,7 @@ def protocol(self, protocol): :param protocol: The protocol of this UpdateHealthCheckerDetails. :type: str """ - allowed_values = ["HTTP", "HTTPS", "TCP", "UDP"] + allowed_values = ["HTTP", "HTTPS", "TCP", "UDP", "DNS"] if not value_allowed_none_or_none_sentinel(protocol, allowed_values): raise ValueError( f"Invalid value for `protocol`, must be None or one of {allowed_values}" @@ -400,6 +411,26 @@ def response_data(self, response_data): """ self._response_data = response_data + @property + def dns(self): + """ + Gets the dns of this UpdateHealthCheckerDetails. + + :return: The dns of this UpdateHealthCheckerDetails. + :rtype: oci.network_load_balancer.models.DnsHealthCheckerDetails + """ + return self._dns + + @dns.setter + def dns(self, dns): + """ + Sets the dns of this UpdateHealthCheckerDetails. + + :param dns: The dns of this UpdateHealthCheckerDetails. + :type: oci.network_load_balancer.models.DnsHealthCheckerDetails + """ + self._dns = dns + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/regions_definitions.py b/src/oci/regions_definitions.py index db346c5390..196d33f41e 100644 --- a/src/oci/regions_definitions.py +++ b/src/oci/regions_definitions.py @@ -58,6 +58,7 @@ 'dtm': 'eu-dcc-rating-2', 'dus': 'eu-dcc-rating-1', 'ork': 'eu-dcc-dublin-1', + 'dac': 'ap-dcc-gazipur-1', 'vll': 'eu-madrid-2', 'str': 'eu-frankfurt-2', 'beg': 'eu-jovanovac-1', @@ -129,6 +130,8 @@ 'eu-dcc-rating-1': 'oc14', 'eu-dcc-dublin-1': 'oc14', + 'ap-dcc-gazipur-1': 'oc15', + 'eu-madrid-2': 'oc19', 'eu-frankfurt-2': 'oc19', @@ -149,6 +152,7 @@ 'oc9': 'oraclecloud9.com', 'oc10': 'oraclecloud10.com', 'oc14': 'oraclecloud14.com', + 'oc15': 'oraclecloud15.com', 'oc19': 'oraclecloud.eu', 'oc20': 'oraclecloud20.com', 'oc21': 'oraclecloud21.com', @@ -211,6 +215,7 @@ 'eu-dcc-rating-2', 'eu-dcc-rating-1', 'eu-dcc-dublin-1', + 'ap-dcc-gazipur-1', 'eu-madrid-2', 'eu-frankfurt-2', 'eu-jovanovac-1', diff --git a/src/oci/stack_monitoring/models/associated_monitored_resource.py b/src/oci/stack_monitoring/models/associated_monitored_resource.py index 6a2cbd19c1..9fc75833be 100644 --- a/src/oci/stack_monitoring/models/associated_monitored_resource.py +++ b/src/oci/stack_monitoring/models/associated_monitored_resource.py @@ -47,6 +47,46 @@ class AssociatedMonitoredResource(object): #: This constant has a value of "ENTERPRISE_EDITION" LICENSE_ENTERPRISE_EDITION = "ENTERPRISE_EDITION" + #: A constant which can be used with the source_type property of a AssociatedMonitoredResource. + #: This constant has a value of "SM_MGMT_AGENT_MONITORED" + SOURCE_TYPE_SM_MGMT_AGENT_MONITORED = "SM_MGMT_AGENT_MONITORED" + + #: A constant which can be used with the source_type property of a AssociatedMonitoredResource. + #: This constant has a value of "SM_REPO_ONLY" + SOURCE_TYPE_SM_REPO_ONLY = "SM_REPO_ONLY" + + #: A constant which can be used with the source_type property of a AssociatedMonitoredResource. + #: This constant has a value of "OCI_NATIVE" + SOURCE_TYPE_OCI_NATIVE = "OCI_NATIVE" + + #: A constant which can be used with the source_type property of a AssociatedMonitoredResource. + #: This constant has a value of "PROMETHEUS" + SOURCE_TYPE_PROMETHEUS = "PROMETHEUS" + + #: A constant which can be used with the source_type property of a AssociatedMonitoredResource. + #: This constant has a value of "TELEGRAF" + SOURCE_TYPE_TELEGRAF = "TELEGRAF" + + #: A constant which can be used with the source_type property of a AssociatedMonitoredResource. + #: This constant has a value of "COLLECTD" + SOURCE_TYPE_COLLECTD = "COLLECTD" + + #: A constant which can be used with the resource_category property of a AssociatedMonitoredResource. + #: This constant has a value of "APPLICATION" + RESOURCE_CATEGORY_APPLICATION = "APPLICATION" + + #: A constant which can be used with the resource_category property of a AssociatedMonitoredResource. + #: This constant has a value of "DATABASE" + RESOURCE_CATEGORY_DATABASE = "DATABASE" + + #: A constant which can be used with the resource_category property of a AssociatedMonitoredResource. + #: This constant has a value of "MIDDLEWARE" + RESOURCE_CATEGORY_MIDDLEWARE = "MIDDLEWARE" + + #: A constant which can be used with the resource_category property of a AssociatedMonitoredResource. + #: This constant has a value of "UNKNOWN" + RESOURCE_CATEGORY_UNKNOWN = "UNKNOWN" + def __init__(self, **kwargs): """ Initializes a new AssociatedMonitoredResource object with values from keyword arguments. @@ -96,6 +136,18 @@ def __init__(self, **kwargs): Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type license: str + :param source_type: + The value to assign to the source_type property of this AssociatedMonitoredResource. + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type source_type: str + + :param resource_category: + The value to assign to the resource_category property of this AssociatedMonitoredResource. + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type resource_category: str + :param association: The value to assign to the association property of this AssociatedMonitoredResource. :type association: object @@ -112,6 +164,8 @@ def __init__(self, **kwargs): 'management_agent_id': 'str', 'lifecycle_state': 'str', 'license': 'str', + 'source_type': 'str', + 'resource_category': 'str', 'association': 'object' } @@ -126,6 +180,8 @@ def __init__(self, **kwargs): 'management_agent_id': 'managementAgentId', 'lifecycle_state': 'lifecycleState', 'license': 'license', + 'source_type': 'sourceType', + 'resource_category': 'resourceCategory', 'association': 'association' } @@ -139,6 +195,8 @@ def __init__(self, **kwargs): self._management_agent_id = None self._lifecycle_state = None self._license = None + self._source_type = None + self._resource_category = None self._association = None @property @@ -415,6 +473,66 @@ def license(self, license): license = 'UNKNOWN_ENUM_VALUE' self._license = license + @property + def source_type(self): + """ + Gets the source_type of this AssociatedMonitoredResource. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The source_type of this AssociatedMonitoredResource. + :rtype: str + """ + return self._source_type + + @source_type.setter + def source_type(self, source_type): + """ + Sets the source_type of this AssociatedMonitoredResource. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + + :param source_type: The source_type of this AssociatedMonitoredResource. + :type: str + """ + allowed_values = ["SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD"] + if not value_allowed_none_or_none_sentinel(source_type, allowed_values): + source_type = 'UNKNOWN_ENUM_VALUE' + self._source_type = source_type + + @property + def resource_category(self): + """ + Gets the resource_category of this AssociatedMonitoredResource. + Resource Category to indicate the kind of resource type. + + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The resource_category of this AssociatedMonitoredResource. + :rtype: str + """ + return self._resource_category + + @resource_category.setter + def resource_category(self, resource_category): + """ + Sets the resource_category of this AssociatedMonitoredResource. + Resource Category to indicate the kind of resource type. + + + :param resource_category: The resource_category of this AssociatedMonitoredResource. + :type: str + """ + allowed_values = ["APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(resource_category, allowed_values): + resource_category = 'UNKNOWN_ENUM_VALUE' + self._resource_category = resource_category + @property def association(self): """ diff --git a/src/oci/stack_monitoring/models/associated_resources_summary.py b/src/oci/stack_monitoring/models/associated_resources_summary.py index 87c9a373e5..d1c197cd9c 100644 --- a/src/oci/stack_monitoring/models/associated_resources_summary.py +++ b/src/oci/stack_monitoring/models/associated_resources_summary.py @@ -47,6 +47,46 @@ class AssociatedResourcesSummary(object): #: This constant has a value of "ENTERPRISE_EDITION" LICENSE_ENTERPRISE_EDITION = "ENTERPRISE_EDITION" + #: A constant which can be used with the source_type property of a AssociatedResourcesSummary. + #: This constant has a value of "SM_MGMT_AGENT_MONITORED" + SOURCE_TYPE_SM_MGMT_AGENT_MONITORED = "SM_MGMT_AGENT_MONITORED" + + #: A constant which can be used with the source_type property of a AssociatedResourcesSummary. + #: This constant has a value of "SM_REPO_ONLY" + SOURCE_TYPE_SM_REPO_ONLY = "SM_REPO_ONLY" + + #: A constant which can be used with the source_type property of a AssociatedResourcesSummary. + #: This constant has a value of "OCI_NATIVE" + SOURCE_TYPE_OCI_NATIVE = "OCI_NATIVE" + + #: A constant which can be used with the source_type property of a AssociatedResourcesSummary. + #: This constant has a value of "PROMETHEUS" + SOURCE_TYPE_PROMETHEUS = "PROMETHEUS" + + #: A constant which can be used with the source_type property of a AssociatedResourcesSummary. + #: This constant has a value of "TELEGRAF" + SOURCE_TYPE_TELEGRAF = "TELEGRAF" + + #: A constant which can be used with the source_type property of a AssociatedResourcesSummary. + #: This constant has a value of "COLLECTD" + SOURCE_TYPE_COLLECTD = "COLLECTD" + + #: A constant which can be used with the resource_category property of a AssociatedResourcesSummary. + #: This constant has a value of "APPLICATION" + RESOURCE_CATEGORY_APPLICATION = "APPLICATION" + + #: A constant which can be used with the resource_category property of a AssociatedResourcesSummary. + #: This constant has a value of "DATABASE" + RESOURCE_CATEGORY_DATABASE = "DATABASE" + + #: A constant which can be used with the resource_category property of a AssociatedResourcesSummary. + #: This constant has a value of "MIDDLEWARE" + RESOURCE_CATEGORY_MIDDLEWARE = "MIDDLEWARE" + + #: A constant which can be used with the resource_category property of a AssociatedResourcesSummary. + #: This constant has a value of "UNKNOWN" + RESOURCE_CATEGORY_UNKNOWN = "UNKNOWN" + def __init__(self, **kwargs): """ Initializes a new AssociatedResourcesSummary object with values from keyword arguments. @@ -96,6 +136,18 @@ def __init__(self, **kwargs): Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type license: str + :param source_type: + The value to assign to the source_type property of this AssociatedResourcesSummary. + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type source_type: str + + :param resource_category: + The value to assign to the resource_category property of this AssociatedResourcesSummary. + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type resource_category: str + :param associated_resources: The value to assign to the associated_resources property of this AssociatedResourcesSummary. :type associated_resources: list[oci.stack_monitoring.models.AssociatedMonitoredResource] @@ -112,6 +164,8 @@ def __init__(self, **kwargs): 'management_agent_id': 'str', 'lifecycle_state': 'str', 'license': 'str', + 'source_type': 'str', + 'resource_category': 'str', 'associated_resources': 'list[AssociatedMonitoredResource]' } @@ -126,6 +180,8 @@ def __init__(self, **kwargs): 'management_agent_id': 'managementAgentId', 'lifecycle_state': 'lifecycleState', 'license': 'license', + 'source_type': 'sourceType', + 'resource_category': 'resourceCategory', 'associated_resources': 'associatedResources' } @@ -139,6 +195,8 @@ def __init__(self, **kwargs): self._management_agent_id = None self._lifecycle_state = None self._license = None + self._source_type = None + self._resource_category = None self._associated_resources = None @property @@ -415,6 +473,66 @@ def license(self, license): license = 'UNKNOWN_ENUM_VALUE' self._license = license + @property + def source_type(self): + """ + Gets the source_type of this AssociatedResourcesSummary. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The source_type of this AssociatedResourcesSummary. + :rtype: str + """ + return self._source_type + + @source_type.setter + def source_type(self, source_type): + """ + Sets the source_type of this AssociatedResourcesSummary. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + + :param source_type: The source_type of this AssociatedResourcesSummary. + :type: str + """ + allowed_values = ["SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD"] + if not value_allowed_none_or_none_sentinel(source_type, allowed_values): + source_type = 'UNKNOWN_ENUM_VALUE' + self._source_type = source_type + + @property + def resource_category(self): + """ + Gets the resource_category of this AssociatedResourcesSummary. + Resource Category to indicate the kind of resource type. + + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The resource_category of this AssociatedResourcesSummary. + :rtype: str + """ + return self._resource_category + + @resource_category.setter + def resource_category(self, resource_category): + """ + Sets the resource_category of this AssociatedResourcesSummary. + Resource Category to indicate the kind of resource type. + + + :param resource_category: The resource_category of this AssociatedResourcesSummary. + :type: str + """ + allowed_values = ["APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(resource_category, allowed_values): + resource_category = 'UNKNOWN_ENUM_VALUE' + self._resource_category = resource_category + @property def associated_resources(self): """ diff --git a/src/oci/stack_monitoring/models/create_monitored_resource_type_details.py b/src/oci/stack_monitoring/models/create_monitored_resource_type_details.py index aa3bd9837a..4f797c54ed 100644 --- a/src/oci/stack_monitoring/models/create_monitored_resource_type_details.py +++ b/src/oci/stack_monitoring/models/create_monitored_resource_type_details.py @@ -17,6 +17,46 @@ class CreateMonitoredResourceTypeDetails(object): for all tenancies. Service provided resource types can not be duplicated or overwritten in any tenancy. """ + #: A constant which can be used with the source_type property of a CreateMonitoredResourceTypeDetails. + #: This constant has a value of "SM_MGMT_AGENT_MONITORED" + SOURCE_TYPE_SM_MGMT_AGENT_MONITORED = "SM_MGMT_AGENT_MONITORED" + + #: A constant which can be used with the source_type property of a CreateMonitoredResourceTypeDetails. + #: This constant has a value of "SM_REPO_ONLY" + SOURCE_TYPE_SM_REPO_ONLY = "SM_REPO_ONLY" + + #: A constant which can be used with the source_type property of a CreateMonitoredResourceTypeDetails. + #: This constant has a value of "OCI_NATIVE" + SOURCE_TYPE_OCI_NATIVE = "OCI_NATIVE" + + #: A constant which can be used with the source_type property of a CreateMonitoredResourceTypeDetails. + #: This constant has a value of "PROMETHEUS" + SOURCE_TYPE_PROMETHEUS = "PROMETHEUS" + + #: A constant which can be used with the source_type property of a CreateMonitoredResourceTypeDetails. + #: This constant has a value of "TELEGRAF" + SOURCE_TYPE_TELEGRAF = "TELEGRAF" + + #: A constant which can be used with the source_type property of a CreateMonitoredResourceTypeDetails. + #: This constant has a value of "COLLECTD" + SOURCE_TYPE_COLLECTD = "COLLECTD" + + #: A constant which can be used with the resource_category property of a CreateMonitoredResourceTypeDetails. + #: This constant has a value of "APPLICATION" + RESOURCE_CATEGORY_APPLICATION = "APPLICATION" + + #: A constant which can be used with the resource_category property of a CreateMonitoredResourceTypeDetails. + #: This constant has a value of "DATABASE" + RESOURCE_CATEGORY_DATABASE = "DATABASE" + + #: A constant which can be used with the resource_category property of a CreateMonitoredResourceTypeDetails. + #: This constant has a value of "MIDDLEWARE" + RESOURCE_CATEGORY_MIDDLEWARE = "MIDDLEWARE" + + #: A constant which can be used with the resource_category property of a CreateMonitoredResourceTypeDetails. + #: This constant has a value of "UNKNOWN" + RESOURCE_CATEGORY_UNKNOWN = "UNKNOWN" + def __init__(self, **kwargs): """ Initializes a new CreateMonitoredResourceTypeDetails object with values from keyword arguments. @@ -42,6 +82,16 @@ def __init__(self, **kwargs): The value to assign to the metric_namespace property of this CreateMonitoredResourceTypeDetails. :type metric_namespace: str + :param source_type: + The value to assign to the source_type property of this CreateMonitoredResourceTypeDetails. + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD" + :type source_type: str + + :param resource_category: + The value to assign to the resource_category property of this CreateMonitoredResourceTypeDetails. + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN" + :type resource_category: str + :param metadata: The value to assign to the metadata property of this CreateMonitoredResourceTypeDetails. :type metadata: oci.stack_monitoring.models.ResourceTypeMetadataDetails @@ -61,6 +111,8 @@ def __init__(self, **kwargs): 'description': 'str', 'compartment_id': 'str', 'metric_namespace': 'str', + 'source_type': 'str', + 'resource_category': 'str', 'metadata': 'ResourceTypeMetadataDetails', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))' @@ -72,6 +124,8 @@ def __init__(self, **kwargs): 'description': 'description', 'compartment_id': 'compartmentId', 'metric_namespace': 'metricNamespace', + 'source_type': 'sourceType', + 'resource_category': 'resourceCategory', 'metadata': 'metadata', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags' @@ -82,6 +136,8 @@ def __init__(self, **kwargs): self._description = None self._compartment_id = None self._metric_namespace = None + self._source_type = None + self._resource_category = None self._metadata = None self._freeform_tags = None self._defined_tags = None @@ -212,6 +268,68 @@ def metric_namespace(self, metric_namespace): """ self._metric_namespace = metric_namespace + @property + def source_type(self): + """ + Gets the source_type of this CreateMonitoredResourceTypeDetails. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD" + + + :return: The source_type of this CreateMonitoredResourceTypeDetails. + :rtype: str + """ + return self._source_type + + @source_type.setter + def source_type(self, source_type): + """ + Sets the source_type of this CreateMonitoredResourceTypeDetails. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + + :param source_type: The source_type of this CreateMonitoredResourceTypeDetails. + :type: str + """ + allowed_values = ["SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD"] + if not value_allowed_none_or_none_sentinel(source_type, allowed_values): + raise ValueError( + f"Invalid value for `source_type`, must be None or one of {allowed_values}" + ) + self._source_type = source_type + + @property + def resource_category(self): + """ + Gets the resource_category of this CreateMonitoredResourceTypeDetails. + Resource Category to indicate the kind of resource type. + + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN" + + + :return: The resource_category of this CreateMonitoredResourceTypeDetails. + :rtype: str + """ + return self._resource_category + + @resource_category.setter + def resource_category(self, resource_category): + """ + Sets the resource_category of this CreateMonitoredResourceTypeDetails. + Resource Category to indicate the kind of resource type. + + + :param resource_category: The resource_category of this CreateMonitoredResourceTypeDetails. + :type: str + """ + allowed_values = ["APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(resource_category, allowed_values): + raise ValueError( + f"Invalid value for `resource_category`, must be None or one of {allowed_values}" + ) + self._resource_category = resource_category + @property def metadata(self): """ diff --git a/src/oci/stack_monitoring/models/discovery_job_log_summary.py b/src/oci/stack_monitoring/models/discovery_job_log_summary.py index cfae5a815c..23e4bc7325 100644 --- a/src/oci/stack_monitoring/models/discovery_job_log_summary.py +++ b/src/oci/stack_monitoring/models/discovery_job_log_summary.py @@ -54,25 +54,32 @@ def __init__(self, **kwargs): The value to assign to the time_created property of this DiscoveryJobLogSummary. :type time_created: datetime + :param system_tags: + The value to assign to the system_tags property of this DiscoveryJobLogSummary. + :type system_tags: dict(str, dict(str, object)) + """ self.swagger_types = { 'id': 'str', 'log_type': 'str', 'log_message': 'str', - 'time_created': 'datetime' + 'time_created': 'datetime', + 'system_tags': 'dict(str, dict(str, object))' } self.attribute_map = { 'id': 'id', 'log_type': 'logType', 'log_message': 'logMessage', - 'time_created': 'timeCreated' + 'time_created': 'timeCreated', + 'system_tags': 'systemTags' } self._id = None self._log_type = None self._log_message = None self._time_created = None + self._system_tags = None @property def id(self): @@ -176,6 +183,32 @@ def time_created(self, time_created): """ self._time_created = time_created + @property + def system_tags(self): + """ + Gets the system_tags of this DiscoveryJobLogSummary. + Usage of system tag keys. These predefined keys are scoped to namespaces. + Example: `{\"orcl-cloud\": {\"free-tier-retained\": \"true\"}}` + + + :return: The system_tags of this DiscoveryJobLogSummary. + :rtype: dict(str, dict(str, object)) + """ + return self._system_tags + + @system_tags.setter + def system_tags(self, system_tags): + """ + Sets the system_tags of this DiscoveryJobLogSummary. + Usage of system tag keys. These predefined keys are scoped to namespaces. + Example: `{\"orcl-cloud\": {\"free-tier-retained\": \"true\"}}` + + + :param system_tags: The system_tags of this DiscoveryJobLogSummary. + :type: dict(str, dict(str, object)) + """ + self._system_tags = system_tags + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/stack_monitoring/models/import_oci_telemetry_resources_task_details.py b/src/oci/stack_monitoring/models/import_oci_telemetry_resources_task_details.py index ff3fb447b8..04f6182d4f 100644 --- a/src/oci/stack_monitoring/models/import_oci_telemetry_resources_task_details.py +++ b/src/oci/stack_monitoring/models/import_oci_telemetry_resources_task_details.py @@ -49,6 +49,42 @@ def __init__(self, **kwargs): The value to assign to the resource_group property of this ImportOciTelemetryResourcesTaskDetails. :type resource_group: str + :param should_use_metrics_flow_for_status: + The value to assign to the should_use_metrics_flow_for_status property of this ImportOciTelemetryResourcesTaskDetails. + :type should_use_metrics_flow_for_status: bool + + :param service_base_url: + The value to assign to the service_base_url property of this ImportOciTelemetryResourcesTaskDetails. + :type service_base_url: str + + :param console_path_prefix: + The value to assign to the console_path_prefix property of this ImportOciTelemetryResourcesTaskDetails. + :type console_path_prefix: str + + :param lifecycle_status_mappings_for_up_status: + The value to assign to the lifecycle_status_mappings_for_up_status property of this ImportOciTelemetryResourcesTaskDetails. + :type lifecycle_status_mappings_for_up_status: list[str] + + :param resource_name_mapping: + The value to assign to the resource_name_mapping property of this ImportOciTelemetryResourcesTaskDetails. + :type resource_name_mapping: str + + :param external_id_mapping: + The value to assign to the external_id_mapping property of this ImportOciTelemetryResourcesTaskDetails. + :type external_id_mapping: str + + :param resource_type_mapping: + The value to assign to the resource_type_mapping property of this ImportOciTelemetryResourcesTaskDetails. + :type resource_type_mapping: str + + :param resource_name_filter: + The value to assign to the resource_name_filter property of this ImportOciTelemetryResourcesTaskDetails. + :type resource_name_filter: str + + :param resource_type_filter: + The value to assign to the resource_type_filter property of this ImportOciTelemetryResourcesTaskDetails. + :type resource_type_filter: str + :param availability_proxy_metrics: The value to assign to the availability_proxy_metrics property of this ImportOciTelemetryResourcesTaskDetails. :type availability_proxy_metrics: list[str] @@ -63,6 +99,15 @@ def __init__(self, **kwargs): 'source': 'str', 'namespace': 'str', 'resource_group': 'str', + 'should_use_metrics_flow_for_status': 'bool', + 'service_base_url': 'str', + 'console_path_prefix': 'str', + 'lifecycle_status_mappings_for_up_status': 'list[str]', + 'resource_name_mapping': 'str', + 'external_id_mapping': 'str', + 'resource_type_mapping': 'str', + 'resource_name_filter': 'str', + 'resource_type_filter': 'str', 'availability_proxy_metrics': 'list[str]', 'availability_proxy_metric_collection_interval': 'int' } @@ -72,6 +117,15 @@ def __init__(self, **kwargs): 'source': 'source', 'namespace': 'namespace', 'resource_group': 'resourceGroup', + 'should_use_metrics_flow_for_status': 'shouldUseMetricsFlowForStatus', + 'service_base_url': 'serviceBaseUrl', + 'console_path_prefix': 'consolePathPrefix', + 'lifecycle_status_mappings_for_up_status': 'lifecycleStatusMappingsForUpStatus', + 'resource_name_mapping': 'resourceNameMapping', + 'external_id_mapping': 'externalIdMapping', + 'resource_type_mapping': 'resourceTypeMapping', + 'resource_name_filter': 'resourceNameFilter', + 'resource_type_filter': 'resourceTypeFilter', 'availability_proxy_metrics': 'availabilityProxyMetrics', 'availability_proxy_metric_collection_interval': 'availabilityProxyMetricCollectionInterval' } @@ -80,6 +134,15 @@ def __init__(self, **kwargs): self._source = None self._namespace = None self._resource_group = None + self._should_use_metrics_flow_for_status = None + self._service_base_url = None + self._console_path_prefix = None + self._lifecycle_status_mappings_for_up_status = None + self._resource_name_mapping = None + self._external_id_mapping = None + self._resource_type_mapping = None + self._resource_name_filter = None + self._resource_type_filter = None self._availability_proxy_metrics = None self._availability_proxy_metric_collection_interval = None self._type = 'IMPORT_OCI_TELEMETRY_RESOURCES' @@ -170,6 +233,244 @@ def resource_group(self, resource_group): """ self._resource_group = resource_group + @property + def should_use_metrics_flow_for_status(self): + """ + Gets the should_use_metrics_flow_for_status of this ImportOciTelemetryResourcesTaskDetails. + Flag to indicate whether status is calculated using metrics or + LifeCycleState attribute of the resource in OCI service. + + + :return: The should_use_metrics_flow_for_status of this ImportOciTelemetryResourcesTaskDetails. + :rtype: bool + """ + return self._should_use_metrics_flow_for_status + + @should_use_metrics_flow_for_status.setter + def should_use_metrics_flow_for_status(self, should_use_metrics_flow_for_status): + """ + Sets the should_use_metrics_flow_for_status of this ImportOciTelemetryResourcesTaskDetails. + Flag to indicate whether status is calculated using metrics or + LifeCycleState attribute of the resource in OCI service. + + + :param should_use_metrics_flow_for_status: The should_use_metrics_flow_for_status of this ImportOciTelemetryResourcesTaskDetails. + :type: bool + """ + self._should_use_metrics_flow_for_status = should_use_metrics_flow_for_status + + @property + def service_base_url(self): + """ + Gets the service_base_url of this ImportOciTelemetryResourcesTaskDetails. + The base URL of the OCI service to which the resource belongs to. + Also this property is applicable only when source is OCI_TELEMETRY_NATIVE. + + + :return: The service_base_url of this ImportOciTelemetryResourcesTaskDetails. + :rtype: str + """ + return self._service_base_url + + @service_base_url.setter + def service_base_url(self, service_base_url): + """ + Sets the service_base_url of this ImportOciTelemetryResourcesTaskDetails. + The base URL of the OCI service to which the resource belongs to. + Also this property is applicable only when source is OCI_TELEMETRY_NATIVE. + + + :param service_base_url: The service_base_url of this ImportOciTelemetryResourcesTaskDetails. + :type: str + """ + self._service_base_url = service_base_url + + @property + def console_path_prefix(self): + """ + Gets the console_path_prefix of this ImportOciTelemetryResourcesTaskDetails. + The console path prefix to use for providing service home url page navigation. + For example if the prefix provided is 'security/bastion/bastions', the URL used for navigation will be + https:///security/bastion/bastions/. If not provided, service home page link + will not be shown in the stack monitoring home page. + + + :return: The console_path_prefix of this ImportOciTelemetryResourcesTaskDetails. + :rtype: str + """ + return self._console_path_prefix + + @console_path_prefix.setter + def console_path_prefix(self, console_path_prefix): + """ + Sets the console_path_prefix of this ImportOciTelemetryResourcesTaskDetails. + The console path prefix to use for providing service home url page navigation. + For example if the prefix provided is 'security/bastion/bastions', the URL used for navigation will be + https:///security/bastion/bastions/. If not provided, service home page link + will not be shown in the stack monitoring home page. + + + :param console_path_prefix: The console_path_prefix of this ImportOciTelemetryResourcesTaskDetails. + :type: str + """ + self._console_path_prefix = console_path_prefix + + @property + def lifecycle_status_mappings_for_up_status(self): + """ + Gets the lifecycle_status_mappings_for_up_status of this ImportOciTelemetryResourcesTaskDetails. + Lifecycle states of the external resource which reflects the status of the resource being up. + + + :return: The lifecycle_status_mappings_for_up_status of this ImportOciTelemetryResourcesTaskDetails. + :rtype: list[str] + """ + return self._lifecycle_status_mappings_for_up_status + + @lifecycle_status_mappings_for_up_status.setter + def lifecycle_status_mappings_for_up_status(self, lifecycle_status_mappings_for_up_status): + """ + Sets the lifecycle_status_mappings_for_up_status of this ImportOciTelemetryResourcesTaskDetails. + Lifecycle states of the external resource which reflects the status of the resource being up. + + + :param lifecycle_status_mappings_for_up_status: The lifecycle_status_mappings_for_up_status of this ImportOciTelemetryResourcesTaskDetails. + :type: list[str] + """ + self._lifecycle_status_mappings_for_up_status = lifecycle_status_mappings_for_up_status + + @property + def resource_name_mapping(self): + """ + Gets the resource_name_mapping of this ImportOciTelemetryResourcesTaskDetails. + The resource name property in the metric dimensions. + Resources imported will be using this property value for resource name. + + + :return: The resource_name_mapping of this ImportOciTelemetryResourcesTaskDetails. + :rtype: str + """ + return self._resource_name_mapping + + @resource_name_mapping.setter + def resource_name_mapping(self, resource_name_mapping): + """ + Sets the resource_name_mapping of this ImportOciTelemetryResourcesTaskDetails. + The resource name property in the metric dimensions. + Resources imported will be using this property value for resource name. + + + :param resource_name_mapping: The resource_name_mapping of this ImportOciTelemetryResourcesTaskDetails. + :type: str + """ + self._resource_name_mapping = resource_name_mapping + + @property + def external_id_mapping(self): + """ + Gets the external_id_mapping of this ImportOciTelemetryResourcesTaskDetails. + The external resource identifier property in the metric dimensions. + Resources imported will be using this property value for external id. + + + :return: The external_id_mapping of this ImportOciTelemetryResourcesTaskDetails. + :rtype: str + """ + return self._external_id_mapping + + @external_id_mapping.setter + def external_id_mapping(self, external_id_mapping): + """ + Sets the external_id_mapping of this ImportOciTelemetryResourcesTaskDetails. + The external resource identifier property in the metric dimensions. + Resources imported will be using this property value for external id. + + + :param external_id_mapping: The external_id_mapping of this ImportOciTelemetryResourcesTaskDetails. + :type: str + """ + self._external_id_mapping = external_id_mapping + + @property + def resource_type_mapping(self): + """ + Gets the resource_type_mapping of this ImportOciTelemetryResourcesTaskDetails. + The resource type property in the metric dimensions. + Resources imported will be using this property value for resource type. + If not specified, namespace will be used for resource type. + + + :return: The resource_type_mapping of this ImportOciTelemetryResourcesTaskDetails. + :rtype: str + """ + return self._resource_type_mapping + + @resource_type_mapping.setter + def resource_type_mapping(self, resource_type_mapping): + """ + Sets the resource_type_mapping of this ImportOciTelemetryResourcesTaskDetails. + The resource type property in the metric dimensions. + Resources imported will be using this property value for resource type. + If not specified, namespace will be used for resource type. + + + :param resource_type_mapping: The resource_type_mapping of this ImportOciTelemetryResourcesTaskDetails. + :type: str + """ + self._resource_type_mapping = resource_type_mapping + + @property + def resource_name_filter(self): + """ + Gets the resource_name_filter of this ImportOciTelemetryResourcesTaskDetails. + The resource name filter. Resources matching with the resource name filter will be imported. + Regular expressions will be accepted. + + + :return: The resource_name_filter of this ImportOciTelemetryResourcesTaskDetails. + :rtype: str + """ + return self._resource_name_filter + + @resource_name_filter.setter + def resource_name_filter(self, resource_name_filter): + """ + Sets the resource_name_filter of this ImportOciTelemetryResourcesTaskDetails. + The resource name filter. Resources matching with the resource name filter will be imported. + Regular expressions will be accepted. + + + :param resource_name_filter: The resource_name_filter of this ImportOciTelemetryResourcesTaskDetails. + :type: str + """ + self._resource_name_filter = resource_name_filter + + @property + def resource_type_filter(self): + """ + Gets the resource_type_filter of this ImportOciTelemetryResourcesTaskDetails. + The resource type filter. Resources matching with the resource type filter will be imported. + Regular expressions will be accepted. + + + :return: The resource_type_filter of this ImportOciTelemetryResourcesTaskDetails. + :rtype: str + """ + return self._resource_type_filter + + @resource_type_filter.setter + def resource_type_filter(self, resource_type_filter): + """ + Sets the resource_type_filter of this ImportOciTelemetryResourcesTaskDetails. + The resource type filter. Resources matching with the resource type filter will be imported. + Regular expressions will be accepted. + + + :param resource_type_filter: The resource_type_filter of this ImportOciTelemetryResourcesTaskDetails. + :type: str + """ + self._resource_type_filter = resource_type_filter + @property def availability_proxy_metrics(self): """ diff --git a/src/oci/stack_monitoring/models/monitored_resource.py b/src/oci/stack_monitoring/models/monitored_resource.py index f941c15f72..8561074bb4 100644 --- a/src/oci/stack_monitoring/models/monitored_resource.py +++ b/src/oci/stack_monitoring/models/monitored_resource.py @@ -49,6 +49,46 @@ class MonitoredResource(object): #: This constant has a value of "ENTERPRISE_EDITION" LICENSE_ENTERPRISE_EDITION = "ENTERPRISE_EDITION" + #: A constant which can be used with the source_type property of a MonitoredResource. + #: This constant has a value of "SM_MGMT_AGENT_MONITORED" + SOURCE_TYPE_SM_MGMT_AGENT_MONITORED = "SM_MGMT_AGENT_MONITORED" + + #: A constant which can be used with the source_type property of a MonitoredResource. + #: This constant has a value of "SM_REPO_ONLY" + SOURCE_TYPE_SM_REPO_ONLY = "SM_REPO_ONLY" + + #: A constant which can be used with the source_type property of a MonitoredResource. + #: This constant has a value of "OCI_NATIVE" + SOURCE_TYPE_OCI_NATIVE = "OCI_NATIVE" + + #: A constant which can be used with the source_type property of a MonitoredResource. + #: This constant has a value of "PROMETHEUS" + SOURCE_TYPE_PROMETHEUS = "PROMETHEUS" + + #: A constant which can be used with the source_type property of a MonitoredResource. + #: This constant has a value of "TELEGRAF" + SOURCE_TYPE_TELEGRAF = "TELEGRAF" + + #: A constant which can be used with the source_type property of a MonitoredResource. + #: This constant has a value of "COLLECTD" + SOURCE_TYPE_COLLECTD = "COLLECTD" + + #: A constant which can be used with the resource_category property of a MonitoredResource. + #: This constant has a value of "APPLICATION" + RESOURCE_CATEGORY_APPLICATION = "APPLICATION" + + #: A constant which can be used with the resource_category property of a MonitoredResource. + #: This constant has a value of "DATABASE" + RESOURCE_CATEGORY_DATABASE = "DATABASE" + + #: A constant which can be used with the resource_category property of a MonitoredResource. + #: This constant has a value of "MIDDLEWARE" + RESOURCE_CATEGORY_MIDDLEWARE = "MIDDLEWARE" + + #: A constant which can be used with the resource_category property of a MonitoredResource. + #: This constant has a value of "UNKNOWN" + RESOURCE_CATEGORY_UNKNOWN = "UNKNOWN" + def __init__(self, **kwargs): """ Initializes a new MonitoredResource object with values from keyword arguments. @@ -114,6 +154,18 @@ def __init__(self, **kwargs): Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type license: str + :param source_type: + The value to assign to the source_type property of this MonitoredResource. + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type source_type: str + + :param resource_category: + The value to assign to the resource_category property of this MonitoredResource. + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type resource_category: str + :param properties: The value to assign to the properties property of this MonitoredResource. :type properties: list[oci.stack_monitoring.models.MonitoredResourceProperty] @@ -158,6 +210,8 @@ def __init__(self, **kwargs): 'time_updated': 'datetime', 'lifecycle_state': 'str', 'license': 'str', + 'source_type': 'str', + 'resource_category': 'str', 'properties': 'list[MonitoredResourceProperty]', 'database_connection_details': 'ConnectionDetails', 'credentials': 'MonitoredResourceCredential', @@ -182,6 +236,8 @@ def __init__(self, **kwargs): 'time_updated': 'timeUpdated', 'lifecycle_state': 'lifecycleState', 'license': 'license', + 'source_type': 'sourceType', + 'resource_category': 'resourceCategory', 'properties': 'properties', 'database_connection_details': 'databaseConnectionDetails', 'credentials': 'credentials', @@ -205,6 +261,8 @@ def __init__(self, **kwargs): self._time_updated = None self._lifecycle_state = None self._license = None + self._source_type = None + self._resource_category = None self._properties = None self._database_connection_details = None self._credentials = None @@ -599,6 +657,66 @@ def license(self, license): license = 'UNKNOWN_ENUM_VALUE' self._license = license + @property + def source_type(self): + """ + Gets the source_type of this MonitoredResource. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The source_type of this MonitoredResource. + :rtype: str + """ + return self._source_type + + @source_type.setter + def source_type(self, source_type): + """ + Sets the source_type of this MonitoredResource. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + + :param source_type: The source_type of this MonitoredResource. + :type: str + """ + allowed_values = ["SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD"] + if not value_allowed_none_or_none_sentinel(source_type, allowed_values): + source_type = 'UNKNOWN_ENUM_VALUE' + self._source_type = source_type + + @property + def resource_category(self): + """ + Gets the resource_category of this MonitoredResource. + Resource Category to indicate the kind of resource type. + + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The resource_category of this MonitoredResource. + :rtype: str + """ + return self._resource_category + + @resource_category.setter + def resource_category(self, resource_category): + """ + Sets the resource_category of this MonitoredResource. + Resource Category to indicate the kind of resource type. + + + :param resource_category: The resource_category of this MonitoredResource. + :type: str + """ + allowed_values = ["APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(resource_category, allowed_values): + resource_category = 'UNKNOWN_ENUM_VALUE' + self._resource_category = resource_category + @property def properties(self): """ diff --git a/src/oci/stack_monitoring/models/monitored_resource_member_summary.py b/src/oci/stack_monitoring/models/monitored_resource_member_summary.py index 7a635bca7b..c577ab72cd 100644 --- a/src/oci/stack_monitoring/models/monitored_resource_member_summary.py +++ b/src/oci/stack_monitoring/models/monitored_resource_member_summary.py @@ -47,6 +47,46 @@ class MonitoredResourceMemberSummary(object): #: This constant has a value of "ENTERPRISE_EDITION" LICENSE_ENTERPRISE_EDITION = "ENTERPRISE_EDITION" + #: A constant which can be used with the source_type property of a MonitoredResourceMemberSummary. + #: This constant has a value of "SM_MGMT_AGENT_MONITORED" + SOURCE_TYPE_SM_MGMT_AGENT_MONITORED = "SM_MGMT_AGENT_MONITORED" + + #: A constant which can be used with the source_type property of a MonitoredResourceMemberSummary. + #: This constant has a value of "SM_REPO_ONLY" + SOURCE_TYPE_SM_REPO_ONLY = "SM_REPO_ONLY" + + #: A constant which can be used with the source_type property of a MonitoredResourceMemberSummary. + #: This constant has a value of "OCI_NATIVE" + SOURCE_TYPE_OCI_NATIVE = "OCI_NATIVE" + + #: A constant which can be used with the source_type property of a MonitoredResourceMemberSummary. + #: This constant has a value of "PROMETHEUS" + SOURCE_TYPE_PROMETHEUS = "PROMETHEUS" + + #: A constant which can be used with the source_type property of a MonitoredResourceMemberSummary. + #: This constant has a value of "TELEGRAF" + SOURCE_TYPE_TELEGRAF = "TELEGRAF" + + #: A constant which can be used with the source_type property of a MonitoredResourceMemberSummary. + #: This constant has a value of "COLLECTD" + SOURCE_TYPE_COLLECTD = "COLLECTD" + + #: A constant which can be used with the resource_category property of a MonitoredResourceMemberSummary. + #: This constant has a value of "APPLICATION" + RESOURCE_CATEGORY_APPLICATION = "APPLICATION" + + #: A constant which can be used with the resource_category property of a MonitoredResourceMemberSummary. + #: This constant has a value of "DATABASE" + RESOURCE_CATEGORY_DATABASE = "DATABASE" + + #: A constant which can be used with the resource_category property of a MonitoredResourceMemberSummary. + #: This constant has a value of "MIDDLEWARE" + RESOURCE_CATEGORY_MIDDLEWARE = "MIDDLEWARE" + + #: A constant which can be used with the resource_category property of a MonitoredResourceMemberSummary. + #: This constant has a value of "UNKNOWN" + RESOURCE_CATEGORY_UNKNOWN = "UNKNOWN" + def __init__(self, **kwargs): """ Initializes a new MonitoredResourceMemberSummary object with values from keyword arguments. @@ -96,6 +136,18 @@ def __init__(self, **kwargs): Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type license: str + :param source_type: + The value to assign to the source_type property of this MonitoredResourceMemberSummary. + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type source_type: str + + :param resource_category: + The value to assign to the resource_category property of this MonitoredResourceMemberSummary. + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type resource_category: str + :param freeform_tags: The value to assign to the freeform_tags property of this MonitoredResourceMemberSummary. :type freeform_tags: dict(str, str) @@ -120,6 +172,8 @@ def __init__(self, **kwargs): 'parent_id': 'str', 'lifecycle_state': 'str', 'license': 'str', + 'source_type': 'str', + 'resource_category': 'str', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))', 'system_tags': 'dict(str, dict(str, object))' @@ -136,6 +190,8 @@ def __init__(self, **kwargs): 'parent_id': 'parentId', 'lifecycle_state': 'lifecycleState', 'license': 'license', + 'source_type': 'sourceType', + 'resource_category': 'resourceCategory', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags', 'system_tags': 'systemTags' @@ -151,6 +207,8 @@ def __init__(self, **kwargs): self._parent_id = None self._lifecycle_state = None self._license = None + self._source_type = None + self._resource_category = None self._freeform_tags = None self._defined_tags = None self._system_tags = None @@ -429,6 +487,66 @@ def license(self, license): license = 'UNKNOWN_ENUM_VALUE' self._license = license + @property + def source_type(self): + """ + Gets the source_type of this MonitoredResourceMemberSummary. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The source_type of this MonitoredResourceMemberSummary. + :rtype: str + """ + return self._source_type + + @source_type.setter + def source_type(self, source_type): + """ + Sets the source_type of this MonitoredResourceMemberSummary. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + + :param source_type: The source_type of this MonitoredResourceMemberSummary. + :type: str + """ + allowed_values = ["SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD"] + if not value_allowed_none_or_none_sentinel(source_type, allowed_values): + source_type = 'UNKNOWN_ENUM_VALUE' + self._source_type = source_type + + @property + def resource_category(self): + """ + Gets the resource_category of this MonitoredResourceMemberSummary. + Resource Category to indicate the kind of resource type. + + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The resource_category of this MonitoredResourceMemberSummary. + :rtype: str + """ + return self._resource_category + + @resource_category.setter + def resource_category(self, resource_category): + """ + Sets the resource_category of this MonitoredResourceMemberSummary. + Resource Category to indicate the kind of resource type. + + + :param resource_category: The resource_category of this MonitoredResourceMemberSummary. + :type: str + """ + allowed_values = ["APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(resource_category, allowed_values): + resource_category = 'UNKNOWN_ENUM_VALUE' + self._resource_category = resource_category + @property def freeform_tags(self): """ diff --git a/src/oci/stack_monitoring/models/monitored_resource_summary.py b/src/oci/stack_monitoring/models/monitored_resource_summary.py index ca8fc2a0c5..62a976cd38 100644 --- a/src/oci/stack_monitoring/models/monitored_resource_summary.py +++ b/src/oci/stack_monitoring/models/monitored_resource_summary.py @@ -47,6 +47,46 @@ class MonitoredResourceSummary(object): #: This constant has a value of "ENTERPRISE_EDITION" LICENSE_ENTERPRISE_EDITION = "ENTERPRISE_EDITION" + #: A constant which can be used with the source_type property of a MonitoredResourceSummary. + #: This constant has a value of "SM_MGMT_AGENT_MONITORED" + SOURCE_TYPE_SM_MGMT_AGENT_MONITORED = "SM_MGMT_AGENT_MONITORED" + + #: A constant which can be used with the source_type property of a MonitoredResourceSummary. + #: This constant has a value of "SM_REPO_ONLY" + SOURCE_TYPE_SM_REPO_ONLY = "SM_REPO_ONLY" + + #: A constant which can be used with the source_type property of a MonitoredResourceSummary. + #: This constant has a value of "OCI_NATIVE" + SOURCE_TYPE_OCI_NATIVE = "OCI_NATIVE" + + #: A constant which can be used with the source_type property of a MonitoredResourceSummary. + #: This constant has a value of "PROMETHEUS" + SOURCE_TYPE_PROMETHEUS = "PROMETHEUS" + + #: A constant which can be used with the source_type property of a MonitoredResourceSummary. + #: This constant has a value of "TELEGRAF" + SOURCE_TYPE_TELEGRAF = "TELEGRAF" + + #: A constant which can be used with the source_type property of a MonitoredResourceSummary. + #: This constant has a value of "COLLECTD" + SOURCE_TYPE_COLLECTD = "COLLECTD" + + #: A constant which can be used with the resource_category property of a MonitoredResourceSummary. + #: This constant has a value of "APPLICATION" + RESOURCE_CATEGORY_APPLICATION = "APPLICATION" + + #: A constant which can be used with the resource_category property of a MonitoredResourceSummary. + #: This constant has a value of "DATABASE" + RESOURCE_CATEGORY_DATABASE = "DATABASE" + + #: A constant which can be used with the resource_category property of a MonitoredResourceSummary. + #: This constant has a value of "MIDDLEWARE" + RESOURCE_CATEGORY_MIDDLEWARE = "MIDDLEWARE" + + #: A constant which can be used with the resource_category property of a MonitoredResourceSummary. + #: This constant has a value of "UNKNOWN" + RESOURCE_CATEGORY_UNKNOWN = "UNKNOWN" + def __init__(self, **kwargs): """ Initializes a new MonitoredResourceSummary object with values from keyword arguments. @@ -108,6 +148,18 @@ def __init__(self, **kwargs): Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type license: str + :param source_type: + The value to assign to the source_type property of this MonitoredResourceSummary. + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type source_type: str + + :param resource_category: + The value to assign to the resource_category property of this MonitoredResourceSummary. + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type resource_category: str + :param freeform_tags: The value to assign to the freeform_tags property of this MonitoredResourceSummary. :type freeform_tags: dict(str, str) @@ -135,6 +187,8 @@ def __init__(self, **kwargs): 'lifecycle_state': 'str', 'properties': 'list[MonitoredResourceProperty]', 'license': 'str', + 'source_type': 'str', + 'resource_category': 'str', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))', 'system_tags': 'dict(str, dict(str, object))' @@ -154,6 +208,8 @@ def __init__(self, **kwargs): 'lifecycle_state': 'lifecycleState', 'properties': 'properties', 'license': 'license', + 'source_type': 'sourceType', + 'resource_category': 'resourceCategory', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags', 'system_tags': 'systemTags' @@ -172,6 +228,8 @@ def __init__(self, **kwargs): self._lifecycle_state = None self._properties = None self._license = None + self._source_type = None + self._resource_category = None self._freeform_tags = None self._defined_tags = None self._system_tags = None @@ -518,6 +576,66 @@ def license(self, license): license = 'UNKNOWN_ENUM_VALUE' self._license = license + @property + def source_type(self): + """ + Gets the source_type of this MonitoredResourceSummary. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The source_type of this MonitoredResourceSummary. + :rtype: str + """ + return self._source_type + + @source_type.setter + def source_type(self, source_type): + """ + Sets the source_type of this MonitoredResourceSummary. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + + :param source_type: The source_type of this MonitoredResourceSummary. + :type: str + """ + allowed_values = ["SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD"] + if not value_allowed_none_or_none_sentinel(source_type, allowed_values): + source_type = 'UNKNOWN_ENUM_VALUE' + self._source_type = source_type + + @property + def resource_category(self): + """ + Gets the resource_category of this MonitoredResourceSummary. + Resource Category to indicate the kind of resource type. + + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The resource_category of this MonitoredResourceSummary. + :rtype: str + """ + return self._resource_category + + @resource_category.setter + def resource_category(self, resource_category): + """ + Sets the resource_category of this MonitoredResourceSummary. + Resource Category to indicate the kind of resource type. + + + :param resource_category: The resource_category of this MonitoredResourceSummary. + :type: str + """ + allowed_values = ["APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(resource_category, allowed_values): + resource_category = 'UNKNOWN_ENUM_VALUE' + self._resource_category = resource_category + @property def freeform_tags(self): """ diff --git a/src/oci/stack_monitoring/models/monitored_resource_type.py b/src/oci/stack_monitoring/models/monitored_resource_type.py index 2c51d9b49f..5b01775ba7 100644 --- a/src/oci/stack_monitoring/models/monitored_resource_type.py +++ b/src/oci/stack_monitoring/models/monitored_resource_type.py @@ -43,6 +43,46 @@ class MonitoredResourceType(object): #: This constant has a value of "FAILED" LIFECYCLE_STATE_FAILED = "FAILED" + #: A constant which can be used with the source_type property of a MonitoredResourceType. + #: This constant has a value of "SM_MGMT_AGENT_MONITORED" + SOURCE_TYPE_SM_MGMT_AGENT_MONITORED = "SM_MGMT_AGENT_MONITORED" + + #: A constant which can be used with the source_type property of a MonitoredResourceType. + #: This constant has a value of "SM_REPO_ONLY" + SOURCE_TYPE_SM_REPO_ONLY = "SM_REPO_ONLY" + + #: A constant which can be used with the source_type property of a MonitoredResourceType. + #: This constant has a value of "OCI_NATIVE" + SOURCE_TYPE_OCI_NATIVE = "OCI_NATIVE" + + #: A constant which can be used with the source_type property of a MonitoredResourceType. + #: This constant has a value of "PROMETHEUS" + SOURCE_TYPE_PROMETHEUS = "PROMETHEUS" + + #: A constant which can be used with the source_type property of a MonitoredResourceType. + #: This constant has a value of "TELEGRAF" + SOURCE_TYPE_TELEGRAF = "TELEGRAF" + + #: A constant which can be used with the source_type property of a MonitoredResourceType. + #: This constant has a value of "COLLECTD" + SOURCE_TYPE_COLLECTD = "COLLECTD" + + #: A constant which can be used with the resource_category property of a MonitoredResourceType. + #: This constant has a value of "APPLICATION" + RESOURCE_CATEGORY_APPLICATION = "APPLICATION" + + #: A constant which can be used with the resource_category property of a MonitoredResourceType. + #: This constant has a value of "DATABASE" + RESOURCE_CATEGORY_DATABASE = "DATABASE" + + #: A constant which can be used with the resource_category property of a MonitoredResourceType. + #: This constant has a value of "MIDDLEWARE" + RESOURCE_CATEGORY_MIDDLEWARE = "MIDDLEWARE" + + #: A constant which can be used with the resource_category property of a MonitoredResourceType. + #: This constant has a value of "UNKNOWN" + RESOURCE_CATEGORY_UNKNOWN = "UNKNOWN" + def __init__(self, **kwargs): """ Initializes a new MonitoredResourceType object with values from keyword arguments. @@ -78,6 +118,18 @@ def __init__(self, **kwargs): Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type lifecycle_state: str + :param source_type: + The value to assign to the source_type property of this MonitoredResourceType. + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type source_type: str + + :param resource_category: + The value to assign to the resource_category property of this MonitoredResourceType. + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type resource_category: str + :param time_created: The value to assign to the time_created property of this MonitoredResourceType. :type time_created: datetime @@ -111,6 +163,8 @@ def __init__(self, **kwargs): 'metric_namespace': 'str', 'compartment_id': 'str', 'lifecycle_state': 'str', + 'source_type': 'str', + 'resource_category': 'str', 'time_created': 'datetime', 'time_updated': 'datetime', 'metadata': 'ResourceTypeMetadataDetails', @@ -127,6 +181,8 @@ def __init__(self, **kwargs): 'metric_namespace': 'metricNamespace', 'compartment_id': 'compartmentId', 'lifecycle_state': 'lifecycleState', + 'source_type': 'sourceType', + 'resource_category': 'resourceCategory', 'time_created': 'timeCreated', 'time_updated': 'timeUpdated', 'metadata': 'metadata', @@ -142,6 +198,8 @@ def __init__(self, **kwargs): self._metric_namespace = None self._compartment_id = None self._lifecycle_state = None + self._source_type = None + self._resource_category = None self._time_created = None self._time_updated = None self._metadata = None @@ -333,6 +391,66 @@ def lifecycle_state(self, lifecycle_state): lifecycle_state = 'UNKNOWN_ENUM_VALUE' self._lifecycle_state = lifecycle_state + @property + def source_type(self): + """ + Gets the source_type of this MonitoredResourceType. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The source_type of this MonitoredResourceType. + :rtype: str + """ + return self._source_type + + @source_type.setter + def source_type(self, source_type): + """ + Sets the source_type of this MonitoredResourceType. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + + :param source_type: The source_type of this MonitoredResourceType. + :type: str + """ + allowed_values = ["SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD"] + if not value_allowed_none_or_none_sentinel(source_type, allowed_values): + source_type = 'UNKNOWN_ENUM_VALUE' + self._source_type = source_type + + @property + def resource_category(self): + """ + Gets the resource_category of this MonitoredResourceType. + Resource Category to indicate the kind of resource type. + + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The resource_category of this MonitoredResourceType. + :rtype: str + """ + return self._resource_category + + @resource_category.setter + def resource_category(self, resource_category): + """ + Sets the resource_category of this MonitoredResourceType. + Resource Category to indicate the kind of resource type. + + + :param resource_category: The resource_category of this MonitoredResourceType. + :type: str + """ + allowed_values = ["APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(resource_category, allowed_values): + resource_category = 'UNKNOWN_ENUM_VALUE' + self._resource_category = resource_category + @property def time_created(self): """ diff --git a/src/oci/stack_monitoring/models/monitored_resource_type_summary.py b/src/oci/stack_monitoring/models/monitored_resource_type_summary.py index 90cc8ac9f9..cfe7224a9b 100644 --- a/src/oci/stack_monitoring/models/monitored_resource_type_summary.py +++ b/src/oci/stack_monitoring/models/monitored_resource_type_summary.py @@ -43,6 +43,46 @@ class MonitoredResourceTypeSummary(object): #: This constant has a value of "FAILED" LIFECYCLE_STATE_FAILED = "FAILED" + #: A constant which can be used with the source_type property of a MonitoredResourceTypeSummary. + #: This constant has a value of "SM_MGMT_AGENT_MONITORED" + SOURCE_TYPE_SM_MGMT_AGENT_MONITORED = "SM_MGMT_AGENT_MONITORED" + + #: A constant which can be used with the source_type property of a MonitoredResourceTypeSummary. + #: This constant has a value of "SM_REPO_ONLY" + SOURCE_TYPE_SM_REPO_ONLY = "SM_REPO_ONLY" + + #: A constant which can be used with the source_type property of a MonitoredResourceTypeSummary. + #: This constant has a value of "OCI_NATIVE" + SOURCE_TYPE_OCI_NATIVE = "OCI_NATIVE" + + #: A constant which can be used with the source_type property of a MonitoredResourceTypeSummary. + #: This constant has a value of "PROMETHEUS" + SOURCE_TYPE_PROMETHEUS = "PROMETHEUS" + + #: A constant which can be used with the source_type property of a MonitoredResourceTypeSummary. + #: This constant has a value of "TELEGRAF" + SOURCE_TYPE_TELEGRAF = "TELEGRAF" + + #: A constant which can be used with the source_type property of a MonitoredResourceTypeSummary. + #: This constant has a value of "COLLECTD" + SOURCE_TYPE_COLLECTD = "COLLECTD" + + #: A constant which can be used with the resource_category property of a MonitoredResourceTypeSummary. + #: This constant has a value of "APPLICATION" + RESOURCE_CATEGORY_APPLICATION = "APPLICATION" + + #: A constant which can be used with the resource_category property of a MonitoredResourceTypeSummary. + #: This constant has a value of "DATABASE" + RESOURCE_CATEGORY_DATABASE = "DATABASE" + + #: A constant which can be used with the resource_category property of a MonitoredResourceTypeSummary. + #: This constant has a value of "MIDDLEWARE" + RESOURCE_CATEGORY_MIDDLEWARE = "MIDDLEWARE" + + #: A constant which can be used with the resource_category property of a MonitoredResourceTypeSummary. + #: This constant has a value of "UNKNOWN" + RESOURCE_CATEGORY_UNKNOWN = "UNKNOWN" + def __init__(self, **kwargs): """ Initializes a new MonitoredResourceTypeSummary object with values from keyword arguments. @@ -78,6 +118,18 @@ def __init__(self, **kwargs): Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type lifecycle_state: str + :param source_type: + The value to assign to the source_type property of this MonitoredResourceTypeSummary. + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type source_type: str + + :param resource_category: + The value to assign to the resource_category property of this MonitoredResourceTypeSummary. + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type resource_category: str + :param metadata: The value to assign to the metadata property of this MonitoredResourceTypeSummary. :type metadata: oci.stack_monitoring.models.ResourceTypeMetadataDetails @@ -111,6 +163,8 @@ def __init__(self, **kwargs): 'metric_namespace': 'str', 'compartment_id': 'str', 'lifecycle_state': 'str', + 'source_type': 'str', + 'resource_category': 'str', 'metadata': 'ResourceTypeMetadataDetails', 'time_created': 'datetime', 'time_updated': 'datetime', @@ -127,6 +181,8 @@ def __init__(self, **kwargs): 'metric_namespace': 'metricNamespace', 'compartment_id': 'compartmentId', 'lifecycle_state': 'lifecycleState', + 'source_type': 'sourceType', + 'resource_category': 'resourceCategory', 'metadata': 'metadata', 'time_created': 'timeCreated', 'time_updated': 'timeUpdated', @@ -142,6 +198,8 @@ def __init__(self, **kwargs): self._metric_namespace = None self._compartment_id = None self._lifecycle_state = None + self._source_type = None + self._resource_category = None self._metadata = None self._time_created = None self._time_updated = None @@ -333,6 +391,66 @@ def lifecycle_state(self, lifecycle_state): lifecycle_state = 'UNKNOWN_ENUM_VALUE' self._lifecycle_state = lifecycle_state + @property + def source_type(self): + """ + Gets the source_type of this MonitoredResourceTypeSummary. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The source_type of this MonitoredResourceTypeSummary. + :rtype: str + """ + return self._source_type + + @source_type.setter + def source_type(self, source_type): + """ + Sets the source_type of this MonitoredResourceTypeSummary. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + + :param source_type: The source_type of this MonitoredResourceTypeSummary. + :type: str + """ + allowed_values = ["SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD"] + if not value_allowed_none_or_none_sentinel(source_type, allowed_values): + source_type = 'UNKNOWN_ENUM_VALUE' + self._source_type = source_type + + @property + def resource_category(self): + """ + Gets the resource_category of this MonitoredResourceTypeSummary. + Resource Category to indicate the kind of resource type. + + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The resource_category of this MonitoredResourceTypeSummary. + :rtype: str + """ + return self._resource_category + + @resource_category.setter + def resource_category(self, resource_category): + """ + Sets the resource_category of this MonitoredResourceTypeSummary. + Resource Category to indicate the kind of resource type. + + + :param resource_category: The resource_category of this MonitoredResourceTypeSummary. + :type: str + """ + allowed_values = ["APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(resource_category, allowed_values): + resource_category = 'UNKNOWN_ENUM_VALUE' + self._resource_category = resource_category + @property def metadata(self): """ diff --git a/src/oci/stack_monitoring/models/search_monitored_resources_details.py b/src/oci/stack_monitoring/models/search_monitored_resources_details.py index 2100e90848..7cd9c1ac79 100644 --- a/src/oci/stack_monitoring/models/search_monitored_resources_details.py +++ b/src/oci/stack_monitoring/models/search_monitored_resources_details.py @@ -15,6 +15,46 @@ class SearchMonitoredResourcesDetails(object): The property search criteria for listing monitored resources. """ + #: A constant which can be used with the source_type property of a SearchMonitoredResourcesDetails. + #: This constant has a value of "SM_MGMT_AGENT_MONITORED" + SOURCE_TYPE_SM_MGMT_AGENT_MONITORED = "SM_MGMT_AGENT_MONITORED" + + #: A constant which can be used with the source_type property of a SearchMonitoredResourcesDetails. + #: This constant has a value of "SM_REPO_ONLY" + SOURCE_TYPE_SM_REPO_ONLY = "SM_REPO_ONLY" + + #: A constant which can be used with the source_type property of a SearchMonitoredResourcesDetails. + #: This constant has a value of "OCI_NATIVE" + SOURCE_TYPE_OCI_NATIVE = "OCI_NATIVE" + + #: A constant which can be used with the source_type property of a SearchMonitoredResourcesDetails. + #: This constant has a value of "PROMETHEUS" + SOURCE_TYPE_PROMETHEUS = "PROMETHEUS" + + #: A constant which can be used with the source_type property of a SearchMonitoredResourcesDetails. + #: This constant has a value of "TELEGRAF" + SOURCE_TYPE_TELEGRAF = "TELEGRAF" + + #: A constant which can be used with the source_type property of a SearchMonitoredResourcesDetails. + #: This constant has a value of "COLLECTD" + SOURCE_TYPE_COLLECTD = "COLLECTD" + + #: A constant which can be used with the resource_category property of a SearchMonitoredResourcesDetails. + #: This constant has a value of "APPLICATION" + RESOURCE_CATEGORY_APPLICATION = "APPLICATION" + + #: A constant which can be used with the resource_category property of a SearchMonitoredResourcesDetails. + #: This constant has a value of "DATABASE" + RESOURCE_CATEGORY_DATABASE = "DATABASE" + + #: A constant which can be used with the resource_category property of a SearchMonitoredResourcesDetails. + #: This constant has a value of "MIDDLEWARE" + RESOURCE_CATEGORY_MIDDLEWARE = "MIDDLEWARE" + + #: A constant which can be used with the resource_category property of a SearchMonitoredResourcesDetails. + #: This constant has a value of "UNKNOWN" + RESOURCE_CATEGORY_UNKNOWN = "UNKNOWN" + #: A constant which can be used with the lifecycle_state property of a SearchMonitoredResourcesDetails. #: This constant has a value of "CREATING" LIFECYCLE_STATE_CREATING = "CREATING" @@ -72,6 +112,24 @@ def __init__(self, **kwargs): The value to assign to the compartment_id property of this SearchMonitoredResourcesDetails. :type compartment_id: str + :param compartment_ids: + The value to assign to the compartment_ids property of this SearchMonitoredResourcesDetails. + :type compartment_ids: list[str] + + :param lifecycle_states: + The value to assign to the lifecycle_states property of this SearchMonitoredResourcesDetails. + :type lifecycle_states: list[oci.stack_monitoring.models.ResourceLifecycleState] + + :param source_type: + The value to assign to the source_type property of this SearchMonitoredResourcesDetails. + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD" + :type source_type: str + + :param resource_category: + The value to assign to the resource_category property of this SearchMonitoredResourcesDetails. + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN" + :type resource_category: str + :param name: The value to assign to the name property of this SearchMonitoredResourcesDetails. :type name: str @@ -147,6 +205,10 @@ def __init__(self, **kwargs): """ self.swagger_types = { 'compartment_id': 'str', + 'compartment_ids': 'list[str]', + 'lifecycle_states': 'list[ResourceLifecycleState]', + 'source_type': 'str', + 'resource_category': 'str', 'name': 'str', 'name_contains': 'str', 'type': 'str', @@ -168,6 +230,10 @@ def __init__(self, **kwargs): self.attribute_map = { 'compartment_id': 'compartmentId', + 'compartment_ids': 'compartmentIds', + 'lifecycle_states': 'lifecycleStates', + 'source_type': 'sourceType', + 'resource_category': 'resourceCategory', 'name': 'name', 'name_contains': 'nameContains', 'type': 'type', @@ -188,6 +254,10 @@ def __init__(self, **kwargs): } self._compartment_id = None + self._compartment_ids = None + self._lifecycle_states = None + self._source_type = None + self._resource_category = None self._name = None self._name_contains = None self._type = None @@ -234,6 +304,120 @@ def compartment_id(self, compartment_id): """ self._compartment_id = compartment_id + @property + def compartment_ids(self): + """ + Gets the compartment_ids of this SearchMonitoredResourcesDetails. + Multiple compartment identifiers `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :return: The compartment_ids of this SearchMonitoredResourcesDetails. + :rtype: list[str] + """ + return self._compartment_ids + + @compartment_ids.setter + def compartment_ids(self, compartment_ids): + """ + Sets the compartment_ids of this SearchMonitoredResourcesDetails. + Multiple compartment identifiers `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :param compartment_ids: The compartment_ids of this SearchMonitoredResourcesDetails. + :type: list[str] + """ + self._compartment_ids = compartment_ids + + @property + def lifecycle_states(self): + """ + Gets the lifecycle_states of this SearchMonitoredResourcesDetails. + Multiple lifecycle states filter. + + + :return: The lifecycle_states of this SearchMonitoredResourcesDetails. + :rtype: list[oci.stack_monitoring.models.ResourceLifecycleState] + """ + return self._lifecycle_states + + @lifecycle_states.setter + def lifecycle_states(self, lifecycle_states): + """ + Sets the lifecycle_states of this SearchMonitoredResourcesDetails. + Multiple lifecycle states filter. + + + :param lifecycle_states: The lifecycle_states of this SearchMonitoredResourcesDetails. + :type: list[oci.stack_monitoring.models.ResourceLifecycleState] + """ + self._lifecycle_states = lifecycle_states + + @property + def source_type(self): + """ + Gets the source_type of this SearchMonitoredResourcesDetails. + Source type filter. + + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD" + + + :return: The source_type of this SearchMonitoredResourcesDetails. + :rtype: str + """ + return self._source_type + + @source_type.setter + def source_type(self, source_type): + """ + Sets the source_type of this SearchMonitoredResourcesDetails. + Source type filter. + + + :param source_type: The source_type of this SearchMonitoredResourcesDetails. + :type: str + """ + allowed_values = ["SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD"] + if not value_allowed_none_or_none_sentinel(source_type, allowed_values): + raise ValueError( + f"Invalid value for `source_type`, must be None or one of {allowed_values}" + ) + self._source_type = source_type + + @property + def resource_category(self): + """ + Gets the resource_category of this SearchMonitoredResourcesDetails. + Resource category filter. + + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN" + + + :return: The resource_category of this SearchMonitoredResourcesDetails. + :rtype: str + """ + return self._resource_category + + @resource_category.setter + def resource_category(self, resource_category): + """ + Sets the resource_category of this SearchMonitoredResourcesDetails. + Resource category filter. + + + :param resource_category: The resource_category of this SearchMonitoredResourcesDetails. + :type: str + """ + allowed_values = ["APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(resource_category, allowed_values): + raise ValueError( + f"Invalid value for `resource_category`, must be None or one of {allowed_values}" + ) + self._resource_category = resource_category + @property def name(self): """ diff --git a/src/oci/stack_monitoring/models/update_monitored_resource_type_details.py b/src/oci/stack_monitoring/models/update_monitored_resource_type_details.py index c1f5ac929e..ebf1381bd9 100644 --- a/src/oci/stack_monitoring/models/update_monitored_resource_type_details.py +++ b/src/oci/stack_monitoring/models/update_monitored_resource_type_details.py @@ -15,6 +15,46 @@ class UpdateMonitoredResourceTypeDetails(object): The information to be updated for the monitored resource type. """ + #: A constant which can be used with the source_type property of a UpdateMonitoredResourceTypeDetails. + #: This constant has a value of "SM_MGMT_AGENT_MONITORED" + SOURCE_TYPE_SM_MGMT_AGENT_MONITORED = "SM_MGMT_AGENT_MONITORED" + + #: A constant which can be used with the source_type property of a UpdateMonitoredResourceTypeDetails. + #: This constant has a value of "SM_REPO_ONLY" + SOURCE_TYPE_SM_REPO_ONLY = "SM_REPO_ONLY" + + #: A constant which can be used with the source_type property of a UpdateMonitoredResourceTypeDetails. + #: This constant has a value of "OCI_NATIVE" + SOURCE_TYPE_OCI_NATIVE = "OCI_NATIVE" + + #: A constant which can be used with the source_type property of a UpdateMonitoredResourceTypeDetails. + #: This constant has a value of "PROMETHEUS" + SOURCE_TYPE_PROMETHEUS = "PROMETHEUS" + + #: A constant which can be used with the source_type property of a UpdateMonitoredResourceTypeDetails. + #: This constant has a value of "TELEGRAF" + SOURCE_TYPE_TELEGRAF = "TELEGRAF" + + #: A constant which can be used with the source_type property of a UpdateMonitoredResourceTypeDetails. + #: This constant has a value of "COLLECTD" + SOURCE_TYPE_COLLECTD = "COLLECTD" + + #: A constant which can be used with the resource_category property of a UpdateMonitoredResourceTypeDetails. + #: This constant has a value of "APPLICATION" + RESOURCE_CATEGORY_APPLICATION = "APPLICATION" + + #: A constant which can be used with the resource_category property of a UpdateMonitoredResourceTypeDetails. + #: This constant has a value of "DATABASE" + RESOURCE_CATEGORY_DATABASE = "DATABASE" + + #: A constant which can be used with the resource_category property of a UpdateMonitoredResourceTypeDetails. + #: This constant has a value of "MIDDLEWARE" + RESOURCE_CATEGORY_MIDDLEWARE = "MIDDLEWARE" + + #: A constant which can be used with the resource_category property of a UpdateMonitoredResourceTypeDetails. + #: This constant has a value of "UNKNOWN" + RESOURCE_CATEGORY_UNKNOWN = "UNKNOWN" + def __init__(self, **kwargs): """ Initializes a new UpdateMonitoredResourceTypeDetails object with values from keyword arguments. @@ -32,6 +72,16 @@ def __init__(self, **kwargs): The value to assign to the metric_namespace property of this UpdateMonitoredResourceTypeDetails. :type metric_namespace: str + :param source_type: + The value to assign to the source_type property of this UpdateMonitoredResourceTypeDetails. + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD" + :type source_type: str + + :param resource_category: + The value to assign to the resource_category property of this UpdateMonitoredResourceTypeDetails. + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN" + :type resource_category: str + :param metadata: The value to assign to the metadata property of this UpdateMonitoredResourceTypeDetails. :type metadata: oci.stack_monitoring.models.ResourceTypeMetadataDetails @@ -49,6 +99,8 @@ def __init__(self, **kwargs): 'display_name': 'str', 'description': 'str', 'metric_namespace': 'str', + 'source_type': 'str', + 'resource_category': 'str', 'metadata': 'ResourceTypeMetadataDetails', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))' @@ -58,6 +110,8 @@ def __init__(self, **kwargs): 'display_name': 'displayName', 'description': 'description', 'metric_namespace': 'metricNamespace', + 'source_type': 'sourceType', + 'resource_category': 'resourceCategory', 'metadata': 'metadata', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags' @@ -66,6 +120,8 @@ def __init__(self, **kwargs): self._display_name = None self._description = None self._metric_namespace = None + self._source_type = None + self._resource_category = None self._metadata = None self._freeform_tags = None self._defined_tags = None @@ -142,6 +198,68 @@ def metric_namespace(self, metric_namespace): """ self._metric_namespace = metric_namespace + @property + def source_type(self): + """ + Gets the source_type of this UpdateMonitoredResourceTypeDetails. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + Allowed values for this property are: "SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD" + + + :return: The source_type of this UpdateMonitoredResourceTypeDetails. + :rtype: str + """ + return self._source_type + + @source_type.setter + def source_type(self, source_type): + """ + Sets the source_type of this UpdateMonitoredResourceTypeDetails. + Source type to indicate if the resource is stack monitoring discovered, OCI native resource, etc. + + + :param source_type: The source_type of this UpdateMonitoredResourceTypeDetails. + :type: str + """ + allowed_values = ["SM_MGMT_AGENT_MONITORED", "SM_REPO_ONLY", "OCI_NATIVE", "PROMETHEUS", "TELEGRAF", "COLLECTD"] + if not value_allowed_none_or_none_sentinel(source_type, allowed_values): + raise ValueError( + f"Invalid value for `source_type`, must be None or one of {allowed_values}" + ) + self._source_type = source_type + + @property + def resource_category(self): + """ + Gets the resource_category of this UpdateMonitoredResourceTypeDetails. + Resource Category to indicate the kind of resource type. + + Allowed values for this property are: "APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN" + + + :return: The resource_category of this UpdateMonitoredResourceTypeDetails. + :rtype: str + """ + return self._resource_category + + @resource_category.setter + def resource_category(self, resource_category): + """ + Sets the resource_category of this UpdateMonitoredResourceTypeDetails. + Resource Category to indicate the kind of resource type. + + + :param resource_category: The resource_category of this UpdateMonitoredResourceTypeDetails. + :type: str + """ + allowed_values = ["APPLICATION", "DATABASE", "MIDDLEWARE", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(resource_category, allowed_values): + raise ValueError( + f"Invalid value for `resource_category`, must be None or one of {allowed_values}" + ) + self._resource_category = resource_category + @property def metadata(self): """ diff --git a/src/oci/stack_monitoring/stack_monitoring_client.py b/src/oci/stack_monitoring/stack_monitoring_client.py index 599ddc6843..32e88d7c4b 100644 --- a/src/oci/stack_monitoring/stack_monitoring_client.py +++ b/src/oci/stack_monitoring/stack_monitoring_client.py @@ -653,7 +653,7 @@ def change_monitored_resource_task_compartment(self, monitored_resource_task_id, resource_path = "/monitoredResourceTasks/{monitoredResourceTaskId}/actions/changeCompartment" method = "POST" operation_name = "change_monitored_resource_task_compartment" - api_reference_link = "https://docs.oracle.com/iaas/api/#/en/stack-monitoring/20210330/monitoredResourceTask/ChangeMonitoredResourceTaskCompartment" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/stack-monitoring/20210330/MonitoredResourceTask/ChangeMonitoredResourceTaskCompartment" # Don't accept unknown kwargs expected_kwargs = [ @@ -5230,6 +5230,11 @@ def list_monitored_resources(self, compartment_id, **kwargs): :param str work_request_id: (optional) A filter to return resources which were impacted as part of this work request identifier. + :param str status: (optional) + A filter to return only resources with matching lifecycleState. + + Allowed values are: "CREATING", "UPDATING", "ACTIVE", "DELETING", "DELETED", "FAILED" + :param str sort_by: (optional) The field to sort by. Only one sort order may be provided. Default order for timeCreated is descending. Default order for resources is ascending. @@ -5290,6 +5295,7 @@ def list_monitored_resources(self, compartment_id, **kwargs): "retry_strategy", "name", "work_request_id", + "status", "sort_by", "sort_order", "limit", @@ -5301,6 +5307,13 @@ def list_monitored_resources(self, compartment_id, **kwargs): raise ValueError( f"list_monitored_resources got unknown kwargs: {extra_kwargs!r}") + if 'status' in kwargs: + status_allowed_values = ["CREATING", "UPDATING", "ACTIVE", "DELETING", "DELETED", "FAILED"] + if kwargs['status'] not in status_allowed_values: + raise ValueError( + f"Invalid value for `status`, must be one of { status_allowed_values }" + ) + if 'sort_by' in kwargs: sort_by_allowed_values = ["NAME", "TIME_CREATED"] if kwargs['sort_by'] not in sort_by_allowed_values: @@ -5319,6 +5332,7 @@ def list_monitored_resources(self, compartment_id, **kwargs): "compartmentId": compartment_id, "name": kwargs.get("name", missing), "workRequestId": kwargs.get("work_request_id", missing), + "status": kwargs.get("status", missing), "sortBy": kwargs.get("sort_by", missing), "sortOrder": kwargs.get("sort_order", missing), "limit": kwargs.get("limit", missing), diff --git a/src/oci/version.py b/src/oci/version.py index 7f4c53320d..5ba5e279bd 100644 --- a/src/oci/version.py +++ b/src/oci/version.py @@ -2,4 +2,4 @@ # Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -__version__ = "2.125.1" +__version__ = "2.125.2"