Skip to content

[8.19] [AI4DSOC] Add possibility to disable Stack Rules, Rules Settings and Maintenance window based on Serverless Tier (#214586)#221608

Closed
tomsonpl wants to merge 3 commits intoelastic:8.19from
tomsonpl:backport/8.19/pr-214586
Closed

[8.19] [AI4DSOC] Add possibility to disable Stack Rules, Rules Settings and Maintenance window based on Serverless Tier (#214586)#221608
tomsonpl wants to merge 3 commits intoelastic:8.19from
tomsonpl:backport/8.19/pr-214586

Conversation

@tomsonpl
Copy link
Copy Markdown
Contributor

@tomsonpl tomsonpl commented May 27, 2025

Backport

This will backport the following commits from main to 8.19:

Questions ?

Please refer to the Backport tool documentation

@tomsonpl
[AI4DSOC] Add possibility to disable Stack Rules, Rules Settings and …
c968151 
…Maintenance window based on Serverless Tier (elastic#214586)

(cherry picked from commit 6356f2c)

# Conflicts:
#	.buildkite/ftr_platform_stateful_configs.yml
#	config/serverless.security.search_ai_lake.yml
#	src/platform/test/plugin_functional/test_suites/core_plugins/rendering.ts
#	x-pack/platform/plugins/shared/alerting/server/config.test.ts
#	x-pack/platform/plugins/shared/alerting/server/config.ts
#	x-pack/platform/plugins/shared/alerting/server/index.ts
#	x-pack/test/security_solution_cypress/cypress/e2e/ai4dsoc/capabilities/access.cy.ts
#	x-pack/test/security_solution_cypress/cypress/e2e/ai4dsoc/constants.ts
#	x-pack/test/security_solution_cypress/cypress/e2e/ai4dsoc/navigation/navigation.cy.ts
#	x-pack/test/security_solution_cypress/cypress/urls/navigation.ts
@tomsonpl tomsonpl requested a review from kibanamachine as a code owner May 27, 2025 11:20
@tomsonpl tomsonpl added the backport This PR is a backport of another PR label May 27, 2025
@tomsonpl tomsonpl enabled auto-merge (squash) May 27, 2025 11:20
@tomsonpl tomsonpl mentioned this pull request May 27, 2025
Merged
@tomsonpl tomsonpl disabled auto-merge May 27, 2025 11:20
@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented May 28, 2025

@mgiota @cnasikas I am confused by this conflict.

the change:

    contentManagement: pluginsStart.contentManagement,
    share: pluginsStart.share,

does not seem to be available in 8.19 branch, it raises as conflict here.

Any suggestion on how to move forward?

@mgiota
Copy link
Copy Markdown
Contributor

mgiota commented May 28, 2025 •
edited
Loading

@tomsonpl I introduced contentManagement: pluginsStart.contentManagement, in this commit, which is already on 8.19. Here's the backport PR that successfully made it into 8.19 branch.

Regarding share plugin this was added in this backport PR. So both plugins should be added. Check here, both plugins are already there, so you should keep both in your conflict resolution in the renderApp

Once you resolve the conflicts, I can manually test my feature

mgiota
mgiota reviewed May 28, 2025
View reviewed changes
x-pack/platform/plugins/shared/triggers_actions_ui/public/plugin.ts
isServerless: !!pluginsStart.serverless,
fieldFormats: pluginsStart.fieldFormats,
lens: pluginsStart.lens,
fieldsMetadata: pluginsStart.fieldsMetadata,
Copy link
Copy Markdown
Contributor

@mgiota mgiota May 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In your conflict resolution keep both plugins, since they were recently added to 8.19 branch

contentManagement: pluginsStart.contentManagement,
share: pluginsStart.share,

@elastic elastic deleted a comment from elasticmachine May 29, 2025
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 29, 2025

💚 Build Succeeded

Metrics [docs]

Public APIs missing comments

Total count of every public API that lacks a comment. Target amount is 0. Run node scripts/build_api_docs --plugin [yourplugin] --stats comments for more detailed information.

id before after diff
alerting 874 873 -1

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
alerting 87.0KB 87.0KB +72.0B
observability 1.3MB 1.3MB +61.0B
securitySolution 9.3MB 9.3MB +61.0B
triggersActionsUi 1.5MB 1.5MB +5.0B
total +199.0B

Page load bundle

Size of the bundles that are downloaded on every page load. Target size is below 100kb

id before after diff
alerting 25.0KB 25.0KB +1.0B
triggersActionsUi 110.9KB 111.0KB +88.0B
total +89.0B
Unknown metric groups

API count

id before after diff
alerting 908 907 -1

ESLint disabled line counts

id before after diff
@kbn/test-suites-xpack 751 757 +6

Total ESLint disabled count

id before after diff
@kbn/test-suites-xpack 774 780 +6

History

@tomsonpl tomsonpl requested a review from mgiota May 29, 2025 10:20
@tomsonpl
Copy link
Copy Markdown
Contributor Author

tomsonpl commented May 29, 2025

Closing this one, decided to backport everything in order, so this one has to wait. I hope it's gonna be good to merge tomorrow. Sorry!

@tomsonpl tomsonpl closed this May 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kibanamachine kibanamachine Awaiting requested review from kibanamachine kibanamachine is a code owner

@mgiota mgiota Awaiting requested review from mgiota

Assignees

No one assigned

Labels

backport This PR is a backport of another PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@tomsonpl @mgiota @elasticmachine