Merge branch 'main' into fix-flaky-test

elastic · May 20, 2024 · 6794c97 · 6794c97
2 parents 5d181ae + 3a23efe
commit 6794c97
Show file tree

Hide file tree

Showing 42 changed files with 1,150 additions and 240 deletions.
diff --git a/.buildkite/pipeline-resource-definitions/kibana-fips-daily.yml b/.buildkite/pipeline-resource-definitions/kibana-fips-daily.yml
@@ -19,7 +19,7 @@ spec:
       description: Run Kibana FIPS smoke tests
     spec:
       env:
-        SLACK_NOTIFICATIONS_CHANNEL: "#kibana-operations-alerts"
+        SLACK_NOTIFICATIONS_CHANNEL: "#kibana-fips-ftr-errors"
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
       repository: elastic/kibana
       branch_configuration: main
@@ -30,7 +30,7 @@ spec:
       schedules:
         daily:
           branch: main
-          cronline: 0 9 * * * America/New_York
+          cronline: 0 5 * * * America/New_York
       teams:
         kibana-operations:
           access_level: MANAGE_BUILD_AND_READ

diff --git a/package.json b/package.json
@@ -998,7 +998,7 @@
     "deepmerge": "^4.2.2",
     "del": "^6.1.0",
     "diff": "^5.1.0",
-    "elastic-apm-node": "^4.5.3",
+    "elastic-apm-node": "^4.5.4",
     "email-addresses": "^5.0.0",
     "eventsource-parser": "^1.1.1",
     "execa": "^5.1.1",

diff --git a/test/functional/apps/discover/group4/_esql_view.ts b/test/functional/apps/discover/group4/_esql_view.ts
@@ -257,7 +257,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
     });
 
-    describe('inspector', () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/183847
+    describe.skip('inspector', () => {
       beforeEach(async () => {
         await PageObjects.common.navigateToApp('discover');
         await PageObjects.timePicker.setDefaultAbsoluteRange();

diff --git a/...s/enterprise_search/public/applications/applications/components/playground/playground.tsx b/...s/enterprise_search/public/applications/applications/components/playground/playground.tsx
@@ -7,8 +7,6 @@
 
 import React from 'react';
 
-import { useSearchParams } from 'react-router-dom-v5-compat';
-
 import { useValues } from 'kea';
 
 import { EuiBetaBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
@@ -20,21 +18,13 @@ import { KibanaLogic } from '../../../shared/kibana';
 import { EnterpriseSearchApplicationsPageTemplate } from '../layout/page_template';
 
 export const Playground: React.FC = () => {
-  const [searchParams] = useSearchParams();
-  const index: string | null = searchParams.has('default-index')
-    ? searchParams.get('default-index')
-    : null;
   const { searchPlayground } = useValues(KibanaLogic);
 
   if (!searchPlayground) {
     return null;
   }
   return (
-    <searchPlayground.PlaygroundProvider
-      defaultValues={{
-        indices: index ? [index] : [],
-      }}
-    >
+    <searchPlayground.PlaygroundProvider>
       <EnterpriseSearchApplicationsPageTemplate
         pageChrome={[
           i18n.translate('xpack.enterpriseSearch.content.playground.breadcrumb', {

diff --git a/x-pack/plugins/fleet/common/constants/index.ts b/x-pack/plugins/fleet/common/constants/index.ts
@@ -56,4 +56,6 @@ export const DATA_TIERS = ['data_hot'];
 
 export const FLEET_ENROLLMENT_API_PREFIX = 'fleet-enrollment-api-keys';
 
+export const REQUEST_DIAGNOSTICS_TIMEOUT_MS = 3 * 60 * 60 * 1000; // 3 hours;
+
 export * from './mappings';
diff --git a/x-pack/plugins/fleet/common/constants/routes.ts b/x-pack/plugins/fleet/common/constants/routes.ts
@@ -160,6 +160,7 @@ export const AGENT_API_ROUTES = {
   LIST_TAGS_PATTERN: `${API_ROOT}/agents/tags`,
   LIST_UPLOADS_PATTERN: `${API_ROOT}/agents/{agentId}/uploads`,
   GET_UPLOAD_FILE_PATTERN: `${API_ROOT}/agents/files/{fileId}/{fileName}`,
+  DELETE_UPLOAD_FILE_PATTERN: `${API_ROOT}/agents/files/{fileId}`,
 };
 
 export const ENROLLMENT_API_KEY_ROUTES = {

diff --git a/x-pack/plugins/fleet/common/openapi/bundled.json b/x-pack/plugins/fleet/common/openapi/bundled.json
@@ -2503,7 +2503,7 @@
         ]
       }
     },
-    "/agents/files@{fileId}@{fileName}": {
+    "/agents/files/{fileId}/{fileName}": {
       "parameters": [
         {
           "schema": {
@@ -2559,6 +2559,53 @@
         "operationId": "get-agent-upload-file"
       }
     },
+    "/agents/files/{fileId}": {
+      "parameters": [
+        {
+          "schema": {
+            "type": "string"
+          },
+          "name": "fileId",
+          "in": "path",
+          "required": true
+        }
+      ],
+      "delete": {
+        "summary": "Delete file uploaded by agent",
+        "tags": [
+          "Agents"
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "body": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "string"
+                        },
+                        "deleted": {
+                          "type": "boolean"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "$ref": "#/components/responses/error"
+          }
+        },
+        "operationId": "delete-agent-upload-file"
+      }
+    },
     "/agents/{agentId}/reassign": {
       "parameters": [
         {

diff --git a/x-pack/plugins/fleet/common/openapi/bundled.yaml b/x-pack/plugins/fleet/common/openapi/bundled.yaml
@@ -1581,7 +1581,7 @@ paths:
       operationId: agent-action-cancel
       parameters:
         - $ref: '#/components/parameters/kbn_xsrf'
-  /agents/files@{fileId}@{fileName}:
+  /agents/files/{fileId}/{fileName}:
     parameters:
       - schema:
           type: string
@@ -1616,6 +1616,35 @@ paths:
         '400':
           $ref: '#/components/responses/error'
       operationId: get-agent-upload-file
+  /agents/files/{fileId}:
+    parameters:
+      - schema:
+          type: string
+        name: fileId
+        in: path
+        required: true
+    delete:
+      summary: Delete file uploaded by agent
+      tags:
+        - Agents
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  body:
+                    type: object
+                    properties:
+                      id:
+                        type: string
+                      deleted:
+                        type: boolean
+        '400':
+          $ref: '#/components/responses/error'
+      operationId: delete-agent-upload-file
   /agents/{agentId}/reassign:
     parameters:
       - schema:

diff --git a/x-pack/plugins/fleet/common/openapi/entrypoint.yaml b/x-pack/plugins/fleet/common/openapi/entrypoint.yaml
@@ -77,8 +77,10 @@ paths:
     $ref: 'paths/agents@{agent_id}@actions.yaml'
   '/agents/{agentId}/actions/{actionId}/cancel':
     $ref: 'paths/agents@{agent_id}@actions@{action_id}@cancel.yaml'
-  '/agents/files@{fileId}@{fileName}':
+  '/agents/files/{fileId}/{fileName}':
     $ref: 'paths/agents@files@{file_id}@{file_name}.yaml'
+  '/agents/files/{fileId}':
+    $ref: 'paths/agents@files@{file_id}.yaml'
   '/agents/{agentId}/reassign':
     $ref: 'paths/agents@{agent_id}@reassign.yaml'
   '/agents/{agentId}/unenroll':

diff --git a/x-pack/plugins/fleet/common/openapi/paths/agents@files@{file_id}.yaml b/x-pack/plugins/fleet/common/openapi/paths/agents@files@{file_id}.yaml
@@ -0,0 +1,28 @@
+parameters:
+  - schema:
+      type: string
+    name: fileId
+    in: path
+    required: true
+delete:
+  summary: Delete file uploaded by agent
+  tags:
+    - Agents
+  responses:
+    '200':
+      description: OK
+      content:
+        application/json:
+          schema:
+            type: object
+            properties:
+              body:
+                type: object
+                properties:
+                  id:
+                    type: string
+                  deleted:
+                    type: boolean
+    '400':
+      $ref: ../components/responses/error.yaml
+  operationId: delete-agent-upload-file
diff --git a/x-pack/plugins/fleet/common/services/routes.ts b/x-pack/plugins/fleet/common/services/routes.ts
@@ -236,6 +236,8 @@ export const agentRouteService = {
       '{fileName}',
       fileName
     ),
+  getAgentFileDeletePath: (fileId: string) =>
+    AGENT_API_ROUTES.DELETE_UPLOAD_FILE_PATTERN.replace('{fileId}', fileId),
   getAgentsByActionsPath: () => AGENT_API_ROUTES.LIST_PATTERN,
 };
 

diff --git a/x-pack/plugins/fleet/common/types/models/agent.ts b/x-pack/plugins/fleet/common/types/models/agent.ts
@@ -187,7 +187,7 @@ export interface AgentDiagnostics {
   name: string;
   createTime: string;
   filePath: string;
-  status: 'READY' | 'AWAITING_UPLOAD' | 'DELETED' | 'IN_PROGRESS' | 'FAILED';
+  status: 'READY' | 'AWAITING_UPLOAD' | 'DELETED' | 'EXPIRED' | 'IN_PROGRESS' | 'FAILED';
   actionId: string;
   error?: string;
 }

diff --git a/x-pack/plugins/fleet/common/types/rest_spec/agent.ts b/x-pack/plugins/fleet/common/types/rest_spec/agent.ts
@@ -54,6 +54,11 @@ export interface GetAgentUploadsResponse {
   items: AgentDiagnostics[];
 }
 
+export interface DeleteAgentUploadResponse {
+  id: string;
+  deleted: boolean;
+}
+
 export interface PostNewAgentActionRequest {
   body: {
     action: Omit<NewAgentAction, 'agents'>;