Skip to content

Commit

Permalink
Merge branch 'main' into assign-visualizations
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Nov 14, 2024
2 parents b039a6d + f3e7735 commit 66e71b6
Show file tree
Hide file tree
Showing 231 changed files with 5,322 additions and 3,718 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipelines/on_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ steps:
machineType: n2-standard-2
preemptible: true
timeout_in_minutes: 60
continue_on_failure: true
soft_fail: true
retry:
automatic:
- exit_status: '-1'
Expand Down
90 changes: 89 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,90 @@ x-pack/test_serverless/**/test_suites/observability/ai_assistant @elastic/obs-ai
/.eslintrc.js @elastic/kibana-operations
/.eslintignore @elastic/kibana-operations

# Appex QA
# QA - Appex QA
/test/server_integration/services/index.js @elastic/appex-qa
/x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js @elastic/appex-qa
/x-pack/test/stack_functional_integration/configs/consume_state.js @elastic/appex-qa
/x-pack/test/functional/services/remote_es/remote_es_archiver.ts @elastic/appex-qa
/test/functional/services/remote_es/remote_es_archiver.ts @elastic/appex-qa
/x-pack/test/kibana.jsonc @elastic/appex-qa
/x-pack/test/functional_with_es_ssl/ftr_provider_context.d.ts @elastic/appex-qa
/x-pack/test/stack_functional_integration/apps @elastic/appex-qa
/x-pack/test/plugin_functional/config.ts @elastic/appex-qa
/x-pack/test/plugin_functional/ftr_provider_context.d.ts @elastic/appex-qa
/x-pack/test/plugin_functional/page_objects.ts @elastic/appex-qa
/x-pack/test/upgrade/services/index.ts @elastic/appex-qa
/x-pack/test/upgrade/ftr_provider_context.d.ts @elastic/appex-qa
/x-pack/test/upgrade/config.ts @elastic/appex-qa
/x-pack/test/functional_basic/ftr_provider_context.d.ts @elastic/appex-qa
/x-pack/test/functional/services/remote_es/remote_es.ts @elastic/appex-qa
/x-pack/test/functional/services/random.js @elastic/appex-qa
/x-pack/test/functional/services/index.ts @elastic/appex-qa
/x-pack/test/functional/page_objects/index.ts @elastic/appex-qa
/x-pack/test/functional/ftr_provider_context.ts @elastic/appex-qa
/x-pack/test/functional/README.md @elastic/appex-qa
/x-pack/test/examples/config.ts @elastic/appex-qa
/x-pack/test/common/services/index.ts @elastic/appex-qa
/x-pack/test/common/services/bsearch_secure.ts @elastic/appex-qa
/x-pack/test/common/ftr_provider_context.ts @elastic/appex-qa
/x-pack/test/api_integration_basic/ftr_provider_context.d.ts @elastic/appex-qa
/x-pack/test/api_integration_basic/config.ts @elastic/appex-qa
/x-pack/test/api_integration_basic/apis/index.ts @elastic/appex-qa
/x-pack/test/api_integration/services/index.ts @elastic/appex-qa
/x-pack/test/api_integration/services/es_supertest_without_auth.js @elastic/appex-qa
/x-pack/test/api_integration/config.ts @elastic/appex-qa
/x-pack/test/api_integration/apis/kibana/config.ts @elastic/appex-qa
/x-pack/test/tsconfig.json @elastic/appex-qa
/x-pack/test/load @elastic/appex-qa
/test/tsconfig.json @elastic/appex-qa
/test/plugin_functional/services/index.ts @elastic/appex-qa
/test/plugin_functional/README.md @elastic/appex-qa
/test/plugin_functional/config.ts @elastic/appex-qa
/test/kibana.jsonc @elastic/appex-qa
/test/harden @elastic/appex-qa
/test/functional/services/supertest.ts @elastic/appex-qa
/test/functional/services/remote_es/remote_es.ts @elastic/appex-qa
/test/functional/services/query_bar.ts @elastic/appex-qa
/test/functional/services/menu_toggle.ts @elastic/appex-qa
/test/functional/services/listing_table.ts @elastic/appex-qa
/test/common/fixtures/plugins/coverage @elastic/appex-qa
/test/functional/services/index.ts @elastic/appex-qa
/test/functional/services/global_nav.ts @elastic/appex-qa
/test/functional/services/flyout.ts @elastic/appex-qa
/test/functional/services/filter_bar.ts @elastic/appex-qa
/test/functional/services/field_editor.ts @elastic/appex-qa
/test/functional/services/embedding.ts @elastic/appex-qa
/test/functional/services/doc_table.ts @elastic/appex-qa
/test/functional/services/data_grid.ts @elastic/appex-qa
/test/functional/services/combo_box.ts @elastic/appex-qa
/test/functional/page_objects/unified_field_list.ts @elastic/appex-qa
/test/functional/page_objects/time_picker.ts @elastic/appex-qa
/test/functional/page_objects/index.ts @elastic/appex-qa
/test/functional/page_objects/header_page.ts @elastic/appex-qa
/test/functional/page_objects/error_page.ts @elastic/appex-qa
/test/functional/page_objects/common_page.ts @elastic/appex-qa
/test/functional/jest.config.js @elastic/appex-qa
/test/functional/ftr_provider_context.ts @elastic/appex-qa
/test/functional/fixtures/es_archiver/README.md @elastic/appex-qa
/test/functional/firefox/config.base.ts @elastic/appex-qa
/test/functional/config.* @elastic/appex-qa
/test/functional/README.md @elastic/appex-qa
/test/examples/config.js @elastic/appex-qa
/test/examples/README.md @elastic/appex-qa
/test/common/services/index.ts @elastic/appex-qa
/test/common/fixtures/plugins/coverage/*.ts @elastic/appex-qa
/test/common/config.js @elastic/appex-qa
/test/api_integration/services/index.ts @elastic/appex-qa
/test/api_integration/jest.config.js @elastic/appex-qa
/test/api_integration/ftr_provider_context.d.ts @elastic/appex-qa
/test/api_integration/config.js @elastic/appex-qa
/test/api_integration/apis/index.ts @elastic/appex-qa
/test/accessibility/services/index.ts @elastic/appex-qa
/test/accessibility/services/a11y @elastic/appex-qa
/test/accessibility/page_objects.ts @elastic/appex-qa
/test/accessibility/ftr_provider_context.ts @elastic/appex-qa
/test/accessibility/config.ts @elastic/appex-qa
/test/accessibility/apps/index.ts @elastic/appex-qa
/x-pack/test/scalability @elastic/appex-qa
/src/dev/performance @elastic/appex-qa
/x-pack/test/functional/config.*.* @elastic/appex-qa
Expand Down Expand Up @@ -1593,6 +1676,11 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
/x-pack/test/functional/es_archives/cases/signals/hosts_users @elastic/response-ops

# Enterprise Search
# search
/x-pack/test/functional_solution_sidenav/tests/search_sidenav.ts @elastic/search-kibana
/x-pack/test/functional/services/search_sessions.ts @elastic/search-kibana
/x-pack/test/functional/page_objects/search_* @elastic/search-kibana
/x-pack/test/functional/apps/search_playground @elastic/search-kibana
/x-pack/test_serverless/functional/page_objects/svl_ingest_pipelines.ts @elastic/search-kibana
/x-pack/test/functional/apps/dev_tools/embedded_console.ts @elastic/search-kibana
/x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts @elastic/search-kibana
Expand Down
46 changes: 45 additions & 1 deletion oas_docs/bundle.json
Original file line number Diff line number Diff line change
Expand Up @@ -16951,6 +16951,49 @@
},
"type": "array"
},
"list": {
"deprecated": true,
"items": {
"additionalProperties": false,
"properties": {
"active": {
"description": "When false, the enrollment API key is revoked and cannot be used for enrolling Elastic Agents.",
"type": "boolean"
},
"api_key": {
"description": "The enrollment API key (token) used for enrolling Elastic Agents.",
"type": "string"
},
"api_key_id": {
"description": "The ID of the API key in the Security API.",
"type": "string"
},
"created_at": {
"type": "string"
},
"id": {
"type": "string"
},
"name": {
"description": "The name of the enrollment API key.",
"type": "string"
},
"policy_id": {
"description": "The ID of the agent policy the Elastic Agent will be enrolled in.",
"type": "string"
}
},
"required": [
"id",
"api_key_id",
"api_key",
"active",
"created_at"
],
"type": "object"
},
"type": "array"
},
"page": {
"type": "number"
},
Expand All @@ -16965,7 +17008,8 @@
"items",
"total",
"page",
"perPage"
"perPage",
"list"
],
"type": "object"
}
Expand Down
46 changes: 45 additions & 1 deletion oas_docs/bundle.serverless.json
Original file line number Diff line number Diff line change
Expand Up @@ -16951,6 +16951,49 @@
},
"type": "array"
},
"list": {
"deprecated": true,
"items": {
"additionalProperties": false,
"properties": {
"active": {
"description": "When false, the enrollment API key is revoked and cannot be used for enrolling Elastic Agents.",
"type": "boolean"
},
"api_key": {
"description": "The enrollment API key (token) used for enrolling Elastic Agents.",
"type": "string"
},
"api_key_id": {
"description": "The ID of the API key in the Security API.",
"type": "string"
},
"created_at": {
"type": "string"
},
"id": {
"type": "string"
},
"name": {
"description": "The name of the enrollment API key.",
"type": "string"
},
"policy_id": {
"description": "The ID of the agent policy the Elastic Agent will be enrolled in.",
"type": "string"
}
},
"required": [
"id",
"api_key_id",
"api_key",
"active",
"created_at"
],
"type": "object"
},
"type": "array"
},
"page": {
"type": "number"
},
Expand All @@ -16965,7 +17008,8 @@
"items",
"total",
"page",
"perPage"
"perPage",
"list"
],
"type": "object"
}
Expand Down
33 changes: 33 additions & 0 deletions oas_docs/output/kibana.serverless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16686,6 +16686,38 @@ paths:
- active
- created_at
type: array
list:
deprecated: true
items:
additionalProperties: false
type: object
properties:
active:
description: When false, the enrollment API key is revoked and cannot be used for enrolling Elastic Agents.
type: boolean
api_key:
description: The enrollment API key (token) used for enrolling Elastic Agents.
type: string
api_key_id:
description: The ID of the API key in the Security API.
type: string
created_at:
type: string
id:
type: string
name:
description: The name of the enrollment API key.
type: string
policy_id:
description: The ID of the agent policy the Elastic Agent will be enrolled in.
type: string
required:
- id
- api_key_id
- api_key
- active
- created_at
type: array
page:
type: number
perPage:
Expand All @@ -16697,6 +16729,7 @@ paths:
- total
- page
- perPage
- list
'400':
content:
application/json; Elastic-Api-Version=2023-10-31:
Expand Down
33 changes: 33 additions & 0 deletions oas_docs/output/kibana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19470,6 +19470,38 @@ paths:
- active
- created_at
type: array
list:
deprecated: true
items:
additionalProperties: false
type: object
properties:
active:
description: When false, the enrollment API key is revoked and cannot be used for enrolling Elastic Agents.
type: boolean
api_key:
description: The enrollment API key (token) used for enrolling Elastic Agents.
type: string
api_key_id:
description: The ID of the API key in the Security API.
type: string
created_at:
type: string
id:
type: string
name:
description: The name of the enrollment API key.
type: string
policy_id:
description: The ID of the agent policy the Elastic Agent will be enrolled in.
type: string
required:
- id
- api_key_id
- api_key
- active
- created_at
type: array
page:
type: number
perPage:
Expand All @@ -19481,6 +19513,7 @@ paths:
- total
- page
- perPage
- list
'400':
content:
application/json; Elastic-Api-Version=2023-10-31:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ import { themeServiceMock } from '@kbn/core-theme-browser-mocks';
import { overlayServiceMock } from '@kbn/core-overlays-browser-mocks';
import { customBrandingServiceMock } from '@kbn/core-custom-branding-browser-mocks';
import { analyticsServiceMock } from '@kbn/core-analytics-browser-mocks';
import { MockLifecycle } from './test_helpers/test_types';
import type { MockLifecycle } from './test_helpers/test_types';
import { ApplicationService } from './application_service';
import {
App,
AppDeepLink,
type App,
type AppDeepLink,
AppStatus,
AppUpdater,
PublicAppInfo,
type AppUpdater,
type PublicAppInfo,
} from '@kbn/core-application-browser';
import { act } from 'react-dom/test-utils';
import { DEFAULT_APP_VISIBILITY } from './utils';
Expand Down Expand Up @@ -618,6 +618,26 @@ describe('#start()', () => {
});
});

describe('isAppRegistered', () => {
let isAppRegistered: any;
beforeEach(async () => {
const { register } = service.setup(setupDeps);
register(Symbol(), createApp({ id: 'one_app' }));
register(Symbol(), createApp({ id: 'another_app', appRoute: '/custom/path' }));

const start = await service.start(startDeps);
isAppRegistered = start.isAppRegistered;
});

it('returns false for unregistered apps', () => {
expect(isAppRegistered('oneApp')).toEqual(false);
});

it('returns true for registered apps', () => {
expect(isAppRegistered('another_app')).toEqual(true);
});
});

describe('getUrlForApp', () => {
it('creates URL for unregistered appId', async () => {
service.setup(setupDeps);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,9 @@ export class ApplicationService {
takeUntil(this.stop$)
),
history: this.history!,
isAppRegistered: (appId: string): boolean => {
return applications$.value.get(appId) !== undefined;
},
getUrlForApp: (
appId,
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ const createStartContractMock = (): jest.Mocked<ApplicationStart> => {
navigateToApp: jest.fn(),
navigateToUrl: jest.fn(),
getUrlForApp: jest.fn(),
isAppRegistered: jest.fn(),
};
};

Expand Down Expand Up @@ -92,6 +93,7 @@ const createInternalStartContractMock = (
currentActionMenu$: new BehaviorSubject<MountPoint | undefined>(undefined),
getComponent: jest.fn(),
getUrlForApp: jest.fn(),
isAppRegistered: jest.fn(),
navigateToApp: jest.fn().mockImplementation((appId) => currentAppId$.next(appId)),
navigateToUrl: jest.fn(),
history: createHistoryMock(),
Expand Down
Loading

0 comments on commit 66e71b6

Please sign in to comment.