From cfebf7e85085fdf7184a165b1f86ef9fee969ab0 Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 24 Jun 2024 09:51:46 -0700 Subject: [PATCH 1/5] [OAS] Add APM operationIds --- .../plugins/observability_solution/apm/docs/openapi/apm.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x-pack/plugins/observability_solution/apm/docs/openapi/apm.yaml b/x-pack/plugins/observability_solution/apm/docs/openapi/apm.yaml index 60c8a74d75b88..d37137302fd21 100644 --- a/x-pack/plugins/observability_solution/apm/docs/openapi/apm.yaml +++ b/x-pack/plugins/observability_solution/apm/docs/openapi/apm.yaml @@ -15,6 +15,7 @@ paths: post: summary: Create an APM agent key description: Create a new agent key for APM. + operationId: createAgentKey tags: - APM agent keys requestBody: @@ -56,6 +57,7 @@ paths: get: summary: Search for annotations description: Search for annotations related to a specific service. + operationId: getAnnotation tags: - APM annotations parameters: @@ -110,6 +112,7 @@ paths: post: summary: Create a service annotation description: Create a new annotation for a specific service. + operationId: createAnnotation tags: - APM annotations parameters: From 71becdd38cabecf3357e2e04e80da3441585da52 Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 24 Jun 2024 09:53:07 -0700 Subject: [PATCH 2/5] Refresh joined bundle --- oas_docs/kibana.serverless.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/oas_docs/kibana.serverless.yaml b/oas_docs/kibana.serverless.yaml index 24cf6df24a4d4..37082573fc9a9 100644 --- a/oas_docs/kibana.serverless.yaml +++ b/oas_docs/kibana.serverless.yaml @@ -76,6 +76,7 @@ paths: post: summary: Create an APM agent key description: Create a new agent key for APM. + operationId: createAgentKey tags: - APM agent keys requestBody: @@ -117,6 +118,7 @@ paths: get: summary: Search for annotations description: Search for annotations related to a specific service. + operationId: getAnnotation tags: - APM annotations parameters: @@ -171,6 +173,7 @@ paths: post: summary: Create a service annotation description: Create a new annotation for a specific service. + operationId: createAnnotation tags: - APM annotations parameters: From b5340930401c220f747ac93431e48070e9ea89e0 Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 24 Jun 2024 10:03:24 -0700 Subject: [PATCH 3/5] Enable operation ID linting rules --- oas_docs/.spectral.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/oas_docs/.spectral.yaml b/oas_docs/.spectral.yaml index b328e320e23eb..7ed4b0fe0d725 100644 --- a/oas_docs/.spectral.yaml +++ b/oas_docs/.spectral.yaml @@ -14,9 +14,9 @@ rules: oas3-valid-schema-example: false oas2-valid-media-example: false # Operations - operation-operationId: false - operation-operationId-unique: false - operation-operationId-valid-in-url: false + operation-operationId: warn + operation-operationId-unique: warn + operation-operationId-valid-in-url: warn operation-tag-defined: warn operation-tags: warn # Responses From 024f383c6d7ec28594936be95cfb76e293184500 Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 24 Jun 2024 12:49:08 -0700 Subject: [PATCH 4/5] Refresh Gemini and Bedrock connector versions --- oas_docs/kibana.serverless.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/oas_docs/kibana.serverless.yaml b/oas_docs/kibana.serverless.yaml index 37082573fc9a9..1cb58495c3233 100644 --- a/oas_docs/kibana.serverless.yaml +++ b/oas_docs/kibana.serverless.yaml @@ -3327,7 +3327,7 @@ components: description: > The generative artificial intelligence model for Amazon Bedrock to use. Current support is for the Anthropic Claude models. - default: anthropic.claude-3-sonnet-20240229-v1:0 + default: anthropic.claude-3-5-sonnet-20240620-v1:0 Connectors_secrets_properties_bedrock: title: Connector secrets properties for an Amazon Bedrock connector description: Defines secrets for connectors when type is `.bedrock`. @@ -3359,7 +3359,7 @@ components: description: >- The generative artificial intelligence model for Google Gemini to use. - default: gemini-1.5-pro-preview-0409 + default: gemini-1.5-pro-001 gcpRegion: type: string description: The GCP region where the Vertex AI endpoint enabled. @@ -3597,7 +3597,7 @@ components: The host name of the service provider. If the `service` is `elastic_cloud` (for Elastic Cloud notifications) or one of Nodemailer's well-known email service providers, this property is - ignored. If `service` is `other`, this property must be defined. + ignored. If `service` is `other`, this property must be defined. type: string oauthTokenUrl: type: string @@ -3607,7 +3607,7 @@ components: The port to connect to on the service provider. If the `service` is `elastic_cloud` (for Elastic Cloud notifications) or one of Nodemailer's well-known email service providers, this property is - ignored. If `service` is `other`, this property must be defined. + ignored. If `service` is `other`, this property must be defined. type: integer secure: description: > @@ -5275,7 +5275,7 @@ components: type: boolean description: > Indicates whether it is a preconfigured connector. If true, the `config` - and `is_missing_secrets` properties are omitted from the response. + and `is_missing_secrets` properties are omitted from the response. example: false Connectors_is_system_action: type: boolean From 55bb55477a9a828c6279e99e4a85a21ab63ab230 Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 24 Jun 2024 13:16:39 -0700 Subject: [PATCH 5/5] Defer changes in oas_docs --- oas_docs/.spectral.yaml | 6 +++--- oas_docs/kibana.serverless.yaml | 13 +++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/oas_docs/.spectral.yaml b/oas_docs/.spectral.yaml index 7ed4b0fe0d725..b328e320e23eb 100644 --- a/oas_docs/.spectral.yaml +++ b/oas_docs/.spectral.yaml @@ -14,9 +14,9 @@ rules: oas3-valid-schema-example: false oas2-valid-media-example: false # Operations - operation-operationId: warn - operation-operationId-unique: warn - operation-operationId-valid-in-url: warn + operation-operationId: false + operation-operationId-unique: false + operation-operationId-valid-in-url: false operation-tag-defined: warn operation-tags: warn # Responses diff --git a/oas_docs/kibana.serverless.yaml b/oas_docs/kibana.serverless.yaml index 1cb58495c3233..24cf6df24a4d4 100644 --- a/oas_docs/kibana.serverless.yaml +++ b/oas_docs/kibana.serverless.yaml @@ -76,7 +76,6 @@ paths: post: summary: Create an APM agent key description: Create a new agent key for APM. - operationId: createAgentKey tags: - APM agent keys requestBody: @@ -118,7 +117,6 @@ paths: get: summary: Search for annotations description: Search for annotations related to a specific service. - operationId: getAnnotation tags: - APM annotations parameters: @@ -173,7 +171,6 @@ paths: post: summary: Create a service annotation description: Create a new annotation for a specific service. - operationId: createAnnotation tags: - APM annotations parameters: @@ -3327,7 +3324,7 @@ components: description: > The generative artificial intelligence model for Amazon Bedrock to use. Current support is for the Anthropic Claude models. - default: anthropic.claude-3-5-sonnet-20240620-v1:0 + default: anthropic.claude-3-sonnet-20240229-v1:0 Connectors_secrets_properties_bedrock: title: Connector secrets properties for an Amazon Bedrock connector description: Defines secrets for connectors when type is `.bedrock`. @@ -3359,7 +3356,7 @@ components: description: >- The generative artificial intelligence model for Google Gemini to use. - default: gemini-1.5-pro-001 + default: gemini-1.5-pro-preview-0409 gcpRegion: type: string description: The GCP region where the Vertex AI endpoint enabled. @@ -3597,7 +3594,7 @@ components: The host name of the service provider. If the `service` is `elastic_cloud` (for Elastic Cloud notifications) or one of Nodemailer's well-known email service providers, this property is - ignored. If `service` is `other`, this property must be defined. + ignored. If `service` is `other`, this property must be defined. type: string oauthTokenUrl: type: string @@ -3607,7 +3604,7 @@ components: The port to connect to on the service provider. If the `service` is `elastic_cloud` (for Elastic Cloud notifications) or one of Nodemailer's well-known email service providers, this property is - ignored. If `service` is `other`, this property must be defined. + ignored. If `service` is `other`, this property must be defined. type: integer secure: description: > @@ -5275,7 +5272,7 @@ components: type: boolean description: > Indicates whether it is a preconfigured connector. If true, the `config` - and `is_missing_secrets` properties are omitted from the response. + and `is_missing_secrets` properties are omitted from the response. example: false Connectors_is_system_action: type: boolean