Skip to content

Commit 2934a9a

Browse files
kibanamachinekibanamachine
authored
Merge branch 'main' into cases-obs-rule-link
2 parents 953f058 + ce094b9 commit 2934a9a

434 files changed

Lines changed: 8381 additions & 3337 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/scripts/steps/cloud/purge.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ for (const deployment of prDeployments) {
2626
const lastCommit = pullRequest.commits.slice(-1)[0];
2727
const lastCommitTimestamp = new Date(lastCommit.committedDate).getTime() / 1000;
2828

29-
if (pullRequest.state !== 'open') {
29+
if (pullRequest.state !== 'OPEN') {
3030
console.log(`Pull Request #${prNumber} is no longer open, will delete associated deployment`);
3131
deploymentsToPurge.push(deployment);
3232
} else if (!pullRequest.labels.filter((label) => label.name === 'ci:deploy-cloud')) {
@@ -50,6 +50,9 @@ for (const deployment of deploymentsToPurge) {
5050
console.log(`Scheduling deployment for deletion: ${deployment.name} / ${deployment.id}`);
5151
try {
5252
execSync(`ecctl deployment shutdown --force '${deployment.id}'`, { stdio: 'inherit' });
53+
execSync(`vault delete secret/kibana-issues/dev/cloud-deploy/${deployment.name}`, {
54+
stdio: 'inherit',
55+
});
5356
} catch (ex) {
5457
console.error(ex.toString());
5558
}

‎.buildkite/scripts/steps/code_coverage/oss_cigroup.sh‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,19 @@ export CODE_COVERAGE=1
2020
echo "--- OSS CI Group $CI_GROUP"
2121
echo " -> Running Functional tests with code coverage"
2222

23-
node scripts/functional_tests \
23+
NODE_OPTIONS=--max_old_space_size=14336 \
24+
./node_modules/.bin/nyc \
25+
--nycrc-path src/dev/code_coverage/nyc_config/nyc.server.config.js \
26+
node scripts/functional_tests \
2427
--include-tag "ciGroup$CI_GROUP" \
2528
--exclude-tag "skipCoverage" || true
2629

30+
if [[ -d "$KIBANA_DIR/target/kibana-coverage/server" ]]; then
31+
echo "--- Server side code coverage collected"
32+
mkdir -p target/kibana-coverage/functional
33+
mv target/kibana-coverage/server/coverage-final.json "target/kibana-coverage/functional/oss-${CI_GROUP}-server-coverage.json"
34+
fi
35+
2736
if [[ -d "$KIBANA_DIR/target/kibana-coverage/functional" ]]; then
2837
echo "--- Merging code coverage for CI Group $CI_GROUP"
2938
yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.functional.config.js --reporter json

‎.buildkite/scripts/steps/code_coverage/xpack_cigroup.sh‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,21 @@ echo " -> Running X-Pack functional tests with code coverage"
2222

2323
cd "$XPACK_DIR"
2424

25-
node scripts/functional_tests \
25+
NODE_OPTIONS=--max_old_space_size=14336 \
26+
./../node_modules/.bin/nyc \
27+
--nycrc-path ./../src/dev/code_coverage/nyc_config/nyc.server.config.js \
28+
node scripts/functional_tests \
2629
--include-tag "ciGroup$CI_GROUP" \
2730
--exclude-tag "skipCoverage" || true
2831

2932
cd "$KIBANA_DIR"
3033

34+
if [[ -d "$KIBANA_DIR/target/kibana-coverage/server" ]]; then
35+
echo "--- Server side code coverage collected"
36+
mkdir -p target/kibana-coverage/functional
37+
mv target/kibana-coverage/server/coverage-final.json "target/kibana-coverage/functional/xpack-${CI_GROUP}-server-coverage.json"
38+
fi
39+
3140
if [[ -d "$KIBANA_DIR/target/kibana-coverage/functional" ]]; then
3241
echo "--- Merging code coverage for CI Group $CI_GROUP"
3342
yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.functional.config.js --reporter json

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@
268268
/packages/kbn-std/ @elastic/kibana-core
269269
/packages/kbn-config/ @elastic/kibana-core
270270
/packages/kbn-logging/ @elastic/kibana-core
271+
/packages/kbn-logging-mocks/ @elastic/kibana-core
271272
/packages/kbn-http-tools/ @elastic/kibana-core
272273
/src/plugins/saved_objects_management/ @elastic/kibana-core
273274
/src/dev/run_check_published_api_changes.ts @elastic/kibana-core

‎.github/workflows/add-to-fleet-project.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Add to Fleet:Quality project
2+
on:
3+
issues:
4+
types:
5+
- labeled
6+
jobs:
7+
add_to_project:
8+
runs-on: ubuntu-latest
9+
if: |
10+
contains(github.event.issue.labels.*.name, 'Team:Fleet') && (
11+
contains(github.event.issue.labels.*.name, 'technical debt') ||
12+
contains(github.event.issue.labels.*.name, 'bug') ||
13+
contains(github.event.issue.labels.*.name, 'performance') ||
14+
contains(github.event.issue.labels.*.name, 'failed-test') ||
15+
contains(github.event.issue.labels.*.name, 'chore')
16+
)
17+
steps:
18+
- uses: octokit/graphql-action@v2.x
19+
id: add_to_project
20+
with:
21+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
22+
query: |
23+
mutation add_to_project($projectid:String!,$contentid:String!) {
24+
addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
25+
projectNextItem {
26+
id
27+
}
28+
}
29+
}
30+
projectid: ${{ env.PROJECT_ID }}
31+
contentid: ${{ github.event.issue.node_id }}
32+
env:
33+
# https://github.com/orgs/elastic/projects/763
34+
PROJECT_ID: "PN_kwDOAGc3Zs4AAsH6"
35+
# Token with `write:org` access
36+
GITHUB_TOKEN: ${{ secrets.FLEET_TECH_KIBANA_USER_TOKEN }}

‎docs/development/core/public/kibana-plugin-core-public.iexternalurl.isinternalurl.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
2+
3+
[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [IExternalUrl](./kibana-plugin-core-public.iexternalurl.md) &gt; [isInternalUrl](./kibana-plugin-core-public.iexternalurl.isinternalurl.md)
4+
5+
## IExternalUrl.isInternalUrl() method
6+
7+
Determines if the provided URL is an internal url.
8+
9+
<b>Signature:</b>
10+
11+
```typescript
12+
isInternalUrl(relativeOrAbsoluteUrl: string): boolean;
13+
```
14+
15+
## Parameters
16+
17+
| Parameter | Type | Description |
18+
| --- | --- | --- |
19+
| relativeOrAbsoluteUrl | string | |
20+
21+
<b>Returns:</b>
22+
23+
boolean
24+

‎docs/development/core/public/kibana-plugin-core-public.iexternalurl.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ export interface IExternalUrl
1616

1717
| Method | Description |
1818
| --- | --- |
19+
| [isInternalUrl(relativeOrAbsoluteUrl)](./kibana-plugin-core-public.iexternalurl.isinternalurl.md) | Determines if the provided URL is an internal url. |
1920
| [validateUrl(relativeOrAbsoluteUrl)](./kibana-plugin-core-public.iexternalurl.validateurl.md) | Determines if the provided URL is a valid location to send users. Validation is based on the configured allow list in kibana.yml.<!-- -->If the URL is valid, then a URL will be returned. Otherwise, this will return null. |
2021

‎docs/management/upgrade-assistant/index.asciidoc‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎docs/redirects.asciidoc‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -386,12 +386,17 @@ This content has moved. Refer to <<managing-data-views>>.
386386

387387
This content has moved. Refer to <<kibana-role-management>>.
388388

389-
[role="exclude" logging-configuration-changes]
390-
== Logging configuration changes
389+
[role="exclude",id="logging-configuration-changes"]
390+
== Logging configuration changes
391391

392392
This content has moved. Refer to <<logging-config-changes>>.
393393

394-
[role="exclude" upgrade-migrations]
394+
[role="exclude",id="upgrade-migrations"]
395395
== Upgrade migrations
396396

397397
This content has moved. Refer to <<saved-object-migrations>>.
398+
399+
[role="exclude",id="upgrade-assistant"]
400+
== Upgrade Assistant
401+
402+
This content has moved. Refer to {kibana-ref-all}/7.17/upgrade-assistant.html[Upgrade Assistant].

‎docs/setup/upgrade.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
== Upgrade {kib}
33

44
To upgrade from 7.16 or earlier to {version},
5-
**You must first upgrade to {prev-major-last}**.
5+
**you must first upgrade to {prev-major-last}**.
66
This enables you to use the Upgrade Assistant to
77
{stack-ref}/upgrading-elastic-stack.html#prepare-to-upgrade[prepare to upgrade].
88
You must resolve all critical issues identified by the Upgrade Assistant

0 commit comments

Comments
 (0)