Skip to content

Commit ef64512

Browse files
Samiul-TheSoccerFankibanamachineelasticmachine
authored andcommitted
Rename workplace_ai project type to workplaceai (elastic#240180)
## Summary Renamed the `workplce_ai` project type to `workplaceai` following discussions with the CP Serverless team. The changes focus on updating the `project type`, `solution name`, and `plugin group` to ensure core Kibana functionality and tests continue to work. `File structure`, `plugin IDs`, `variables`, `links`, and `URLs` remain unchanged. ## Tested Tested locally and in QA. ### Checklist Check the PR satisfies following conditions. Reviewers should verify this PR satisfies this list as well. - [X] 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) - [X] Review the [backport guidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing) and apply applicable `backport:*` labels. --------- Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
1 parent 2ffac6f commit ef64512

155 files changed

Lines changed: 192 additions & 183 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.buildkite/ftr_workplace_ai_serverless_configs.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ disabled:
33
- x-pack/platform/test/serverless/functional/config.workplace_ai.base.ts
44

55
# Empty configs
6-
- x-pack/solutions/workplace_ai/test/serverless/functional/configs/config.feature_flags.ts
7-
- x-pack/solutions/workplace_ai/test/serverless/api_integration/configs/config.feature_flags.ts
6+
- x-pack/solutions/workplaceai/test/serverless/functional/configs/config.feature_flags.ts
7+
- x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.feature_flags.ts
88

99
defaultQueue: 'n2-4-spot'
1010
enabled:
11-
- x-pack/solutions/workplace_ai/test/serverless/api_integration/configs/config.ts
12-
- x-pack/platform/test/serverless/api_integration/configs/workplace_ai/config.group1.ts
13-
- x-pack/solutions/workplace_ai/test/serverless/functional/configs/config.ts
14-
- x-pack/platform/test/serverless/functional/configs/workplace_ai/config.config_compat_mode.ts
15-
- x-pack/platform/test/serverless/functional/configs/workplace_ai/config.group1.ts
11+
- x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.ts
12+
- x-pack/platform/test/serverless/api_integration/configs/workplaceai/config.group1.ts
13+
- x-pack/solutions/workplaceai/test/serverless/functional/configs/config.ts
14+
- x-pack/platform/test/serverless/functional/configs/workplaceai/config.config_compat_mode.ts
15+
- x-pack/platform/test/serverless/functional/configs/workplaceai/config.group1.ts

.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ export async function pickTestGroupRunOrder() {
254254
.filter(Boolean)
255255
: undefined;
256256
if (LIMIT_SOLUTIONS) {
257-
const validSolutions = ['observability', 'search', 'security', 'workplace_ai'];
257+
const validSolutions = ['observability', 'search', 'security', 'workplaceai'];
258258
const invalidSolutions = LIMIT_SOLUTIONS.filter((s) => !validSolutions.includes(s));
259259
if (invalidSolutions.length) throw new Error('Unsupported LIMIT_SOLUTIONS value');
260260
}

.buildkite/scripts/steps/artifacts/docker_image.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717
KIBANA_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless"
1818
export KIBANA_IMAGE="$KIBANA_BASE_IMAGE:$KIBANA_IMAGE_TAG"
1919

20-
KIBANA_WORKPLACE_AI_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless-workplace_ai"
20+
KIBANA_WORKPLACE_AI_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless-workplaceai"
2121
export KIBANA_WORKPLACE_AI_IMAGE="$KIBANA_WORKPLACE_AI_BASE_IMAGE:$KIBANA_IMAGE_TAG"
2222

2323
KIBANA_OBSERVABILITY_BASE_IMAGE="docker.elastic.co/kibana-ci/kibana-serverless-observability"
@@ -77,7 +77,7 @@ if [[ "$SKIP_BUILD" == "false" ]]; then
7777

7878
echo "--- Tag images"
7979
retag_image_with_architecture "$KIBANA_IMAGE" "kibana-serverless-$BASE_VERSION-docker-image"
80-
retag_image_with_architecture "$KIBANA_WORKPLACE_AI_IMAGE" "kibana-serverless-workplace_ai-$BASE_VERSION-docker-image"
80+
retag_image_with_architecture "$KIBANA_WORKPLACE_AI_IMAGE" "kibana-serverless-workplaceai-$BASE_VERSION-docker-image"
8181
retag_image_with_architecture "$KIBANA_OBSERVABILITY_IMAGE" "kibana-serverless-observability-$BASE_VERSION-docker-image"
8282
retag_image_with_architecture "$KIBANA_SEARCH_IMAGE" "kibana-serverless-search-$BASE_VERSION-docker-image"
8383
retag_image_with_architecture "$KIBANA_SECURITY_IMAGE" "kibana-serverless-security-$BASE_VERSION-docker-image"

.buildkite/scripts/steps/cloud/purge_projects.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { getKibanaDir } from '#pipeline-utils';
1414
async function getPrProjects() {
1515
// BOOKMARK - List of Kibana project types
1616
const match =
17-
/^(keep.?)?kibana-pr-([0-9]+)-(elasticsearch|security|observability|workplace_ai)(?:-(ai_soc|logs_essentials))?$/;
17+
/^(keep.?)?kibana-pr-([0-9]+)-(elasticsearch|security|observability|workplaceai)(?:-(ai_soc|logs_essentials))?$/;
1818
try {
1919
// BOOKMARK - List of Kibana project types
2020
return (
@@ -52,12 +52,12 @@ async function deleteProject({
5252
name,
5353
}: {
5454
// BOOKMARK - List of Kibana project types
55-
type: 'elasticsearch' | 'security' | 'observability' | 'workplace_ai';
55+
type: 'elasticsearch' | 'security' | 'observability' | 'workplaceai';
5656
id: number;
5757
name: string;
5858
}) {
5959
try {
60-
// TODO handle the new 'workplace_ai' project type, and ideally rename 'elasticsearch' to 'search'
60+
// TODO handle the new 'workplaceai' project type, and ideally rename 'elasticsearch' to 'search'
6161
await projectRequest.delete(`/api/v1/serverless/projects/${type}/${id}`);
6262

6363
execSync(`.buildkite/scripts/common/deployment_credentials.sh unset ${name}`, {
@@ -103,7 +103,7 @@ async function purgeProjects() {
103103
} else if (
104104
!Boolean(
105105
pullRequest.labels.filter((label: any) =>
106-
/^ci:project-deploy-(elasticsearch|observability|log_essentials|security|workplace_ai|ai4soc)$/.test(
106+
/^ci:project-deploy-(elasticsearch|observability|log_essentials|security|workplaceai|ai4soc)$/.test(
107107
label.name
108108
)
109109
).length

.buildkite/scripts/steps/serverless/deploy.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ deploy() {
2727
security)
2828
PROJECT_TYPE_LABEL='Security'
2929
;;
30-
workplace_ai)
30+
workplaceai)
3131
PROJECT_TYPE_LABEL='Workplace AI'
3232
;;
3333
esac
@@ -190,7 +190,7 @@ is_pr_with_label "ci:project-deploy-elasticsearch" && deploy "elasticsearch"
190190
is_pr_with_label "ci:project-deploy-security" && deploy "security"
191191
is_pr_with_label "ci:project-deploy-ai4soc" && deploy "security" "ai_soc"
192192
is_pr_with_label "ci:project-deploy-log_essentials" && deploy "observability" "logs_essentials"
193-
is_pr_with_label "ci:project-deploy-workplace_ai" && deploy "workplace_ai"
193+
is_pr_with_label "ci:project-deploy-workplace_ai" && deploy "workplaceai"
194194
if is_pr_with_label "ci:project-deploy-observability" ; then
195195
# Only deploy observability if the PR is targeting main
196196
if [[ "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" == "main" ]]; then

.github/CODEOWNERS

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,9 +1192,9 @@ x-pack/solutions/security/plugins/security_solution_serverless @elastic/security
11921192
x-pack/solutions/security/plugins/session_view @elastic/contextual-security-apps
11931193
x-pack/solutions/security/test
11941194
x-pack/solutions/security/test/plugin_functional/plugins/resolver_test @elastic/security-solution
1195-
x-pack/solutions/workplace_ai/plugins/serverless_workplace_ai @elastic/search-kibana @elastic/workchat-eng
1196-
x-pack/solutions/workplace_ai/plugins/workplace_ai_app @elastic/search-kibana @elastic/workchat-eng
1197-
x-pack/solutions/workplace_ai/test @elastic/workchat-eng
1195+
x-pack/solutions/workplaceai/plugins/serverless_workplace_ai @elastic/search-kibana @elastic/workchat-eng
1196+
x-pack/solutions/workplaceai/plugins/workplace_ai_app @elastic/search-kibana @elastic/workchat-eng
1197+
x-pack/solutions/workplaceai/test @elastic/workchat-eng
11981198
####
11991199
## Everything below this line overrides the default assignments for each package.
12001200
## Items lower in the file have higher precedence:
@@ -2076,7 +2076,7 @@ x-pack/platform/test/plugin_api_integration/test_suites/platform/ @elastic/kiban
20762076
/config/ @elastic/kibana-core
20772077
/config/serverless.yml @elastic/kibana-core @elastic/kibana-security
20782078
/config/serverless.*.yml @elastic/kibana-core @elastic/kibana-security
2079-
/config/serverless.workplace_ai.yml @elastic/kibana-core @elastic/kibana-security @elastic/search-kibana
2079+
/config/serverless.workplaceai.yml @elastic/kibana-core @elastic/kibana-security @elastic/search-kibana
20802080
/config/serverless.es.yml @elastic/kibana-core @elastic/kibana-security @elastic/search-kibana
20812081
/config/serverless.oblt.yml @elastic/kibana-core @elastic/kibana-security @elastic/observability-ui
20822082
/config/serverless.oblt.complete.yml @elastic/kibana-core @elastic/kibana-security @elastic/observability-ui
@@ -2282,9 +2282,9 @@ x-pack/platform/test/functional/page_objects/search_profiler_page.ts @elastic/se
22822282
/x-pack/solutions/search/test/functional_search/ @elastic/search-kibana
22832283
/x-pack/solutions/search/test/api_integration/apis/search_playground/ @elastic/search-kibana
22842284

2285-
# workplace_ai
2286-
/x-pack/solutions/workplace_ai/test/serverless/api_integration/configs/config.ts @elastic/search-kibana @elastic/appex-qa
2287-
/x-pack/solutions/workplace_ai/test/serverless/functional/configs/config.ts @elastic/search-kibana @elastic/appex-qa
2285+
# workplaceai
2286+
/x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.ts @elastic/search-kibana @elastic/appex-qa
2287+
/x-pack/solutions/workplaceai/test/serverless/functional/configs/config.ts @elastic/search-kibana @elastic/appex-qa
22882288
/x-pack/platform/test/onechat_api_integration @elastic/search-kibana @elastic/workchat-eng
22892289
/x-pack/platform/test/onechat_functional @elastic/search-kibana @elastic/workchat-eng
22902290
/x-pack/platform/test/functional/page_objects/onechat_page.ts @elastic/workchat-eng

.github/copilot-instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ yarn start --no-base-path # Disable basePath
277277
yarn es serverless --projectType=oblt # Observability
278278
yarn es serverless --projectType=security # Security
279279
yarn es serverless --projectType=es # Elasticsearch
280-
yarn es serverless --projectType=workplace_ai # Workplace AI
280+
yarn es serverless --projectType=workplaceai # Workplace AI
281281

282282
# 2. THEN: Start Kibana in MATCHING serverless mode
283283
# Kibana uses --serverless flag (NOT --projectType)
@@ -286,7 +286,7 @@ yarn serverless # Generic (uses config or defaults to 'es')
286286
yarn serverless-oblt # Matches ES projectType=oblt
287287
yarn serverless-security # Matches ES projectType=security
288288
yarn serverless-es # Matches ES projectType=es
289-
yarn serverless-workplace-ai # Matches ES projectType=workplace_ai
289+
yarn serverless-workplace-ai # Matches ES projectType=workplaceai
290290

291291
# Login: elastic_serverless / changeme (or system_indices_superuser / changeme)
292292
# Note: Cannot use basePath in serverless mode

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ webpackstats.json
6767
!/config/README.md
6868
!/config/serverless.yml
6969
!/config/serverless.es.yml
70-
!/config/serverless.workplace_ai.yml
70+
!/config/serverless.workplaceai.yml
7171
!/config/serverless.oblt.yml
7272
!/config/serverless.oblt.complete.yml
7373
!/config/serverless.oblt.logs_essentials.yml

config/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ define how Kibana will run in "serverless" modes. To start Kibana locally with
33
this configuration, pass `--serverless={mode}` or run `yarn serverless-{mode}`
44

55
[//]: # (BOOKMARK - List of Kibana project types)
6-
valid modes are currently: `es`, `oblt`, `security` and `workplace_ai`
6+
valid modes are currently: `es`, `oblt`, `security` and `workplaceai`
77

88
configuration is applied in the following order, later values override
99
1. serverless.yml (serverless configs go first)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Workplace AI Project Config
22

33
# Make sure the plugins belonging to this project type are loaded
4-
plugins.allowlistPluginGroups: ['platform', 'workplace_ai']
4+
plugins.allowlistPluginGroups: ['platform', 'workplaceai']
55

66
## Enable the Serverless Workplace AI plugin
77
xpack.serverless.workplaceAI.enabled: true
88

99
## Cloud settings
10-
xpack.cloud.serverless.project_type: workplace_ai
10+
xpack.cloud.serverless.project_type: workplaceai
1111

1212
## Set the home route
1313
uiSettings.overrides.defaultRoute: /app/workplace_ai

0 commit comments

Comments
 (0)