Skip to content

Commit

Permalink
Merge branch 'main' into siem-explore-issue-124499-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine committed Mar 7, 2022
2 parents 56b2800 + 7ac8361 commit ad872f4
Show file tree
Hide file tree
Showing 575 changed files with 46,313 additions and 4,524 deletions.
82 changes: 68 additions & 14 deletions .buildkite/pipelines/hourly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ steps:
label: 'Default CI Group'
parallelism: 27
agents:
queue: n2-4
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 250
key: default-cigroup
Expand All @@ -31,7 +31,7 @@ steps:
- command: CI_GROUP=Docker .buildkite/scripts/steps/functional/xpack_cigroup.sh
label: 'Docker CI Group'
agents:
queue: n2-4
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
key: default-cigroup-docker
Expand All @@ -44,7 +44,7 @@ steps:
label: 'OSS CI Group'
parallelism: 11
agents:
queue: ci-group-4d
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
key: oss-cigroup
Expand All @@ -56,29 +56,49 @@ steps:
- command: .buildkite/scripts/steps/functional/oss_accessibility.sh
label: 'OSS Accessibility Tests'
agents:
queue: ci-group-4d
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
retry:
automatic:
- exit_status: '*'
- exit_status: '1'
limit: 1
- exit_status: '-1'
limit: 3
- exit_status: '130'
limit: 3
- exit_status: '137'
limit: 3
- exit_status: '143'
limit: 3
- exit_status: '255'
limit: 3

- command: .buildkite/scripts/steps/functional/xpack_accessibility.sh
label: 'Default Accessibility Tests'
agents:
queue: n2-4
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
retry:
automatic:
- exit_status: '*'
- exit_status: '1'
limit: 1
- exit_status: '-1'
limit: 3
- exit_status: '130'
limit: 3
- exit_status: '137'
limit: 3
- exit_status: '143'
limit: 3
- exit_status: '255'
limit: 3

- command: .buildkite/scripts/steps/functional/oss_firefox.sh
label: 'OSS Firefox Tests'
agents:
queue: ci-group-4d
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
retry:
Expand All @@ -89,18 +109,28 @@ steps:
- command: .buildkite/scripts/steps/functional/xpack_firefox.sh
label: 'Default Firefox Tests'
agents:
queue: n2-4
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
retry:
automatic:
- exit_status: '*'
- exit_status: '1'
limit: 1
- exit_status: '-1'
limit: 3
- exit_status: '130'
limit: 3
- exit_status: '137'
limit: 3
- exit_status: '143'
limit: 3
- exit_status: '255'
limit: 3

- command: .buildkite/scripts/steps/functional/oss_misc.sh
label: 'OSS Misc Functional Tests'
agents:
queue: n2-4
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
retry:
Expand All @@ -111,13 +141,23 @@ steps:
- command: .buildkite/scripts/steps/functional/xpack_saved_object_field_metrics.sh
label: 'Saved Object Field Metrics'
agents:
queue: n2-4
queue: n2-4-spot
depends_on: build
timeout_in_minutes: 120
retry:
automatic:
- exit_status: '*'
- exit_status: '1'
limit: 1
- exit_status: '-1'
limit: 3
- exit_status: '130'
limit: 3
- exit_status: '137'
limit: 3
- exit_status: '143'
limit: 3
- exit_status: '255'
limit: 3

- command: .buildkite/scripts/steps/test/jest.sh
label: 'Jest Tests'
Expand All @@ -138,9 +178,23 @@ steps:
- command: .buildkite/scripts/steps/test/api_integration.sh
label: 'API Integration Tests'
agents:
queue: n2-2
queue: n2-4-spot
timeout_in_minutes: 120
key: api-integration
retry:
automatic:
- exit_status: '1'
limit: 1
- exit_status: '-1'
limit: 3
- exit_status: '130'
limit: 3
- exit_status: '137'
limit: 3
- exit_status: '143'
limit: 3
- exit_status: '255'
limit: 3

- command: .buildkite/scripts/steps/lint.sh
label: 'Linting'
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/functional/uptime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ echo "--- Uptime @elastic/synthetics Tests"
cd "$XPACK_DIR"

checks-reporter-with-killswitch "Uptime @elastic/synthetics Tests" \
node plugins/uptime/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION"
node plugins/uptime/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
**/*.js.snap
__tmp__
/.es
/.chromium
/build
Expand Down
52 changes: 30 additions & 22 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ const DEV_PACKAGES = [
'kbn-storybook',
'kbn-telemetry-tools',
'kbn-test',
'kbn-type-summarizer',
];

/** Directories (at any depth) which include dev-only code. */
Expand Down Expand Up @@ -1632,28 +1633,6 @@ module.exports = {
},
},

/**
* Prettier disables all conflicting rules, listing as last override so it takes precedence
*/
{
files: ['**/*'],
rules: {
...require('eslint-config-prettier').rules,
...require('eslint-config-prettier/react').rules,
...require('eslint-config-prettier/@typescript-eslint').rules,
},
},
/**
* Enterprise Search Prettier override
* Lints unnecessary backticks - @see https://github.com/prettier/eslint-config-prettier/blob/main/README.md#forbid-unnecessary-backticks
*/
{
files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
rules: {
quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: false }],
},
},

/**
* Platform Security Team overrides
*/
Expand Down Expand Up @@ -1768,5 +1747,34 @@ module.exports = {
'@kbn/eslint/no_export_all': 'error',
},
},

{
files: ['packages/kbn-type-summarizer/**/*.ts'],
rules: {
'no-bitwise': 'off',
},
},

/**
* Prettier disables all conflicting rules, listing as last override so it takes precedence
*/
{
files: ['**/*'],
rules: {
...require('eslint-config-prettier').rules,
...require('eslint-config-prettier/react').rules,
...require('eslint-config-prettier/@typescript-eslint').rules,
},
},
/**
* Enterprise Search Prettier override
* Lints unnecessary backticks - @see https://github.com/prettier/eslint-config-prettier/blob/main/README.md#forbid-unnecessary-backticks
*/
{
files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
rules: {
quotes: ['error', 'single', { avoidEscape: true, allowTemplateLiterals: false }],
},
},
],
};
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,9 @@ x-pack/plugins/security_solution/cypress/upgrade_integration @elastic/security-e
x-pack/plugins/security_solution/cypress/README.md @elastic/security-engineering-productivity
x-pack/test/security_solution_cypress @elastic/security-engineering-productivity

## Security Solution sub teams - adaptive-workload-protection
x-pack/plugins/session_view @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
31 changes: 31 additions & 0 deletions .github/workflows/add-to-imui-project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Add to Infra Monitoring UI project
on:
issues:
types:
- labeled
jobs:
add_to_project:
runs-on: ubuntu-latest
if: |
contains(github.event.issue.labels.*.name, 'Team:Infra Monitoring UI') ||
contains(github.event.issue.labels.*.name, 'Feature:Stack Monitoring') ||
contains(github.event.issue.labels.*.name, 'Feature:Logs UI') ||
contains(github.event.issue.labels.*.name, 'Feature:Metrics UI')
steps:
- uses: octokit/graphql-action@v2.x
id: add_to_project
with:
headers: '{"GraphQL-Features": "projects_next_graphql"}'
query: |
mutation add_to_project($projectid:ID!,$contentid:ID!) {
addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
projectNextItem {
id
}
}
}
projectid: ${{ env.PROJECT_ID }}
contentid: ${{ github.event.issue.node_id }}
env:
PROJECT_ID: "PN_kwDOAGc3Zs1EEA"
GITHUB_TOKEN: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
22 changes: 14 additions & 8 deletions .github/workflows/label-qa-fixed-in.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
github.event.pull_request.merged_at &&
contains(github.event.pull_request.labels.*.name, 'Team:Fleet')
outputs:
matrix: ${{ steps.issues_to_label.outputs.value }}
issue_ids: ${{ steps.issues_to_label.outputs.value }}
label_ids: ${{ steps.label_ids.outputs.value }}
steps:
- uses: octokit/graphql-action@v2.x
Expand Down Expand Up @@ -66,22 +66,28 @@ jobs:
label_issues:
needs: fetch_issues_to_label
runs-on: ubuntu-latest
# For each issue closed by the PR run this job

# For each issue closed by the PR x each label to apply, run this job
if: |
fromJSON(needs.fetch_issues_to_label.outputs.issue_ids).length > 0 &&
fromJSON(needs.fetch_issues_to_label.outputs.label_ids).length > 0
strategy:
matrix:
issueNodeId: ${{ fromJSON(needs.fetch_issues_to_label.outputs.matrix) }}
name: Label issue ${{ matrix.issueNodeId }}
issueId: ${{ fromJSON(needs.fetch_issues_to_label.outputs.issue_ids) }}
labelId: ${{ fromJSON(needs.fetch_issues_to_label.outputs.label_ids) }}

name: Label issue ${{ matrix.issueId }} with ${{ matrix.labelId }}
steps:
- uses: octokit/graphql-action@v2.x
id: add_labels_to_closed_issue
with:
query: |
mutation add_label($issueid: ID!, $labelids:[ID!]!) {
addLabelsToLabelable(input: {labelableId: $issueid, labelIds: $labelids}) {
mutation add_label($issueid: ID!, $labelid:ID!) {
addLabelsToLabelable(input: {labelableId: $issueid, labelIds: [$labelid]}) {
clientMutationId
}
}
issueid: ${{ matrix.issueNodeId }}
labelids: ${{ fromJSON(needs.fetch_issues_to_label.outputs.label_ids) }}
issueid: ${{ matrix.issueId }}
labelid: ${{ matrix.labelId }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 1 addition & 3 deletions .github/workflows/project-assigner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ jobs:
{"label": "Feature:Canvas", "projectNumber": 38, "columnName": "Inbox"},
{"label": "Feature:Dashboard", "projectNumber": 68, "columnName": "Inbox"},
{"label": "Feature:Drilldowns", "projectNumber": 68, "columnName": "Inbox"},
{"label": "Feature:Input Controls", "projectNumber": 72, "columnName": "Inbox"},
{"label": "Team:Security", "projectNumber": 320, "columnName": "Awaiting triage", "projectScope": "org"},
{"label": "Team:Operations", "projectNumber": 314, "columnName": "Triage", "projectScope": "org"}
{"label": "Feature:Input Controls", "projectNumber": 72, "columnName": "Inbox"}
]
ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ target
*.iml
*.log
types.eslint.config.js
__tmp__

# Ignore example plugin builds
/examples/*/build
Expand Down
1 change: 1 addition & 0 deletions .i18nrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"usageCollection": "src/plugins/usage_collection",
"utils": "packages/kbn-securitysolution-utils/src",
"visDefaultEditor": "src/plugins/vis_default_editor",
"visTypeGauge": "src/plugins/vis_types/gauge",
"visTypeHeatmap": "src/plugins/vis_types/heatmap",
"visTypeMarkdown": "src/plugins/vis_type_markdown",
"visTypeMetric": "src/plugins/vis_types/metric",
Expand Down
4 changes: 4 additions & 0 deletions WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,8 @@ yarn_install(
symlink_node_modules = True,
quiet = False,
frozen_lockfile = False,
environment = {
"SASS_BINARY_SITE": "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-sass",
"RE2_DOWNLOAD_MIRROR": "https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/node-re2",
}
)
Loading

0 comments on commit ad872f4

Please sign in to comment.