Skip to content

Commit

Permalink
Merge branch 'main' into data-usage-remove-ca-config
Browse files Browse the repository at this point in the history
  • Loading branch information
neptunian authored Nov 20, 2024
2 parents cbba4cb + 1378c10 commit ea00f37
Show file tree
Hide file tree
Showing 129 changed files with 3,813 additions and 5,219 deletions.
29 changes: 21 additions & 8 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,7 @@ src/plugins/discover/public/context_awareness/profile_providers/security @elasti
/x-pack/test/screenshot_creation @elastic/platform-docs

# Visualizations
/test/functional/page_objects/unified_search_page.ts @elastic/kibana-visualizations # Assigned per https://github.com/elastic/kibana/pull/200132#discussion_r1847188168
/test/functional/apps/getting_started/*.ts @elastic/kibana-visualizations # Assigned per https://github.com/elastic/kibana/pull/199767#discussion_r1840485031
/x-pack/test/upgrade/apps/graph @elastic/kibana-visualizations
/x-pack/test/functional/page_objects/log_wrapper.ts @elastic/kibana-visualizations # Assigned per https://github.com/elastic/kibana/pull/36437
Expand Down Expand Up @@ -1204,9 +1205,11 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql
### Observability Plugins

# Observability AI Assistant
x-pack/test/observability_ai_assistant_api_integration @elastic/obs-ai-assistant
x-pack/test/observability_ai_assistant_functional @elastic/obs-ai-assistant
x-pack/test_serverless/**/test_suites/observability/ai_assistant @elastic/obs-ai-assistant
/x-pack/test_serverless/api_integration/test_suites/common/data_usage @elastic/obs-ai-assistant
/x-pack/test_serverless/functional/test_suites/common/data_usage @elastic/obs-ai-assistant @elastic/kibana-security
/x-pack/test/observability_ai_assistant_api_integration @elastic/obs-ai-assistant
/x-pack/test/observability_ai_assistant_functional @elastic/obs-ai-assistant
/x-pack/test_serverless/**/test_suites/observability/ai_assistant @elastic/obs-ai-assistant

# Infra Obs
## This plugin mostly contains the codebase for the infra services, but also includes some code for the Logs UI app.
Expand All @@ -1219,9 +1222,12 @@ x-pack/test_serverless/**/test_suites/observability/ai_assistant @elastic/obs-ai

## infra/{common,docs,public,server}/{sub-folders}/ -> @elastic/obs-ux-infra_services-team
# obs-ux-infra_services-team
/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/ @elastic/obs-ux-infra_services-team
/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/ @elastic/obs-ux-infra_services-team
/x-pack/test/functional/page_objects/asset_details.ts @elastic/obs-ux-infra_services-team # Assigned per https://github.com/elastic/kibana/pull/200157/files/c83fae62151fe634342c498aca69b686b739fe45#r1842202022
/x-pack/test/functional/page_objects/infra_* @elastic/obs-ux-infra_services-team
/x-pack/test/functional/es_archives/infra @elastic/obs-ux-infra_services-team
/x-pack/test_serverless/**/test_suites/observability/infra/ @elastic/obs-ux-infra_services-team
/test/common/plugins/otel_metrics @elastic/obs-ux-infra_services-team
/x-pack/plugins/observability_solution/infra/common @elastic/obs-ux-infra_services-team
/x-pack/plugins/observability_solution/infra/docs @elastic/obs-ux-infra_services-team
Expand All @@ -1246,6 +1252,7 @@ x-pack/test_serverless/**/test_suites/observability/ai_assistant @elastic/obs-ai
/x-pack/test/api_integration/services/infraops_source_configuration.ts @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team # Assigned per https://github.com/elastic/kibana/pull/34916

## Logs UI code exceptions -> @elastic/obs-ux-logs-team
/x-pack/test/api_integration/deployment_agnostic/apis/observability/data_quality/ @elastic/obs-ux-logs-team
/x-pack/test/upgrade/apps/logs @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/page_objects/svl_oblt_onboarding_stream_log_file.ts @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/page_objects/svl_oblt_onboarding_page.ts @elastic/obs-ux-logs-team
Expand Down Expand Up @@ -1292,10 +1299,10 @@ x-pack/test_serverless/**/test_suites/observability/ai_assistant @elastic/obs-ai
/x-pack/test_serverless/**/test_suites/observability/custom_threshold_rule/ @elastic/obs-ux-management-team
/x-pack/test_serverless/**/test_suites/observability/slos/ @elastic/obs-ux-management-team
/x-pack/test_serverless/api_integration/test_suites/observability/es_query_rule @elastic/obs-ux-management-team
/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/burn_rate_rule @elastic/obs-ux-management-team
/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/ @elastic/obs-ux-management-team
/x-pack/test/api_integration/deployment_agnostic/apis/observability/slo/ @elastic/obs-ux-management-team
/x-pack/test/api_integration/deployment_agnostic/services/alerting_api @elastic/obs-ux-management-team
/x-pack/test/api_integration/deployment_agnostic/services/slo_api @elastic/obs-ux-management-team
/x-pack/test_serverless/**/test_suites/observability/infra/ @elastic/obs-ux-infra_services-team

# Elastic Stack Monitoring
/x-pack/test/monitoring_api_integration @elastic/stack-monitoring
Expand Down Expand Up @@ -1614,9 +1621,10 @@ x-pack/test_serverless/**/test_suites/observability/ai_assistant @elastic/obs-ai
/x-pack/test_serverless/functional/test_suites/common/home_page/ @elastic/appex-qa
/x-pack/test_serverless/**/services/ @elastic/appex-qa
/packages/kbn-es/src/stateful_resources/roles.yml @elastic/appex-qa
x-pack/test/api_integration/deployment_agnostic/default_configs/ @elastic/appex-qa
x-pack/test/api_integration/deployment_agnostic/services/ @elastic/appex-qa
x-pack/test/**/deployment_agnostic/ @elastic/appex-qa #temporarily to monitor tests migration
/x-pack/test/api_integration/deployment_agnostic/ftr_provider_context.d.ts @elastic/appex-qa
/x-pack/test/api_integration/deployment_agnostic/README.md @elastic/appex-qa
/x-pack/test/api_integration/deployment_agnostic/*configs/ @elastic/appex-qa
/x-pack/test/api_integration/deployment_agnostic/services/ @elastic/appex-qa

# Core
/test/api_integration/apis/general/*.js @elastic/kibana-core # Assigned per https://github.com/elastic/kibana/pull/199795/files/894a8ede3f9d0398c5af56bf5a82654a9bc0610b#r1846691639
Expand Down Expand Up @@ -1689,6 +1697,8 @@ x-pack/test/**/deployment_agnostic/ @elastic/appex-qa #temporarily to monitor te
/x-pack/test/api_integration/apis/status @elastic/kibana-core
/x-pack/test/api_integration/apis/stats @elastic/kibana-core
/x-pack/test/api_integration/apis/kibana/stats @elastic/kibana-core
/x-pack/test/api_integration/deployment_agnostic/apis/core/ @elastic/kibana-core
/x-pack/test/api_integration/deployment_agnostic/apis/saved_objects_management/ @elastic/kibana-core
/x-pack/test_serverless/functional/test_suites/security/config.saved_objects_management.ts @elastic/kibana-core
/config/ @elastic/kibana-core
/config/serverless.yml @elastic/kibana-core @elastic/kibana-security
Expand Down Expand Up @@ -1915,6 +1925,7 @@ x-pack/test/api_integration/apis/management/index_management/inference_endpoints
/test/functional/apps/saved_objects_management @elastic/kibana-management
/test/functional/apps/console/*.ts @elastic/kibana-management
/test/api_integration/apis/console/*.ts @elastic/kibana-management
/x-pack/test/api_integration/deployment_agnostic/apis/console/ @elastic/kibana-management
/test/accessibility/apps/management.ts @elastic/kibana-management
/test/accessibility/apps/console.ts @elastic/kibana-management
/x-pack/test/api_integration/services/index_management.ts @elastic/kibana-management
Expand All @@ -1941,6 +1952,8 @@ x-pack/test/api_integration/apis/management/index_management/inference_endpoints
/x-pack/test_serverless/functional/test_suites/common/dev_tools/ @elastic/kibana-management
/x-pack/test_serverless/**/test_suites/common/grok_debugger/ @elastic/kibana-management
/x-pack/test/api_integration/apis/management/ @elastic/kibana-management
/x-pack/test/api_integration/deployment_agnostic/apis/management/ @elastic/kibana-management
/x-pack/test/api_integration/deployment_agnostic/apis/painless_lab/ @elastic/kibana-management
/x-pack/test/functional/apps/rollup_job/ @elastic/kibana-management
/x-pack/test/api_integration/apis/grok_debugger @elastic/kibana-management
/x-pack/test/accessibility/apps/group1/advanced_settings.ts @elastic/kibana-management
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Reviewers should verify this PR satisfies this list as well.
- [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)
- [ ] This was checked for breaking HTTP API changes, and any breaking changes have been approved by the breaking-change committee. The `release_note:breaking` label should be applied in these situations.
- [ ] [Flaky Test Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed
- [ ] The PR description includes the appropriate Release Notes section, and the correct `release_node:*` label is applied per the [guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
- [ ] The PR description includes the appropriate Release Notes section, and the correct `release_note:*` label is applied per the [guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)

### Identify risks

Expand Down
22 changes: 22 additions & 0 deletions docs/CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

Review important information about the {kib} 8.x releases.

* <<release-notes-8.16.1>>
* <<release-notes-8.16.0>>
* <<release-notes-8.15.4>>
* <<release-notes-8.15.3>>
Expand Down Expand Up @@ -80,6 +81,27 @@ Review important information about the {kib} 8.x releases.
include::upgrade-notes.asciidoc[]


[[release-notes-8.16.1]]
== {kib} 8.16.1

The 8.16.1 release includes the following bug fixes.

[float]
[[fixes-v8.16.1]]
=== Bug fixes
Dashboards & Visualizations::
* Fixes an issue preventing a custom panel title from being saved correctly ({kibana-pull}200548[#200548]).
Elastic Observability solution::
* Changes the order of the errors shown on Infrastructure applications to be more relevant ({kibana-pull}200531[#200531]).
* Fixes the summary calculation for a calendar-aligned and occurrences-based SLO ({kibana-pull}199873[#199873]).
* Fixes the `kustomize` command ({kibana-pull}199758[#199758]).
Elastic Security solution::
For the Elastic Security 8.16.1 release information, refer to {security-guide}/release-notes.html[_Elastic Security Solution Release Notes_].
Platform::
* Fixes an issue with duplicate references to objects when copying saved objects to other spaces ({kibana-pull}200053[#200053]).
* Fixes button colors in the "Share data view to spaces" flyout ({kibana-pull}196004[#196004]).


[[release-notes-8.16.0]]
== {kib} 8.16.0

Expand Down
6 changes: 1 addition & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@
"build": "node scripts/build --all-platforms",
"build:apidocs": "node scripts/build_api_docs",
"checkLicenses": "node scripts/check_licenses --dev",
"cover:functional:merge": "nyc report --temp-dir target/kibana-coverage/functional --report-dir target/coverage/report/functional --reporter=json-summary",
"cover:report": "nyc report --temp-dir target/kibana-coverage/functional --report-dir target/coverage/report --reporter=lcov && open ./target/coverage/report/lcov-report/index.html",
"debug": "node --nolazy --inspect scripts/kibana --dev",
"debug-break": "node --nolazy --inspect-brk scripts/kibana --dev",
"dev-docs": "scripts/dev_docs.sh",
Expand Down Expand Up @@ -126,7 +124,7 @@
"@elastic/numeral": "^2.5.1",
"@elastic/react-search-ui": "^1.20.2",
"@elastic/react-search-ui-views": "^1.20.2",
"@elastic/request-converter": "^8.15.4",
"@elastic/request-converter": "^8.16.1",
"@elastic/request-crypto": "^2.0.3",
"@elastic/search-ui": "^1.20.2",
"@elastic/search-ui-app-search-connector": "^1.20.2",
Expand Down Expand Up @@ -1346,8 +1344,6 @@
"@emotion/babel-preset-css-prop": "^11.11.0",
"@emotion/jest": "^11.11.0",
"@frsource/cypress-plugin-visual-regression-diff": "^3.3.10",
"@istanbuljs/nyc-config-typescript": "^1.0.2",
"@istanbuljs/schema": "^0.1.2",
"@jest/console": "^29.7.0",
"@jest/reporters": "^29.7.0",
"@jest/transform": "^29.6.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import { RuleActionParams } from '@kbn/alerting-types';
import { isEmpty, omit } from 'lodash';
import { isEmpty, omit, isEqual } from 'lodash';
import { RuleFormActionsErrors, RuleFormParamsErrors, RuleUiAction } from '../../common';
import { RuleFormData, RuleFormState } from '../types';
import { validateRuleBase, validateRuleParams } from '../validation';
Expand Down Expand Up @@ -119,6 +119,7 @@ const getUpdateWithValidation =
selectedRuleTypeModel,
multiConsumerSelection,
selectedRuleType,
formData: originalFormData,
} = ruleFormState;

const formData = updater();
Expand Down Expand Up @@ -149,12 +150,14 @@ const getUpdateWithValidation =
}
}

const touched = !isEqual(originalFormData, formData);

return {
...ruleFormState,
formData,
baseErrors,
paramsErrors,
touched: true,
touched,
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,62 @@ describe('rulePage', () => {
fireEvent.click(screen.getByTestId('rulePageReturnButton'));
expect(onCancel).toHaveBeenCalled();
});

test('should display discard changes modal only if changes are made in the form', () => {
useRuleFormState.mockReturnValue({
plugins: {
application: {
navigateToUrl,
capabilities: {
actions: {
show: true,
save: true,
execute: true,
},
},
},
},
baseErrors: {},
paramsErrors: {},
touched: true,
formData: formDataMock,
connectors: [],
connectorTypes: [],
aadTemplateFields: [],
});

render(<RulePage onCancel={onCancel} onSave={onSave} />);

fireEvent.click(screen.getByTestId('rulePageFooterCancelButton'));
expect(screen.getByTestId('ruleFormCancelModal')).toBeInTheDocument();
});

test('should not display discard changes modal id no changes are made in the form', () => {
useRuleFormState.mockReturnValue({
plugins: {
application: {
navigateToUrl,
capabilities: {
actions: {
show: true,
save: true,
execute: true,
},
},
},
},
baseErrors: {},
paramsErrors: {},
touched: false,
formData: formDataMock,
connectors: [],
connectorTypes: [],
aadTemplateFields: [],
});

render(<RulePage onCancel={onCancel} onSave={onSave} />);

fireEvent.click(screen.getByTestId('rulePageFooterCancelButton'));
expect(screen.queryByTestId('ruleFormCancelModal')).not.toBeInTheDocument();
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ export const RulePage = (props: RulePageProps) => {
<EuiConfirmModal
onCancel={() => setIsCancelModalOpen(false)}
onConfirm={onCancel}
data-test-subj="ruleFormCancelModal"
buttonColor="danger"
defaultFocusedButton="confirm"
title={RULE_FORM_CANCEL_MODAL_TITLE}
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-babel-preset/styled_components_files.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = {
USES_STYLED_COMPONENTS: [
/packages[\/\\]kbn-ui-shared-deps-(npm|src)[\/\\]/,
/src[\/\\]plugins[\/\\](kibana_react)[\/\\]/,
/x-pack[\/\\]plugins[\/\\](observability_solution\/apm|beats_management|fleet|observability_solution\/infra|lists|observability_solution\/observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|observability_solution\/slo|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|observability_solution\/uptime)[\/\\]/,
/x-pack[\/\\]plugins[\/\\](observability_solution\/apm|beats_management|fleet|observability_solution\/infra|lists|observability_solution\/observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|observability_solution\/uptime)[\/\\]/,
/x-pack[\/\\]test[\/\\]plugin_functional[\/\\]plugins[\/\\]resolver_test[\/\\]/,
/x-pack[\/\\]packages[\/\\]elastic_assistant[\/\\]/,
/x-pack[\/\\]packages[\/\\]security-solution[\/\\]ecs_data_quality_dashboard[\/\\]/,
Expand Down
Loading

0 comments on commit ea00f37

Please sign in to comment.