Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into dataview-rule-exec
Browse files Browse the repository at this point in the history
  • Loading branch information
dhurley14 committed Jun 6, 2022
2 parents b535d5c + ff21b0e commit ef10521
Show file tree
Hide file tree
Showing 683 changed files with 12,366 additions and 8,951 deletions.
7 changes: 7 additions & 0 deletions .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ enabled:
- x-pack/test/functional/apps/cross_cluster_replication/config.ts
- x-pack/test/functional/apps/dashboard/group1/config.ts
- x-pack/test/functional/apps/dashboard/group2/config.ts
- x-pack/test/functional/apps/dashboard/group3/config.ts
- x-pack/test/functional/apps/data_views/config.ts
- x-pack/test/functional/apps/dev_tools/config.ts
- x-pack/test/functional/apps/discover/config.ts
Expand Down Expand Up @@ -245,3 +246,9 @@ enabled:
- x-pack/test/ui_capabilities/spaces_only/config.ts
- x-pack/test/upgrade_assistant_integration/config.js
- x-pack/test/usage_collection/config.ts
- x-pack/test/performance/journeys/ecommerce_dashboard/config.ts
- x-pack/test/performance/journeys/flight_dashboard/config.ts
- x-pack/test/performance/journeys/login/config.ts
- x-pack/test/performance/journeys/many_fields_discover/config.ts
- x-pack/test/performance/journeys/promotion_tracking_dashboard/config.ts
- x-pack/test/performance/journeys/web_logs_dashboard/config.ts
8 changes: 2 additions & 6 deletions .buildkite/scripts/steps/functional/performance_playwright.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,20 @@ for i in "${journeys[@]}"; do
echo "JOURNEY[${i}] is running"

export TEST_PERFORMANCE_PHASE=WARMUP
export ELASTIC_APM_ACTIVE=false
export JOURNEY_NAME="${i}"

checks-reporter-with-killswitch "Run Performance Tests with Playwright Config (Journey:${i},Phase: WARMUP)" \
node scripts/functional_tests \
--config x-pack/test/performance/config.playwright.ts \
--include "x-pack/test/performance/tests/playwright/${i}.ts" \
--config "x-pack/test/performance/journeys/${i}/config.ts" \
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
--debug \
--bail

export TEST_PERFORMANCE_PHASE=TEST
export ELASTIC_APM_ACTIVE=true

checks-reporter-with-killswitch "Run Performance Tests with Playwright Config (Journey:${i},Phase: TEST)" \
node scripts/functional_tests \
--config x-pack/test/performance/config.playwright.ts \
--include "x-pack/test/performance/tests/playwright/${i}.ts" \
--config "x-pack/test/performance/journeys/${i}/config.ts" \
--kibana-install-dir "$KIBANA_BUILD_LOCATION" \
--debug \
--bail
Expand Down
1 change: 1 addition & 0 deletions .buildkite/scripts/steps/storybooks/build_and_upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const STORYBOOKS = [
'canvas',
'ci_composite',
'cloud',
'coloring',
'controls',
'custom_integrations',
'dashboard_enhanced',
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,7 @@ module.exports = {
'x-pack/test/*/*config.*ts',
'x-pack/test/saved_object_api_integration/*/apis/**/*',
'x-pack/test/ui_capabilities/*/tests/**/*',
'x-pack/test/performance/**/*.ts',
],
rules: {
'import/no-default-export': 'off',
Expand Down
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@
/x-pack/test/functional/es_archives/uptime @elastic/uptime
/x-pack/test/functional/services/uptime @elastic/uptime
/x-pack/test/api_integration/apis/uptime @elastic/uptime
/x-pack/plugins/observability/public/components/shared/exploratory_view @elastic/uptime


# Client Side Monitoring / Uptime (lives in APM directories but owned by Uptime)
/x-pack/plugins/apm/public/application/uxApp.tsx @elastic/uptime
Expand Down
36 changes: 35 additions & 1 deletion dev_docs/contributing/how_we_use_github.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ would be useful to all teams, talk to your team or tech lead about getting it ad

### Team labels

Examples: `Team:Security`, `Team:Operations`.
Examples: `Team:Security`, `Team:Operations`, `Team:Docs`.

These labels map the issue to the team that owns the particular area. Part of the responsibilities of
(todo) is to ensure every issue has at least a team or a project
Expand Down Expand Up @@ -178,3 +178,37 @@ it might mean the version the team is tentatively planning to merge a fix.

Consult the owning team if you have a question about how a version label is meant
to be used on an issue.

### Issue type and workflow labels

These labels categorize the type of work. For example:

- `blocked`: Indicates the issue is currently blocked
- `blocker`: Indicates that we should not release the product at the next
proposed version without the issue being resolved
- `bug`: Indicates an unexpected problem or unintended behavior
- `discuss`: Indicates that an issue is a discussion topic
- `docs`/`documentation`: Indicates improvements or additions to documentation
- `enhancement`: Indicates new feature or enhancement requests
- `meta`: Indicates that the issue tracks tasks related to a project
- `triage-needed`: Indicates that someone from the area team needs to investigate.
- `needs_team`: Indicates that issue is missing area team label. All issues should be assigned to one or more area teams for follow up. This label is assigned automatically and removed automatically once a team label is added.

These labels affect whether your PR appears in the release notes (that is to say,
it's notable and affects our users) and which section it appears in. For example:

- `release_note:breaking`: Specifies a breaking change and adds the PR to the Breaking changes section in the release notes
- `release_note:deprecation`: Specifies a deprecated feature and adds the PR to the Deprecations section in the release notes
- `release_note:enhancement`: Specifies a feature enhancement and adds the PR to the Enhancements section in the release notes
- `release_note:feature`: Specifies a new feature and adds the PR to the Features section in the release notes
- `release_note:fix`: Specifies a bug fix and adds the PR to the Bug fixes section in the release notes
- `release_node:plugin_api_changes`: Specifies a changes to the plugin API and adds the PR to the Plugin API changes page in the Developer Guide
- `release_note:skip`: Omits the PR from release notes

These labels related to backporting PRs:

- `auto-backport`: Automatically backport this PR (to the branches related to
version labels) after it's merged
- `backport`: This PR was backported
- `backport:skip`: This PR does not require backporting

3 changes: 2 additions & 1 deletion dev_docs/operations/operations_landing.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ layout: landing
{ pageId: "kibDevDocsOpsAmbientUiTypes" },
{ pageId: "kibDevDocsOpsTestSubjSelector" },
{ pageId: "kibDevDocsOpsBazelRunner" },
{ pageId: "kibDevDocsOpsCliDevMode" }
{ pageId: "kibDevDocsOpsCliDevMode" },
{ pageId: "kibDevDocsOpsEs" },
]}
/>
30 changes: 11 additions & 19 deletions docs/api/cases/cases-api-create.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,9 @@ categorize cases. It can be an empty array.
--------------------------------------------------
POST api/cases
{
"description": "James Bond clicked on a highly suspicious email
banner advertising cheap holidays for underpaid civil servants.",
"title": "This case will self-destruct in 5 seconds",
"tags": [
"phishing",
"social engineering"
],
"description": "A case description.",
"title": "Case title 1",
"tags": [ "tag 1" ],
"connector": {
"id": "131d4448-abe0-4789-939d-8ef60680b498",
"name": "My connector",
Expand All @@ -182,7 +178,7 @@ POST api/cases
"settings": {
"syncAlerts": true
},
"owner": "securitySolution"
"owner": "cases"
}
--------------------------------------------------
// KIBANA
Expand All @@ -198,26 +194,22 @@ the case identifier, version, and creation time. For example:
"comments": [],
"totalComment": 0,
"totalAlerts": 0,
"title": "This case will self-destruct in 5 seconds",
"tags": [
"phishing",
"social engineering",
"bubblegum"
],
"title": "Case title 1",
"tags": [ "tag 1" ],
"settings": {
"syncAlerts": true
},
"owner": "securitySolution",
"description": "James Bond clicked on a highly suspicious email banner advertising cheap holidays for underpaid civil servants. Operation bubblegum is active. Repeat - operation bubblegum is now active",
"owner": "cases",
"description": "A case description.",
"duration": null,
"severity": "low",
"closed_at": null,
"closed_by": null,
"created_at": "2022-05-13T09:16:17.416Z",
"created_by": {
"email": "ahunley@imf.usa.gov",
"full_name": "Alan Hunley",
"username": "ahunley"
"email": null,
"full_name": null,
"username": "elastic"
},
"status": "open",
"updated_at": null,
Expand Down
12 changes: 8 additions & 4 deletions docs/api/cases/cases-api-find-cases.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ Defaults to `desc`.

=== {api-examples-title}

Retrieve the first five cases with the `phishing` tag, in ascending order by
Retrieve the first five cases with the `tag-1` tag, in ascending order by
last update time:

[source,sh]
--------------------------------------------------
GET api/cases/_find?page=1&perPage=5&sortField=updatedAt&sortOrder=asc&tags=phishing
GET api/cases/_find?page=1&perPage=5&sortField=updatedAt&sortOrder=asc&tags=tag-1
--------------------------------------------------
// KIBANA

Expand All @@ -120,11 +120,11 @@ The API returns a JSON object listing the retrieved cases. For example:
"totalComment": 1,
"totalAlerts": 0,
"title": "Case title",
"tags": [ "phishing" ],
"tags": [ "tag-1" ],
"description": "Case description",
"settings": { "syncAlerts": true },
"owner": "securitySolution",
"duration": null,
"duration": null, <1>
"severity": "low",
"closed_at": null,
"closed_by": null,
Expand Down Expand Up @@ -155,3 +155,7 @@ The API returns a JSON object listing the retrieved cases. For example:
"count_closed_cases": 0
}
--------------------------------------------------
<1> Duration represents the elapsed time from the creation of the case to its
closure (in seconds). If the case has not been closed, the duration is set to
`null`. If the case was closed after less than half a second, the duration is
rounded down to zero.
8 changes: 6 additions & 2 deletions docs/api/cases/cases-api-get-case.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,15 @@ The API returns a JSON object with the retrieved case. For example:
},
"owner": "securitySolution",
"severity": "low",
"duration": null,
"duration": null, <1>
"tags": [
"phishing",
"social engineering",
"bubblegum"
]
}
--------------------------------------------------
--------------------------------------------------
<1> Duration represents the elapsed time from the creation of the case to its
closure (in seconds). If the case has not been closed, the duration is set to
`null`. If the case was closed after less than half a second, the duration is
rounded down to zero.
44 changes: 17 additions & 27 deletions docs/api/cases/cases-api-update.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ and `open`.
(Optional, string) A title for the case.
`version`::
(Required, string) The current version of the case. To determine this value, use <<cases-api-get-case>> or <<cases-api-find-cases>>.
(Required, string) The current version of the case. To determine this value, use
<<cases-api-get-case>> or <<cases-api-find-cases>>.
====

=== {api-response-codes-title}
Expand Down Expand Up @@ -190,15 +191,8 @@ PATCH api/cases
"parent": null
}
},
"description": "James Bond clicked on a highly suspicious email
banner advertising cheap holidays for underpaid civil servants.
Operation bubblegum is active. Repeat - operation bubblegum is
now active!",
"tags": [
"phishing",
"social engineering",
"bubblegum"
],
"description": "A new description.",
"tags": [ "tag-1", "tag-2" ],
"settings": {
"syncAlerts": true
}
Expand All @@ -219,33 +213,29 @@ The API returns the updated case with a new `version` value. For example:
"comments": [],
"totalComment": 0,
"totalAlerts": 0,
"title": "This case will self-destruct in 5 seconds",
"tags": [
"phishing",
"social engineering",
"bubblegum"
],
"title": "Case title 1",
"tags": [ "tag-1", "tag-2" ],
"settings": {
"syncAlerts": true
},
"owner": "securitySolution",
"description": "James Bond clicked on a highly suspicious email banner advertising cheap holidays for underpaid civil servants. Operation bubblegum is active. Repeat - operation bubblegum is now active!",
"owner": "cases",
"description": "A new description.",
"duration": null,
"severity": "low",
"closed_at": null,
"closed_by": null,
"created_at": "2022-05-13T09:16:17.416Z",
"created_by": {
"email": "ahunley@imf.usa.gov",
"full_name": "Alan Hunley",
"username": "ahunley"
"email": null,
"full_name": null,
"username": "elastic"
},
"status": "open",
"updated_at": "2022-05-13T09:48:33.043Z",
"updated_by": {
"email": "classified@hms.oo.gov.uk",
"full_name": "Classified",
"username": "M"
"email": null,
"full_name": null,
"username": "elastic"
},
"connector": {
"id": "131d4448-abe0-4789-939d-8ef60680b498",
Expand All @@ -260,9 +250,9 @@ The API returns the updated case with a new `version` value. For example:
"external_service": {
"external_title": "IS-4",
"pushed_by": {
"full_name": "Classified",
"email": "classified@hms.oo.gov.uk",
"username": "M"
"full_name": null,
"email": null,
"username": "elastic"
},
"external_url": "https://hms.atlassian.net/browse/IS-4",
"pushed_at": "2022-05-13T09:20:40.672Z",
Expand Down
Loading

0 comments on commit ef10521

Please sign in to comment.