Merge branch 'main' into ELS-162

elastic · Aug 21, 2023 · ab03e0e · ab03e0e
2 parents 9152923 + 9cff5fc
commit ab03e0e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 15 deletions.
diff --git a/docs/api-generated/connectors/connector-apis-passthru.asciidoc b/docs/api-generated/connectors/connector-apis-passthru.asciidoc
@@ -2475,15 +2475,15 @@ Any modifications made to this file will be overwritten.
     <div class='model-description'></div>
     <div class="field-items">
       <div class="param">name </div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The display name for the connector. </div>
-<div class="param">secrets </div><div class="param-desc"><span class="param-type"><a href="#">secrets_properties_slack_api</a></span>  </div>
+<div class="param">secrets </div><div class="param-desc"><span class="param-type"><a href="#secrets_properties_slack_api">secrets_properties_slack_api</a></span>  </div>
     </div>  <!-- field-items -->
   </div>
   <div class="model">
     <h3><a name="update_connector_request_slack_webhook"><code>update_connector_request_slack_webhook</code> - Update Slack connector request</a> <a class="up" href="#__Models">Up</a></h3>
     <div class='model-description'></div>
     <div class="field-items">
       <div class="param">name </div><div class="param-desc"><span class="param-type"><a href="#string">String</a></span> The display name for the connector. </div>
-<div class="param">secrets </div><div class="param-desc"><span class="param-type"><a href="#">secrets_properties_slack_webhook</a></span>  </div>
+<div class="param">secrets </div><div class="param-desc"><span class="param-type"><a href="#secrets_properties_slack_webhook">secrets_properties_slack_webhook</a></span>  </div>
     </div>  <!-- field-items -->
   </div>
   <div class="model">

diff --git a/x-pack/plugins/actions/docs/openapi/bundled.json b/x-pack/plugins/actions/docs/openapi/bundled.json
@@ -3720,8 +3720,6 @@
             "description": "The display name for the connector."
           },
           "secrets": {
-            "type": "object",
-            "description": "The secrets object containing the necessary fields for authentication.",
             "$ref": "#/components/schemas/secrets_properties_slack_api"
           }
         }
@@ -3739,8 +3737,6 @@
             "description": "The display name for the connector."
           },
           "secrets": {
-            "type": "object",
-            "description": "The secrets object containing the necessary fields for authentication.",
             "$ref": "#/components/schemas/secrets_properties_slack_webhook"
           }
         }

diff --git a/x-pack/plugins/actions/docs/openapi/bundled.yaml b/x-pack/plugins/actions/docs/openapi/bundled.yaml
@@ -2549,8 +2549,6 @@ components:
           type: string
           description: The display name for the connector.
         secrets:
-          type: object
-          description: The secrets object containing the necessary fields for authentication.
           $ref: '#/components/schemas/secrets_properties_slack_api'
     update_connector_request_slack_webhook:
       title: Update Slack connector request
@@ -2563,8 +2561,6 @@ components:
           type: string
           description: The display name for the connector.
         secrets:
-          type: object
-          description: The secrets object containing the necessary fields for authentication.
           $ref: '#/components/schemas/secrets_properties_slack_webhook'
     update_connector_request_swimlane:
       title: Update Swimlane connector request

diff --git a/...k/plugins/actions/docs/openapi/components/schemas/update_connector_request_slack_api.yaml b/...k/plugins/actions/docs/openapi/components/schemas/update_connector_request_slack_api.yaml
@@ -8,6 +8,4 @@ properties:
     type: string
     description: The display name for the connector.
   secrets:
-    type: object
-    description: The secrets object containing the necessary fields for authentication.
     $ref: 'secrets_properties_slack_api.yaml'
diff --git a/...ugins/actions/docs/openapi/components/schemas/update_connector_request_slack_webhook.yaml b/...ugins/actions/docs/openapi/components/schemas/update_connector_request_slack_webhook.yaml
@@ -8,6 +8,4 @@ properties:
     type: string
     description: The display name for the connector.
   secrets:
-    type: object
-    description: The secrets object containing the necessary fields for authentication.
     $ref: 'secrets_properties_slack_webhook.yaml'
diff --git a/..._engine_api_integration/security_and_spaces/group4/telemetry/task_based/security_lists.ts b/..._engine_api_integration/security_and_spaces/group4/telemetry/task_based/security_lists.ts
@@ -31,7 +31,8 @@ export default ({ getService }: FtrProviderContext) => {
   const retry = getService('retry');
   const es = getService('es');
 
-  describe('Security lists task telemetry', async () => {
+  // Failing: See https://github.com/elastic/kibana/issues/164334
+  describe.skip('Security lists task telemetry', async () => {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/security_solution/telemetry');
     });