diff --git a/oas_docs/bundle.json b/oas_docs/bundle.json index 6e5acf533dfed..ba002e8cb3db3 100644 --- a/oas_docs/bundle.json +++ b/oas_docs/bundle.json @@ -41852,10 +41852,11 @@ } } }, - "summary": "Get CCR Remote synced integrations status", + "summary": "Get remote synced integrations status", "tags": [ - "CCR Remote synced integrations" - ] + "Fleet remote synced integrations" + ], + "x-state": "Generally available; added in 9.1.0" } }, "/api/fleet/remote_synced_integrations/{outputId}/remote_status": { @@ -42047,10 +42048,11 @@ } } }, - "summary": "Get CCR Remote synced integrations status by outputId", + "summary": "Get remote synced integrations status by outputId", "tags": [ - "CCR Remote synced integrations" - ] + "Fleet remote synced integrations" + ], + "x-state": "Generally available; added in 9.1.0" } }, "/api/fleet/service_tokens": { @@ -66019,9 +66021,6 @@ { "name": "alerting" }, - { - "name": "CCR Remote synced integrations" - }, { "name": "connectors" }, @@ -66061,6 +66060,9 @@ { "name": "Fleet proxies" }, + { + "name": "Fleet remote synced integrations" + }, { "name": "Fleet Server hosts" }, diff --git a/oas_docs/bundle.serverless.json b/oas_docs/bundle.serverless.json index 5d4499535ee07..2cfd6ded6b7ed 100644 --- a/oas_docs/bundle.serverless.json +++ b/oas_docs/bundle.serverless.json @@ -41672,387 +41672,6 @@ ] } }, - "/api/fleet/remote_synced_integrations/status": { - "get": { - "description": "[Required authorization] Route required privileges: fleet-settings-read AND integrations-read.", - "operationId": "get-fleet-remote-synced-integrations-status", - "parameters": [], - "responses": { - "200": { - "content": { - "application/json": { - "schema": { - "additionalProperties": false, - "properties": { - "custom_assets": { - "additionalProperties": { - "additionalProperties": false, - "properties": { - "error": { - "type": "string" - }, - "is_deleted": { - "type": "boolean" - }, - "name": { - "type": "string" - }, - "package_name": { - "type": "string" - }, - "package_version": { - "type": "string" - }, - "sync_status": { - "enum": [ - "completed", - "synchronizing", - "failed", - "warning" - ], - "type": "string" - }, - "type": { - "type": "string" - } - }, - "required": [ - "type", - "name", - "package_name", - "package_version", - "sync_status" - ], - "type": "object" - }, - "type": "object" - }, - "error": { - "type": "string" - }, - "integrations": { - "items": { - "additionalProperties": false, - "properties": { - "error": { - "type": "string" - }, - "id": { - "type": "string" - }, - "install_status": { - "additionalProperties": false, - "properties": { - "main": { - "type": "string" - }, - "remote": { - "type": "string" - } - }, - "required": [ - "main" - ], - "type": "object" - }, - "package_name": { - "type": "string" - }, - "package_version": { - "type": "string" - }, - "sync_status": { - "enum": [ - "completed", - "synchronizing", - "failed", - "warning" - ], - "type": "string" - }, - "updated_at": { - "type": "string" - }, - "warning": { - "additionalProperties": false, - "properties": { - "message": { - "type": "string" - }, - "title": { - "type": "string" - } - }, - "required": [ - "title" - ], - "type": "object" - } - }, - "required": [ - "sync_status", - "install_status" - ], - "type": "object" - }, - "type": "array" - }, - "warning": { - "additionalProperties": false, - "properties": { - "message": { - "type": "string" - }, - "title": { - "type": "string" - } - }, - "required": [ - "title" - ], - "type": "object" - } - }, - "required": [ - "integrations" - ], - "type": "object" - } - } - } - }, - "400": { - "content": { - "application/json": { - "schema": { - "additionalProperties": false, - "description": "Generic Error", - "properties": { - "attributes": {}, - "error": { - "type": "string" - }, - "errorType": { - "type": "string" - }, - "message": { - "type": "string" - }, - "statusCode": { - "type": "number" - } - }, - "required": [ - "message", - "attributes" - ], - "type": "object" - } - } - } - } - }, - "summary": "Get CCR Remote synced integrations status", - "tags": [ - "CCR Remote synced integrations" - ] - } - }, - "/api/fleet/remote_synced_integrations/{outputId}/remote_status": { - "get": { - "description": "[Required authorization] Route required privileges: fleet-settings-read AND integrations-read.", - "operationId": "get-fleet-remote-synced-integrations-outputid-remote-status", - "parameters": [ - { - "in": "path", - "name": "outputId", - "required": true, - "schema": { - "type": "string" - } - } - ], - "responses": { - "200": { - "content": { - "application/json": { - "schema": { - "additionalProperties": false, - "properties": { - "custom_assets": { - "additionalProperties": { - "additionalProperties": false, - "properties": { - "error": { - "type": "string" - }, - "is_deleted": { - "type": "boolean" - }, - "name": { - "type": "string" - }, - "package_name": { - "type": "string" - }, - "package_version": { - "type": "string" - }, - "sync_status": { - "enum": [ - "completed", - "synchronizing", - "failed", - "warning" - ], - "type": "string" - }, - "type": { - "type": "string" - } - }, - "required": [ - "type", - "name", - "package_name", - "package_version", - "sync_status" - ], - "type": "object" - }, - "type": "object" - }, - "error": { - "type": "string" - }, - "integrations": { - "items": { - "additionalProperties": false, - "properties": { - "error": { - "type": "string" - }, - "id": { - "type": "string" - }, - "install_status": { - "additionalProperties": false, - "properties": { - "main": { - "type": "string" - }, - "remote": { - "type": "string" - } - }, - "required": [ - "main" - ], - "type": "object" - }, - "package_name": { - "type": "string" - }, - "package_version": { - "type": "string" - }, - "sync_status": { - "enum": [ - "completed", - "synchronizing", - "failed", - "warning" - ], - "type": "string" - }, - "updated_at": { - "type": "string" - }, - "warning": { - "additionalProperties": false, - "properties": { - "message": { - "type": "string" - }, - "title": { - "type": "string" - } - }, - "required": [ - "title" - ], - "type": "object" - } - }, - "required": [ - "sync_status", - "install_status" - ], - "type": "object" - }, - "type": "array" - }, - "warning": { - "additionalProperties": false, - "properties": { - "message": { - "type": "string" - }, - "title": { - "type": "string" - } - }, - "required": [ - "title" - ], - "type": "object" - } - }, - "required": [ - "integrations" - ], - "type": "object" - } - } - } - }, - "400": { - "content": { - "application/json": { - "schema": { - "additionalProperties": false, - "description": "Generic Error", - "properties": { - "attributes": {}, - "error": { - "type": "string" - }, - "errorType": { - "type": "string" - }, - "message": { - "type": "string" - }, - "statusCode": { - "type": "number" - } - }, - "required": [ - "message", - "attributes" - ], - "type": "object" - } - } - } - } - }, - "summary": "Get CCR Remote synced integrations status by outputId", - "tags": [ - "CCR Remote synced integrations" - ] - } - }, "/api/fleet/settings": { "get": { "description": "[Required authorization] Route required privileges: fleet-settings-read.", @@ -65517,9 +65136,6 @@ { "name": "alerting" }, - { - "name": "CCR Remote synced integrations" - }, { "name": "connectors" }, diff --git a/oas_docs/output/kibana.serverless.yaml b/oas_docs/output/kibana.serverless.yaml index 3f8b5ef9e25e2..b26414153fab1 100644 --- a/oas_docs/output/kibana.serverless.yaml +++ b/oas_docs/output/kibana.serverless.yaml @@ -66,7 +66,6 @@ tags: Configure APM source maps. A source map allows minified files to be mapped back to original source code--allowing you to maintain the speed advantage of minified code, without losing the ability to quickly and easily debug your application. For best results, uploading source maps should become a part of your deployment procedure, and not something you only do when you see unhelpful errors. That's because uploading source maps after errors happen won't make old errors magically readable--errors must occur again for source mapping to occur. name: APM sourcemaps - - name: CCR Remote synced integrations - name: connectors description: | Connectors provide a central place to store connection information for services and integrations with Elastic or third party systems. Alerting rules can use connectors to run actions when rule conditions are met. @@ -38085,271 +38084,6 @@ paths: x-metaTags: - content: Kibana, Elastic Cloud Serverless name: product_name - /api/fleet/remote_synced_integrations/{outputId}/remote_status: - get: - description: '[Required authorization] Route required privileges: fleet-settings-read AND integrations-read.' - operationId: get-fleet-remote-synced-integrations-outputid-remote-status - parameters: - - in: path - name: outputId - required: true - schema: - type: string - responses: - '200': - content: - application/json: - schema: - additionalProperties: false - type: object - properties: - custom_assets: - additionalProperties: - additionalProperties: false - type: object - properties: - error: - type: string - is_deleted: - type: boolean - name: - type: string - package_name: - type: string - package_version: - type: string - sync_status: - enum: - - completed - - synchronizing - - failed - - warning - type: string - type: - type: string - required: - - type - - name - - package_name - - package_version - - sync_status - type: object - error: - type: string - integrations: - items: - additionalProperties: false - type: object - properties: - error: - type: string - id: - type: string - install_status: - additionalProperties: false - type: object - properties: - main: - type: string - remote: - type: string - required: - - main - package_name: - type: string - package_version: - type: string - sync_status: - enum: - - completed - - synchronizing - - failed - - warning - type: string - updated_at: - type: string - warning: - additionalProperties: false - type: object - properties: - message: - type: string - title: - type: string - required: - - title - required: - - sync_status - - install_status - type: array - warning: - additionalProperties: false - type: object - properties: - message: - type: string - title: - type: string - required: - - title - required: - - integrations - '400': - content: - application/json: - schema: - additionalProperties: false - description: Generic Error - type: object - properties: - attributes: {} - error: - type: string - errorType: - type: string - message: - type: string - statusCode: - type: number - required: - - message - - attributes - summary: Get CCR Remote synced integrations status by outputId - tags: - - CCR Remote synced integrations - x-metaTags: - - content: Kibana, Elastic Cloud Serverless - name: product_name - /api/fleet/remote_synced_integrations/status: - get: - description: '[Required authorization] Route required privileges: fleet-settings-read AND integrations-read.' - operationId: get-fleet-remote-synced-integrations-status - parameters: [] - responses: - '200': - content: - application/json: - schema: - additionalProperties: false - type: object - properties: - custom_assets: - additionalProperties: - additionalProperties: false - type: object - properties: - error: - type: string - is_deleted: - type: boolean - name: - type: string - package_name: - type: string - package_version: - type: string - sync_status: - enum: - - completed - - synchronizing - - failed - - warning - type: string - type: - type: string - required: - - type - - name - - package_name - - package_version - - sync_status - type: object - error: - type: string - integrations: - items: - additionalProperties: false - type: object - properties: - error: - type: string - id: - type: string - install_status: - additionalProperties: false - type: object - properties: - main: - type: string - remote: - type: string - required: - - main - package_name: - type: string - package_version: - type: string - sync_status: - enum: - - completed - - synchronizing - - failed - - warning - type: string - updated_at: - type: string - warning: - additionalProperties: false - type: object - properties: - message: - type: string - title: - type: string - required: - - title - required: - - sync_status - - install_status - type: array - warning: - additionalProperties: false - type: object - properties: - message: - type: string - title: - type: string - required: - - title - required: - - integrations - '400': - content: - application/json: - schema: - additionalProperties: false - description: Generic Error - type: object - properties: - attributes: {} - error: - type: string - errorType: - type: string - message: - type: string - statusCode: - type: number - required: - - message - - attributes - summary: Get CCR Remote synced integrations status - tags: - - CCR Remote synced integrations - x-metaTags: - - content: Kibana, Elastic Cloud Serverless - name: product_name /api/fleet/settings: get: description: '[Required authorization] Route required privileges: fleet-settings-read.' diff --git a/oas_docs/output/kibana.yaml b/oas_docs/output/kibana.yaml index 45500e11aca17..87f3191fd30ad 100644 --- a/oas_docs/output/kibana.yaml +++ b/oas_docs/output/kibana.yaml @@ -80,7 +80,6 @@ tags: description: Cases documentation url: https://www.elastic.co/docs/explore-analyze/alerts-cases/cases x-displayName: Cases - - name: CCR Remote synced integrations - name: connectors description: | Connectors provide a central place to store connection information for services and integrations with Elastic or third party systems. Alerting rules can use connectors to run actions when rule conditions are met. @@ -103,6 +102,7 @@ tags: - name: Fleet outputs - name: Fleet package policies - name: Fleet proxies + - name: Fleet remote synced integrations - name: Fleet Server hosts - name: Fleet service tokens - name: Fleet uninstall tokens @@ -42361,9 +42361,10 @@ paths: required: - message - attributes - summary: Get CCR Remote synced integrations status by outputId + summary: Get remote synced integrations status by outputId tags: - - CCR Remote synced integrations + - Fleet remote synced integrations + x-state: Generally available; added in 9.1.0 x-metaTags: - content: Kibana name: product_name @@ -42498,9 +42499,10 @@ paths: required: - message - attributes - summary: Get CCR Remote synced integrations status + summary: Get remote synced integrations status tags: - - CCR Remote synced integrations + - Fleet remote synced integrations + x-state: Generally available; added in 9.1.0 x-metaTags: - content: Kibana name: product_name diff --git a/src/platform/packages/private/kbn-validate-oas/oas_error_baseline.json b/src/platform/packages/private/kbn-validate-oas/oas_error_baseline.json index c7b7c4a28e6df..d5043c5c0c630 100644 --- a/src/platform/packages/private/kbn-validate-oas/oas_error_baseline.json +++ b/src/platform/packages/private/kbn-validate-oas/oas_error_baseline.json @@ -1,4 +1,4 @@ { "./oas_docs/output/kibana.yaml": 312, - "./oas_docs/output/kibana.serverless.yaml": 294 + "./oas_docs/output/kibana.serverless.yaml": 290 } \ No newline at end of file diff --git a/x-pack/platform/plugins/shared/fleet/server/routes/index.ts b/x-pack/platform/plugins/shared/fleet/server/routes/index.ts index ff11c207c3699..dd45ed4df79d5 100644 --- a/x-pack/platform/plugins/shared/fleet/server/routes/index.ts +++ b/x-pack/platform/plugins/shared/fleet/server/routes/index.ts @@ -55,7 +55,7 @@ export function registerRoutes( registerMessageSigningServiceRoutes(fleetAuthzRouter); registerUninstallTokenRoutes(fleetAuthzRouter, config); registerStandaloneAgentApiKeyRoutes(fleetAuthzRouter); - registerRemoteSyncedIntegrations(fleetAuthzRouter); + registerRemoteSyncedIntegrations(fleetAuthzRouter, isServerless); registerDebugRoutes(fleetAuthzRouter); // Conditional config routes diff --git a/x-pack/platform/plugins/shared/fleet/server/routes/remote_synced_integrations/index.ts b/x-pack/platform/plugins/shared/fleet/server/routes/remote_synced_integrations/index.ts index b5b32e196ef3e..7ebf94e391567 100644 --- a/x-pack/platform/plugins/shared/fleet/server/routes/remote_synced_integrations/index.ts +++ b/x-pack/platform/plugins/shared/fleet/server/routes/remote_synced_integrations/index.ts @@ -20,7 +20,10 @@ import { getRemoteSyncedIntegrationsInfoHandler, } from './handler'; -export const registerRoutes = (router: FleetAuthzRouter) => { +export const registerRoutes = (router: FleetAuthzRouter, isServerless?: boolean) => { + if (isServerless) { + return; + } router.versioned .get({ path: REMOTE_SYNCED_INTEGRATIONS_API_ROUTES.STATUS_PATTERN, @@ -32,9 +35,13 @@ export const registerRoutes = (router: FleetAuthzRouter) => { ], }, }, - summary: `Get CCR Remote synced integrations status`, + summary: `Get remote synced integrations status`, options: { - tags: ['oas-tag:CCR Remote synced integrations'], + tags: ['oas-tag:Fleet remote synced integrations'], + availability: { + since: '9.1.0', + stability: 'stable', + }, }, }) .addVersion( @@ -66,9 +73,13 @@ export const registerRoutes = (router: FleetAuthzRouter) => { ], }, }, - summary: `Get CCR Remote synced integrations status by outputId`, + summary: `Get remote synced integrations status by outputId`, options: { - tags: ['oas-tag:CCR Remote synced integrations'], + tags: ['oas-tag:Fleet remote synced integrations'], + availability: { + since: '9.1.0', + stability: 'stable', + }, }, }) .addVersion(