Skip to content

Commit

Permalink
Merge branch 'main' into feat/olm-in_endpoint_integration_users_can_s…
Browse files Browse the repository at this point in the history
…ee_a_policy_response_section-3863
  • Loading branch information
kibanamachine authored Jun 3, 2022
2 parents c9a179d + cf02fe8 commit 4cafd07
Show file tree
Hide file tree
Showing 1,220 changed files with 260,318 additions and 8,712 deletions.
6 changes: 5 additions & 1 deletion .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ disabled:

# Elastic Synthetics configs
- x-pack/plugins/synthetics/e2e/config.ts
- x-pack/plugins/synthetics/e2e/playwright_run.ts
- x-pack/plugins/synthetics/e2e/synthetics_run.ts
- x-pack/plugins/ux/e2e/synthetics_run.ts

# Configs that exist but weren't running in CI when this file was introduced
- test/visual_regression/config.ts
Expand Down Expand Up @@ -145,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 @@ -188,6 +190,7 @@ enabled:
- x-pack/test/functional/config_security_basic.ts
- x-pack/test/functional/config.ccs.ts
- x-pack/test/functional/config.firefox.js
- x-pack/test/kubernetes_security/basic/config.ts
- x-pack/test/licensing_plugin/config.public.ts
- x-pack/test/licensing_plugin/config.ts
- x-pack/test/lists_api_integration/security_and_spaces/config.ts
Expand Down Expand Up @@ -234,6 +237,7 @@ enabled:
- x-pack/test/security_functional/saml.config.ts
- x-pack/test/security_solution_endpoint_api_int/config.ts
- x-pack/test/security_solution_endpoint/config.ts
- x-pack/test/session_view/basic/config.ts
- x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
- x-pack/test/spaces_api_integration/spaces_only/config.ts
Expand Down
12 changes: 6 additions & 6 deletions .buildkite/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .buildkite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"version": "1.0.0",
"private": true,
"dependencies": {
"kibana-buildkite-library": "git+https://[email protected]/elastic/kibana-buildkite-library#4ecaba35293fb635cf92ca205ee84fca52f19e2e"
"kibana-buildkite-library": "git+https://[email protected]/elastic/kibana-buildkite-library#6a73a417decc52f309ede3644577c9dca7b411a2"
}
}
4 changes: 0 additions & 4 deletions .buildkite/pipelines/es_snapshots/promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,3 @@ steps:
command: .buildkite/scripts/steps/es_snapshots/promote.sh
agents:
queue: kibana-default
- wait
- trigger: kibana-agent-packer-cache
async: true
branches: main
11 changes: 11 additions & 0 deletions .buildkite/pipelines/pull_request/synthetics_plugin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
steps:
- command: .buildkite/scripts/steps/functional/synthetics_plugin.sh
label: 'Synthetics @elastic/synthetics Tests'
agents:
queue: ci-group-6
depends_on: build
timeout_in_minutes: 120
retry:
automatic:
- exit_status: '*'
limit: 1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
steps:
- command: .buildkite/scripts/steps/functional/uptime.sh
label: 'Uptime @elastic/synthetics Tests'
- command: .buildkite/scripts/steps/functional/ux_synthetics_e2e.sh
label: 'UX Plugin @elastic/synthetics Tests'
agents:
queue: ci-group-6
depends_on: build
Expand Down
8 changes: 6 additions & 2 deletions .buildkite/scripts/pipelines/pull_request/pipeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,12 @@ const uploadPipeline = (pipelineContent) => {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/osquery_cypress.yml'));
}

if (await doAnyChangesMatch([/^x-pack\/plugins\/uptime/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/uptime.yml'));
if (await doAnyChangesMatch([/^x-pack\/plugins\/synthetics/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/synthetics_plugin.yml'));
}

if (await doAnyChangesMatch([/^x-pack\/plugins\/ux/])) {
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/ux_plugin_e2e.yml'));
}

if (process.env.GITHUB_PR_LABELS.includes('ci:deploy-cloud')) {
Expand Down
6 changes: 6 additions & 0 deletions .buildkite/scripts/steps/es_snapshots/promote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

set -euo pipefail

echo "--- Promote snapshot"
export ES_SNAPSHOT_MANIFEST="${ES_SNAPSHOT_MANIFEST:-"$(buildkite-agent meta-data get ES_SNAPSHOT_MANIFEST)"}"

cat << EOF | buildkite-agent annotate --style "info"
Expand All @@ -11,3 +12,8 @@ cat << EOF | buildkite-agent annotate --style "info"
EOF

node "$(dirname "${0}")/promote_manifest.js" "$ES_SNAPSHOT_MANIFEST"

if [[ "$BUILDKITE_BRANCH" == "main" ]]; then
echo "--- Trigger agent packer cache pipeline"
node .buildkite/scripts/steps/trigger_packer_cache.js
fi
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ source .buildkite/scripts/common/util.sh
.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh

export JOB=kibana-uptime-playwright
export JOB=kibana-synthetics-plugin

echo "--- synthetics @elastic/synthetics Tests"
echo "--- Synthetics plugin @elastic/synthetics Tests"

cd "$XPACK_DIR"

checks-reporter-with-killswitch "synthetics plugin @elastic/synthetics Tests" \
checks-reporter-with-killswitch "Synthetics plugin @elastic/synthetics Tests" \
node plugins/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
17 changes: 17 additions & 0 deletions .buildkite/scripts/steps/functional/ux_synthetics_e2e.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env bash

set -euo pipefail

source .buildkite/scripts/common/util.sh

.buildkite/scripts/bootstrap.sh
.buildkite/scripts/download_build_artifacts.sh

export JOB=kibana-ux-plugin-synthetics

echo "--- User Experience @elastic/synthetics Tests"

cd "$XPACK_DIR"

checks-reporter-with-killswitch "User Experience plugin @elastic/synthetics Tests" \
node plugins/ux/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
29 changes: 29 additions & 0 deletions .buildkite/scripts/steps/trigger_packer_cache.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0 and the Server Side Public License, v 1; you may not use this file except
* in compliance with, at your election, the Elastic License 2.0 or the Server
* Side Public License, v 1.
*/

const { BuildkiteClient } = require('kibana-buildkite-library');

(async () => {
try {
const client = new BuildkiteClient();
const build = await client.triggerBuild('kibana-agent-packer-cache', {
commit: 'HEAD',
branch: 'main',
ignore_pipeline_branch_filters: true, // Required because of a Buildkite bug
});
console.log(`Triggered build: ${build.web_url}`);
process.exit(0);
} catch (ex) {
console.error('Buildkite API Error', ex.toString());
if (ex.response) {
console.error('HTTP Error Response Status', ex.response.status);
console.error('HTTP Error Response Body', ex.response.data);
}
process.exit(1);
}
})();
4 changes: 4 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
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 Expand Up @@ -579,8 +581,10 @@ x-pack/plugins/security_solution/cypress/README.md @elastic/security-engineering
x-pack/test/security_solution_cypress @elastic/security-engineering-productivity

## Security Solution sub teams - adaptive-workload-protection
x-pack/plugins/kubernetes_security @elastic/awp-platform
x-pack/plugins/session_view @elastic/awp-platform
x-pack/plugins/security_solution/public/common/components/sessions_viewer @elastic/awp-platform
x-pack/plugins/security_solution/public/kubernetes @elastic/awp-platform

# Security Intelligence And Analytics
/x-pack/plugins/security_solution/server/lib/detection_engine/rules/prepackaged_rules @elastic/security-intelligence-analytics
Expand Down
35 changes: 34 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,36 @@ 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
- `needs_triage`: Indicates that someone from the area team needs to investigate.

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

2 changes: 2 additions & 0 deletions dev_docs/operations/operations_landing.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,7 @@ layout: landing
{ pageId: "kibDevDocsOpsAmbientUiTypes" },
{ pageId: "kibDevDocsOpsTestSubjSelector" },
{ pageId: "kibDevDocsOpsBazelRunner" },
{ pageId: "kibDevDocsOpsCliDevMode" },
{ pageId: "kibDevDocsOpsEs" },
]}
/>
88 changes: 20 additions & 68 deletions docs/api/cases/cases-api-find-cases.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -111,94 +111,46 @@ The API returns a JSON object listing the retrieved cases. For example:
{
"page": 1,
"per_page": 5,
"total": 2,
"total": 1,
"cases": [
{
"id": "abed3a70-71bd-11ea-a0b2-c51ea50a58e2",
"version": "WzExMCwxXQ==",
"comments": [],
"totalComment": 0,
"totalComment": 1,
"totalAlerts": 0,
"title": "The Long Game",
"tags": [
"windows",
"phishing"
],
"description": "Windows 95",
"settings": {
"syncAlerts": true
},
"title": "Case title",
"tags": [ "phishing" ],
"description": "Case description",
"settings": { "syncAlerts": true },
"owner": "securitySolution",
"duration": null,
"severity": "low",
"closed_at": null,
"closed_by": null,
"created_at": "2022-03-29T13:03:23.533Z",
"created_by": {
"email": "[email protected]",
"full_name": "Rat Hustler",
"username": "rhustler"
},
"status": "open",
"updated_at": null,
"updated_by": null,
"connector": {
"id": "131d4448-abe0-4789-939d-8ef60680b498",
"name": "My connector",
"type": ".jira",
"fields": {
"issueType": "10006",
"priority": null,
}
}
"external_service": null,
},
{
"id": "a18b38a0-71b0-11ea-a0b2-c51ea50a58e2",
"version": "Wzk4LDFd",
"comments": [],
"totalComment": 0,
"totalAlerts": 0,
"title": "This case will self-destruct in 5 seconds",
"tags": [
"phishing",
"social engineering",
"bubblegum"
],
"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!",
"settings": {
"syncAlerts": false
},
"owner": "cases",
"duration": null,
"closed_at": null,
"closed_by": null,
"created_at": "2022-03-29T11:30:02.658Z",
"created_at": "2022-05-12T00:16:36.371Z",
"created_by": {
"email": "[email protected]",
"full_name": "Alan Hunley",
"username": "ahunley"
"email": "[email protected]",
"full_name": "Jane Doe",
"username": "jdoe"
},
"status": "open",
"updated_at": "2022-03-29T12:01:50.244Z",
"updated_at": "2022-05-12T00:27:58.162Z",
"updated_by": {
"full_name": "Classified",
"email": "[email protected]",
"username": "M"
"email": "[email protected]",
"full_name": "Joe Smith",
"username": "jsmith"
},
"connector": {
"id": "131d4448-abe0-4789-939d-8ef60680b498",
"name": "My connector",
"type": ".resilient",
"fields": {
"issueTypes": [13],
"severityCode": 6,
}
"id": "none",
"name": "none",
"type": ".none",
"fields": null
},
"external_service": null,
"external_service": null
}
],
"count_open_cases": 2,
"count_open_cases": 1,
"count_in_progress_cases":0,
"count_closed_cases": 0
}
Expand Down
Loading

0 comments on commit 4cafd07

Please sign in to comment.