Skip to content

Commit

Permalink
Merge branch 'main' into 193452-dismiss-flyouts
Browse files Browse the repository at this point in the history
  • Loading branch information
jughosta committed Sep 27, 2024
2 parents e94d362 + 760455a commit 289fafa
Show file tree
Hide file tree
Showing 1,809 changed files with 48,929 additions and 13,182 deletions.
1 change: 1 addition & 0 deletions .buildkite/ftr_platform_stateful_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ enabled:
- x-pack/performance/journeys_e2e/promotion_tracking_dashboard.ts
- x-pack/performance/journeys_e2e/web_logs_dashboard.ts
- x-pack/performance/journeys_e2e/web_logs_dashboard_esql.ts
- x-pack/performance/journeys_e2e/web_logs_dashboard_dataview.ts
- x-pack/performance/journeys_e2e/data_stress_test_lens.ts
- x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts
- x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts
Expand Down
6 changes: 3 additions & 3 deletions .buildkite/scripts/steps/artifacts/docker_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@ steps:
env:
CONTAINER: "$KIBANA_IMAGE"
soft_fail: true
- label: ":argo: Update kibana image tag for kibana-controller using gpctl"
- label: ":serverless::argo: Run synthetics tests and update kibana image tag to ${GIT_ABBREV_COMMIT} for kibana-controller"
branches: main
trigger: gpctl-promote-with-e2e-tests
trigger: gpctl-promote-after-serverless-devenv-synthetics
build:
env:
SERVICE_COMMIT_HASH: "$GIT_ABBREV_COMMIT"
SERVICE: kibana
REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/kibana/dev.yaml
DRY_RUN: "${DRY_RUN:-false}"
GPCTL_PROMOTE_DRY_RUN: ${DRY_RUN:-false}
EOF

else
Expand Down
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ src/plugins/files_management @elastic/appex-sharedux
src/plugins/files @elastic/appex-sharedux
packages/kbn-find-used-node-modules @elastic/kibana-operations
x-pack/plugins/fleet @elastic/fleet
packages/kbn-flot-charts @elastic/kibana-operations
packages/kbn-flot-charts @elastic/kibana-presentation @elastic/stack-monitoring
x-pack/test/ui_capabilities/common/plugins/foo_plugin @elastic/kibana-security
packages/kbn-formatters @elastic/obs-ux-logs-team
src/plugins/ftr_apis @elastic/kibana-core
Expand Down Expand Up @@ -1690,6 +1690,7 @@ x-pack/test/security_solution_cypress/cypress/tasks/expandable_flyout @elastic/
/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine @elastic/security-detection-engine
/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/rule_gaps.ts @elastic/security-detection-engine
/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists @elastic/security-detection-engine
/x-pack/test/functional/es_archives/asset_criticality @elastic/security-detection-engine

## Security Threat Intelligence - Under Security Platform
/x-pack/plugins/security_solution/public/common/components/threat_match @elastic/security-detection-engine
Expand Down
32 changes: 18 additions & 14 deletions .github/workflows/on-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,30 @@ on:
types:
- closed
- labeled
- unlabeled

jobs:
on-merge:
name: 'Label and Backport'
runs-on: ubuntu-latest
if: |
github.event.pull_request.merged == true
&& (
(
github.event.action == 'labeled' && (
github.event.label.name == 'backport:prev-minor'
|| github.event.label.name == 'backport:prev-major'
|| github.event.label.name == 'backport:current-major'
|| github.event.label.name == 'backport:all-open'
|| github.event.label.name == 'backport:version'
|| github.event.label.name == 'auto-backport'
)
)
|| (github.event.action == 'closed')
)
github.event.pull_request.merged == true &&
(github.event.action == 'closed' ||
(github.event.action == 'labeled' &&
(github.event.label.name == 'backport:prev-minor' ||
github.event.label.name == 'backport:prev-major' ||
github.event.label.name == 'backport:current-major' ||
github.event.label.name == 'backport:all-open' ||
github.event.label.name == 'backport:version' ||
github.event.label.name == 'auto-backport')) ||
(github.event.action == 'unlabeled' &&
github.event.label.name == 'backport:skip' &&
(contains(github.event.pull_request.labels.*.name, 'backport:prev-minor') ||
contains(github.event.pull_request.labels.*.name, 'backport:prev-major') ||
contains(github.event.pull_request.labels.*.name, 'backport:current-major') ||
contains(github.event.pull_request.labels.*.name, 'backport:all-open') ||
contains(github.event.pull_request.labels.*.name, 'backport:version') ||
contains(github.event.pull_request.labels.*.name, 'auto-backport'))))
steps:
- name: Checkout Actions
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down
2 changes: 1 addition & 1 deletion api_docs/actions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
title: "actions"
image: https://source.unsplash.com/400x175/?github
description: API docs for the actions plugin
date: 2024-09-25
date: 2024-09-27
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
---
import actionsObj from './actions.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/advanced_settings.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
title: "advancedSettings"
image: https://source.unsplash.com/400x175/?github
description: API docs for the advancedSettings plugin
date: 2024-09-25
date: 2024-09-27
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
---
import advancedSettingsObj from './advanced_settings.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/ai_assistant_management_selection.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
title: "aiAssistantManagementSelection"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiAssistantManagementSelection plugin
date: 2024-09-25
date: 2024-09-27
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
---
import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';
Expand Down
2 changes: 1 addition & 1 deletion api_docs/aiops.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
title: "aiops"
image: https://source.unsplash.com/400x175/?github
description: API docs for the aiops plugin
date: 2024-09-25
date: 2024-09-27
tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
---
import aiopsObj from './aiops.devdocs.json';
Expand Down
Loading

0 comments on commit 289fafa

Please sign in to comment.