Skip to content

Commit

Permalink
Merge branch 'main' into add-alert-supression-editable-component
Browse files Browse the repository at this point in the history
  • Loading branch information
maximpn authored Nov 11, 2024
2 parents 162b3a9 + 2277e64 commit 3ca73b1
Show file tree
Hide file tree
Showing 125 changed files with 2,850 additions and 2,130 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ spec:
repository: elastic/kibana
# Point to a pipeline implementation, detailing the pipeline steps to run
pipeline_file: .buildkite/pipelines/your-pipeline-name.yml
skip_intermediate_builds: false
provider_settings:
prefix_pull_request_fork_branch_names: false
skip_pull_request_builds_for_existing_commits: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/build_api_docs.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/scalability/api_capacity_testing_daily.yml
skip_intermediate_builds: false
provider_settings:
trigger_mode: none
build_branches: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/artifacts.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ spec:
allow_rebuilds: true
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/artifacts.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/artifacts_trigger.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/chrome_forward_testing.yml
skip_intermediate_builds: true
provider_settings:
prefix_pull_request_fork_branch_names: false
skip_pull_request_builds_for_existing_commits: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/code_coverage/daily.yml
skip_intermediate_builds: false
provider_settings:
prefix_pull_request_fork_branch_names: false
skip_pull_request_builds_for_existing_commits: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/serverless_deployment/project-build-and-deploy-pr.yml
skip_intermediate_builds: true
provider_settings:
build_pull_requests: true
prefix_pull_request_fork_branch_names: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_forward.yml # Note: this file exists in 7.17 only
skip_intermediate_builds: false
provider_settings:
prefix_pull_request_fork_branch_names: false
trigger_mode: none
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down Expand Up @@ -96,7 +95,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down Expand Up @@ -146,7 +144,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/esql_grammar_sync.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-flaky.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ spec:
default_branch: refs/pull/INSERT_PR_NUMBER/head
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/flaky_tests/pipeline.sh
skip_intermediate_builds: false
provider_settings:
build_branches: true
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/fleet/packages_daily.yml
skip_intermediate_builds: false
provider_settings:
trigger_mode: none
publish_commit_status: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/performance/daily.yml
skip_intermediate_builds: false
provider_settings:
trigger_mode: none
build_branches: true
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipeline-resource-definitions/kibana-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/scripts/pipelines/pull_request/pipeline.sh
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/purge_cloud_deployments.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/es_serverless/emergency_release_branch_testing.yml
skip_intermediate_builds: false
provider_settings:
build_branches: true
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ spec:
ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
default_branch: main
allow_rebuilds: false
skip_intermediate_builds: false
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/serverless_deployment/run_serverless_release_assistant.yml
provider_settings:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ spec:
default_branch: main
repository: elastic/ci-agent-images
pipeline_file: vm-images/.buildkite/pipeline.yml
skip_intermediate_builds: false
provider_settings:
trigger_mode: none
schedules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/scalability/daily.yml
skip_intermediate_builds: false
provider_settings:
trigger_mode: none
build_branches: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_defend_workflows.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_detection_engine.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_entity_analytics.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_explore.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_gen_ai.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_investigations.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ spec:
spec:
repository: elastic/kibana
pipeline_file: .buildkite/pipelines/security_solution_quality_gate/mki_security_solution_rule_management.yml
skip_intermediate_builds: false
provider_settings:
build_branches: false
build_pull_requests: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ spec:
default_branch: main
repository: elastic/kibana
pipeline_file: .buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.sh
skip_intermediate_builds: false
provider_settings:
prefix_pull_request_fork_branch_names: false
skip_pull_request_builds_for_existing_commits: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@ steps:
async: true
build:
env:
IMAGES_CONFIG="kibana/images.yml"
RETRY="1"
IMAGES_CONFIG: "kibana/images.yml"
RETRY: "1"
EOF
4 changes: 2 additions & 2 deletions .buildkite/scripts/steps/es_snapshots/promote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ steps:
async: true
build:
env:
IMAGES_CONFIG="kibana/images.yml"
RETRY="1"
IMAGES_CONFIG: "kibana/images.yml"
RETRY: "1"
EOF
fi
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -1843,7 +1843,6 @@ x-pack/test/security_solution_cypress/cypress/tasks/expandable_flyout @elastic/
/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui @elastic/security-detection-rule-management
/x-pack/plugins/security_solution/public/detection_engine/rule_monitoring @elastic/security-detection-rule-management
/x-pack/plugins/security_solution/public/detections/components/callouts @elastic/security-detection-rule-management
/x-pack/plugins/security_solution/public/detections/components/modals/ml_job_upgrade_modal @elastic/security-detection-rule-management
/x-pack/plugins/security_solution/public/detections/components/rules @elastic/security-detection-rule-management
/x-pack/plugins/security_solution/public/detections/components/rules/rule_preview @elastic/security-detection-engine
/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules @elastic/security-detection-rule-management
Expand Down
1 change: 0 additions & 1 deletion packages/kbn-apm-synthtrace-client/src/lib/apm/instance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export class Instance extends Entity<ApmFields> {
...this.fields,
'error.type': 'crash',
'error.exception': [{ message, ...(type ? { type } : {}) }],
'error.grouping_name': getErrorGroupingKey(message),
});
}
error({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ export class MobileDevice extends Entity<ApmFields> {
'error.type': 'crash',
'error.id': generateLongIdWithSeed(message),
'error.exception': [{ message, ...{ type: 'crash' } }],
'error.grouping_name': groupingName || message,
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,6 @@ describe('single line query', () => {
});
});

describe('SHOW', () => {
/** @todo Enable once show command args are parsed as columns. */
test.skip('info page', () => {
const { text } = reprint('SHOW info');

expect(text).toBe('SHOW info');
});
});

describe('STATS', () => {
test('with aggregates assignment', () => {
const { text } = reprint('FROM a | STATS var = agg(123, fn(true))');
Expand All @@ -100,6 +91,30 @@ describe('single line query', () => {
expect(text).toBe('FROM a | STATS A(1), B(2) BY asdf');
});
});

describe('GROK', () => {
test('two basic arguments', () => {
const { text } = reprint('FROM search-movies | GROK Awards "text"');

expect(text).toBe('FROM search-movies | GROK Awards "text"');
});
});

describe('DISSECT', () => {
test('two basic arguments', () => {
const { text } = reprint('FROM index | DISSECT input "pattern"');

expect(text).toBe('FROM index | DISSECT input "pattern"');
});

test('with APPEND_SEPARATOR option', () => {
const { text } = reprint(
'FROM index | DISSECT input "pattern" APPEND_SEPARATOR="<separator>"'
);

expect(text).toBe('FROM index | DISSECT input "pattern" APPEND_SEPARATOR = "<separator>"');
});
});
});

describe('expressions', () => {
Expand Down
Loading

0 comments on commit 3ca73b1

Please sign in to comment.