Skip to content

Commit

Permalink
Merge branch 'main' into elastic#116
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexwizp
alexwizp authored Aug 29, 2024
2 parents 10dfb5a + d895c38 commit 85f1dd6
Show file tree
Hide file tree
Showing 2,134 changed files with 23,094 additions and 14,914 deletions.
16 changes: 8 additions & 8 deletions .buildkite/package-lock.json
View file

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

16 changes: 4 additions & 12 deletions .buildkite/pipeline-utils/buildkite/client.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ describe('BuildkiteClient', () => {
id: 'id-1',
retried_in_job_id: 'id-2',
state: 'failed',
agent: {
meta_data: ['spot=true'],
},
agent_query_rules: ['preemptible=true'],
retried: true,
exit_status: -1,
type: 'script',
Expand All @@ -35,9 +33,7 @@ describe('BuildkiteClient', () => {
const retry: Job = {
id: 'id-2',
state: 'passed',
agent: {
meta_data: ['spot=true'],
},
agent_query_rules: ['preemptible=true'],
type: 'script',
} as Job;

Expand All @@ -58,9 +54,7 @@ describe('BuildkiteClient', () => {
id: 'id-1',
retried_in_job_id: 'id-2',
state: 'failed',
agent: {
meta_data: ['spot=true'],
},
agent_query_rules: ['preemptible=true'],
retried: true,
exit_status: 1,
type: 'script',
Expand All @@ -69,9 +63,7 @@ describe('BuildkiteClient', () => {
const retry: Job = {
id: 'id-2',
state: 'passed',
agent: {
meta_data: ['spot=true'],
},
agent_query_rules: ['preemptible=true'],
type: 'script',
} as Job;

Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipeline-utils/buildkite/client.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ export class BuildkiteClient {
hasRetries = true;
const isPreemptionFailure =
job.state === 'failed' &&
job.agent?.meta_data?.some((el) => ['spot=true', 'gcp:preemptible=true'].includes(el)) &&
job.agent_query_rules?.includes('preemptible=true') &&
job.exit_status === -1;

if (!isPreemptionFailure) {
Expand Down
6 changes: 5 additions & 1 deletion .eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,10 @@ module.exports = {
},
},
{
files: ['x-pack/plugins/observability_solution/**/*.{ts,tsx}'],
files: [
'x-pack/plugins/observability_solution/**/*.{ts,tsx}',
'x-pack/packages/observability/**/*.{ts,tsx}',
],
rules: {
'react-hooks/exhaustive-deps': [
'error',
Expand All @@ -944,6 +947,7 @@ module.exports = {
'x-pack/plugins/aiops/**/*.tsx',
'x-pack/plugins/observability_solution/**/*.tsx',
'src/plugins/ai_assistant_management/**/*.tsx',
'x-pack/packages/observability/**/*.{ts,tsx}',
],
rules: {
'@kbn/telemetry/event_generating_elements_should_be_instrumented': 'error',
Expand Down
20 changes: 11 additions & 9 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@ x-pack/plugins/observability_solution/observability_onboarding/e2e @elastic/obs-
x-pack/plugins/observability_solution/observability_onboarding @elastic/obs-ux-logs-team @elastic/obs-ux-onboarding-team
x-pack/plugins/observability_solution/observability @elastic/obs-ux-management-team
x-pack/plugins/observability_solution/observability_shared @elastic/observability-ui
x-pack/packages/observability/observability_utils @elastic/observability-ui
x-pack/test/security_api_integration/plugins/oidc_provider @elastic/kibana-security
test/common/plugins/otel_metrics @elastic/obs-ux-infra_services-team
packages/kbn-openapi-bundler @elastic/security-detection-rule-management
Expand Down Expand Up @@ -774,6 +775,7 @@ x-pack/packages/security-solution/side_nav @elastic/security-threat-hunting-expl
x-pack/packages/security-solution/storybook/config @elastic/security-threat-hunting-explore
x-pack/packages/security-solution/upselling @elastic/security-threat-hunting-explore
x-pack/test/security_functional/plugins/test_endpoints @elastic/kibana-security
x-pack/packages/security/ui_components @elastic/kibana-security
packages/kbn-securitysolution-autocomplete @elastic/security-detection-engine
x-pack/packages/security-solution/data_table @elastic/security-threat-hunting-investigations
packages/kbn-securitysolution-ecs @elastic/security-threat-hunting-explore
Expand Down Expand Up @@ -1555,18 +1557,18 @@ x-pack/test/security_solution_cypress/cypress/tasks/expandable_flyout @elastic/

## Generative AI owner connectors
# OpenAI
/x-pack/plugins/stack_connectors/public/connector_types/openai @elastic/security-generative-ai @elastic/obs-ai-assistant
/x-pack/plugins/stack_connectors/server/connector_types/openai @elastic/security-generative-ai @elastic/obs-ai-assistant
/x-pack/plugins/stack_connectors/common/openai @elastic/security-generative-ai @elastic/obs-ai-assistant
/x-pack/plugins/stack_connectors/public/connector_types/openai @elastic/security-generative-ai @elastic/obs-ai-assistant @elastic/appex-ai-infra
/x-pack/plugins/stack_connectors/server/connector_types/openai @elastic/security-generative-ai @elastic/obs-ai-assistant @elastic/appex-ai-infra
/x-pack/plugins/stack_connectors/common/openai @elastic/security-generative-ai @elastic/obs-ai-assistant @elastic/appex-ai-infra
# Bedrock
/x-pack/plugins/stack_connectors/public/connector_types/bedrock @elastic/security-generative-ai @elastic/obs-ai-assistant
/x-pack/plugins/stack_connectors/server/connector_types/bedrock @elastic/security-generative-ai @elastic/obs-ai-assistant
/x-pack/plugins/stack_connectors/common/bedrock @elastic/security-generative-ai @elastic/obs-ai-assistant
/x-pack/plugins/stack_connectors/public/connector_types/bedrock @elastic/security-generative-ai @elastic/obs-ai-assistant @elastic/appex-ai-infra
/x-pack/plugins/stack_connectors/server/connector_types/bedrock @elastic/security-generative-ai @elastic/obs-ai-assistant @elastic/appex-ai-infra
/x-pack/plugins/stack_connectors/common/bedrock @elastic/security-generative-ai @elastic/obs-ai-assistant @elastic/appex-ai-infra

# Gemini
/x-pack/plugins/stack_connectors/public/connector_types/gemini @elastic/security-generative-ai @elastic/obs-ai-assistant
/x-pack/plugins/stack_connectors/server/connector_types/gemini @elastic/security-generative-ai @elastic/obs-ai-assistant
/x-pack/plugins/stack_connectors/common/gemini @elastic/security-generative-ai @elastic/obs-ai-assistant
/x-pack/plugins/stack_connectors/public/connector_types/gemini @elastic/security-generative-ai @elastic/obs-ai-assistant @elastic/appex-ai-infra
/x-pack/plugins/stack_connectors/server/connector_types/gemini @elastic/security-generative-ai @elastic/obs-ai-assistant @elastic/appex-ai-infra
/x-pack/plugins/stack_connectors/common/gemini @elastic/security-generative-ai @elastic/obs-ai-assistant @elastic/appex-ai-infra

## Defend Workflows owner connectors
/x-pack/plugins/stack_connectors/public/connector_types/sentinelone @elastic/security-defend-workflows
Expand Down
12 changes: 6 additions & 6 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ role_users.json
.devcontainer/.env

# Ignore temporary files in oas_docs
output/kibana.serverless.tmp1.yaml
output/kibana.serverless.tmp2.yaml
output/kibana.tmp1.yaml
output/kibana.tmp2.yaml
output/kibana.new.yaml
output/kibana.serverless.new.yaml
oas_docs/output/kibana.serverless.tmp1.yaml
oas_docs/output/kibana.serverless.tmp2.yaml
oas_docs/output/kibana.tmp1.yaml
oas_docs/output/kibana.tmp2.yaml
oas_docs/output/kibana.new.yaml
oas_docs/output/kibana.serverless.new.yaml
1 change: 1 addition & 0 deletions .i18nrc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"presentationPanel": "src/plugins/presentation_panel",
"embeddableExamples": "examples/embeddable_examples",
"esQuery": "packages/kbn-es-query/src",
"kbnGridLayout": "packages/kbn-grid-layout",
"esUi": "src/plugins/es_ui_shared",
"expandableFlyout": "packages/kbn-expandable-flyout",
"expressionError": "src/plugins/expression_error",
Expand Down
Loading

0 comments on commit 85f1dd6

Please sign in to comment.