Skip to content

Commit

Permalink
Merge branch 'main' into rylnd/bugfix/eql_rule_timestamp_override
Browse files Browse the repository at this point in the history
  • Loading branch information
rylnd authored Mar 14, 2024
2 parents e837f19 + d95ae3e commit f6739dd
Show file tree
Hide file tree
Showing 1,722 changed files with 44,696 additions and 11,735 deletions.
1 change: 1 addition & 0 deletions .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ enabled:
- x-pack/test/functional/apps/ml/stack_management_jobs/config.ts
- x-pack/test/functional/apps/monitoring/config.ts
- x-pack/test/functional/apps/observability_logs_explorer/config.ts
- x-pack/test/functional/apps/dataset_quality/config.ts
- x-pack/test/functional/apps/painless_lab/config.ts
- x-pack/test/functional/apps/remote_clusters/config.ts
- x-pack/test/functional/apps/reporting_management/config.ts
Expand Down
6 changes: 1 addition & 5 deletions .buildkite/hooks/post-command
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#!/usr/bin/env bash

if [[ "$BUILDKITE_AGENT_NAME" =~ ^bk-agent ]]; then
echo "Pipeline file triggered from outside the kibana executors, skipping post_command"
else
.buildkite/scripts/lifecycle/post_command.sh
fi
source .buildkite/scripts/lifecycle/post_command.sh
7 changes: 1 addition & 6 deletions .buildkite/hooks/pre-command
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
#!/usr/bin/env bash

if [[ "$BUILDKITE_AGENT_NAME" =~ ^bk-agent ]]; then
echo "Pipeline file triggered from outside the kibana executors, skipping .buildkite/scripts/lifecycle/pre_command.sh"
export SONAR_LOGIN=$(vault read -field=token secret/ci/elastic-kibana/sonarqube)
else
source .buildkite/scripts/lifecycle/pre_command.sh
fi
source .buildkite/scripts/lifecycle/pre_command.sh
166 changes: 35 additions & 131 deletions .buildkite/package-lock.json

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

5 changes: 4 additions & 1 deletion .buildkite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"test": "mocha",
"test:watch": "mocha --watch"
},
"overrides": {
"serialize-javascript": "^6.0.2"
},
"dependencies": {
"@octokit/rest": "^18.10.0",
"axios": "^1.6.3",
Expand All @@ -21,7 +24,7 @@
"@types/mocha": "^10.0.1",
"@types/node": "^15.12.2",
"chai": "^4.3.10",
"mocha": "^10.2.0",
"mocha": "^10.3.0",
"nock": "^12.0.2",
"ts-node": "^10.7.0",
"typescript": "^4.6.4"
Expand Down
2 changes: 2 additions & 0 deletions .buildkite/pipelines/emergency_release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
env:
SKIP_NODE_SETUP: true
VERSION: ${BUILDKITE_COMMIT:0:12}
EMERGENCY_RELEASE_REMOTE_SERVICE_CONFIG: https://raw.githubusercontent.com/elastic/serverless-gitops/main/gen/gpctl/kibana/emergency.yaml

Expand All @@ -16,3 +17,4 @@ steps:
env:
REMOTE_SERVICE_CONFIG: "${EMERGENCY_RELEASE_REMOTE_SERVICE_CONFIG}"
SERVICE_COMMIT_HASH: "${VERSION}"
DRY_RUN: "${DRY_RUN:-false}"
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ steps:
queue: n2-4-virt
depends_on: build
timeout_in_minutes: 60
parallelism: 6
parallelism: 10
retry:
automatic:
- exit_status: '*'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ agents:
memory: "8G"

env:
SKIP_NODE_SETUP: true
TEAM_CHANNEL: "#kibana-mission-control"
ENVIRONMENT: ${ENVIRONMENT?}

Expand Down
Loading

0 comments on commit f6739dd

Please sign in to comment.