Skip to content

Commit f13edae

Browse files
haetamoudihaetamoudi
authored
Merge branch 'main' into test-elastic-package-pr-2063
2 parents 281be2b + 8616f26 commit f13edae

File tree

4,244 files changed

+157648
-268903
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,244 files changed

+157648
-268903
lines changed

‎.buildkite/pipeline.schedule-daily.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,19 @@ steps:
3838
- step: "check"
3939
allow_failure: false
4040

41+
- label: "Check integrations local stacks - Stack Version v8.16 - LogsDB"
42+
trigger: "integrations"
43+
build:
44+
env:
45+
SERVERLESS: "false"
46+
FORCE_CHECK_ALL: "true"
47+
STACK_VERSION: 8.16.0-SNAPSHOT
48+
STACK_LOGSDB_ENABLED: "true"
49+
PUBLISH_COVERAGE_REPORTS: "false"
50+
depends_on:
51+
- step: "check"
52+
allow_failure: false
53+
4154
- label: "Check integrations in serverless - project: Observability"
4255
key: "trigger-integrations-serverless-obs"
4356
trigger: "integrations-serverless"

‎.buildkite/pipeline.serverless.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ env:
2626
ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT: "true"
2727
# Set maximum number of parallel tests to run if package allows it
2828
ELASTIC_PACKAGE_MAXIMUM_NUMBER_PARALLEL_TESTS: "5"
29+
# Enable/Disable the usage of wolfi images for Elastic Agent
30+
ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI: "${ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI:-false}"
2931

3032
steps:
3133
- input: "Input values for the variables"

‎.buildkite/pipeline.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ env:
2626
ELASTIC_PACKAGE_TEST_ENABLE_INDEPENDENT_AGENT: "true"
2727
# Set maximum number of parallel tests to run if package allows it
2828
ELASTIC_PACKAGE_MAXIMUM_NUMBER_PARALLEL_TESTS: "5"
29-
# Disable the usage of wolfi images for Elastic Agent
30-
ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI: "${ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI:-true}"
29+
# Enable/Disable the usage of wolfi images for Elastic Agent
30+
ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI: "${ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI:-false}"
3131

3232
steps:
3333
- label: "Get reference from target branch"
@@ -103,4 +103,4 @@ steps:
103103
soft_fail: true
104104
# run this step when if it is triggered by the daily job
105105
if: >
106-
build.source == "trigger_job" && build.env('BUILDKITE_TRIGGERED_FROM_BUILD_PIPELINE_SLUG') == "integrations-schedule-daily"
106+
build.source == "trigger_job" && build.env('BUILDKITE_TRIGGERED_FROM_BUILD_PIPELINE_SLUG') == "integrations-schedule-daily" && build.env('STACK_LOGSDB_ENABLED') != "true"

‎.buildkite/scripts/common.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,10 @@ prepare_stack() {
503503
fi
504504
fi
505505

506+
if [ "${STACK_LOGSDB_ENABLED:-false}" == "true" ]; then
507+
args="${args} -U stack.logsdb_enabled=true"
508+
fi
509+
506510
echo "Boot up the Elastic stack"
507511
if ! ${ELASTIC_PACKAGE_BIN} stack up -d ${args} ; then
508512
return 1

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
/packages/cisco_umbrella @elastic/security-service-integrations
143143
/packages/citrix_adc @elastic/obs-infraobs-integrations
144144
/packages/citrix_waf @elastic/sec-deployment-and-devices
145+
/packages/claroty_ctd @elastic/security-service-integrations
145146
/packages/cloud_defend @elastic/sec-linux-platform
146147
/packages/cloud_security_posture @elastic/cloud-security-posture
147148
/packages/cloud_asset_inventory @elastic/cloud-security-posture
@@ -177,6 +178,7 @@
177178
/packages/falco @elastic/security-service-integrations
178179
/packages/fim @elastic/sec-linux-platform
179180
/packages/fireeye @elastic/security-service-integrations
181+
/packages/first_epss @elastic/security-service-integrations
180182
/packages/fleet_server @elastic/fleet
181183
/packages/forcepoint_web @elastic/security-service-integrations
182184
/packages/forgerock @elastic/security-service-integrations

‎.github/ISSUE_TEMPLATE/integration_bug.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ body:
7878
- Cisco Umbrella [cisco_umbrella]
7979
- Citrix ADC [citrix_adc]
8080
- Citrix Web App Firewall [citrix_waf]
81+
- Claroty CTD [claroty_ctd]
8182
- Cloud Asset Inventory [cloud_asset_inventory]
8283
- Defend for Containers [cloud_defend]
8384
- Security Posture Management [cloud_security_posture]

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.2
1+
1.22.6

‎dev/testsreporter/_static/summary.tmpl‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
{{ if .serverless -}}
55
- Serverless: {{ .serverlessProject}}
66
{{ end -}}
7+
{{ if .logsDB -}}
8+
- LogsDB: enabled
9+
{{ end -}}
710
- Package: {{ .packageName }}
811
- Failing test: {{ .testName }}
912
{{ if ne .dataStream "" -}}
@@ -14,4 +17,4 @@
1417
{{- range .owners }}
1518
- {{ . }}
1619
{{- end }}
17-
{{ end -}}
20+
{{ end -}}

‎dev/testsreporter/format.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ func (r ResultsFormatter) Summary() string {
3939
"stackVersion": r.result.StackVersion,
4040
"serverless": r.result.Serverless,
4141
"serverlessProject": r.result.ServerlessProject,
42+
"logsDB": r.result.LogsDB,
4243
"packageName": r.result.PackageName,
4344
"testName": r.result.Name,
4445
"dataStream": r.result.DataStream,

‎dev/testsreporter/format_test.go‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,24 @@ func TestSummary(t *testing.T) {
105105
expected: `- Serverless: observability
106106
- Package: foo
107107
- Failing test: mytest
108+
- Owners:
109+
- team1
110+
- team2
111+
`,
112+
},
113+
{
114+
title: "summary logsdb",
115+
packageError: PackageError{
116+
LogsDB: true,
117+
PackageName: "foo",
118+
testCase: testCase{
119+
Name: "mytest",
120+
},
121+
Teams: []string{"team1", "team2"},
122+
},
123+
expected: `- LogsDB: enabled
124+
- Package: foo
125+
- Failing test: mytest
108126
- Owners:
109127
- team1
110128
- team2

0 commit comments

Comments
 (0)