Skip to content

Commit 91b2643

Browse files
TackleboxTacklebox
authored
Merge branch 'main' into mborden/dashboard-links
2 parents 6bbed1c + c6e379d commit 91b2643

369 files changed

Lines changed: 30302 additions & 2511 deletions

File tree

Some content is hidden

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

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
env:
3535
SERVERLESS: "false"
3636
FORCE_CHECK_ALL: "true"
37-
STACK_VERSION: 8.19.12-SNAPSHOT
37+
STACK_VERSION: 8.19.15-SNAPSHOT
3838
PUBLISH_COVERAGE_REPORTS: "true"
3939
depends_on:
4040
- step: "check"
@@ -48,7 +48,7 @@ steps:
4848
env:
4949
SERVERLESS: "false"
5050
FORCE_CHECK_ALL: "true"
51-
STACK_VERSION: 8.19.12-SNAPSHOT
51+
STACK_VERSION: 8.19.15-SNAPSHOT
5252
STACK_LOGSDB_ENABLED: "true"
5353
PUBLISH_COVERAGE_REPORTS: "false"
5454
depends_on:
@@ -86,13 +86,13 @@ steps:
8686
if: |
8787
build.env('TEST_PACKAGES_BASIC_SUBSCRIPTION') == "true"
8888
89-
- label: "Check integrations local stacks - Stack Version v9.4"
89+
- label: "Check integrations local stacks - Stack Version v9.5"
9090
trigger: "integrations"
9191
build:
9292
env:
9393
SERVERLESS: "false"
9494
FORCE_CHECK_ALL: "true"
95-
STACK_VERSION: 9.4.0-SNAPSHOT
95+
STACK_VERSION: 9.5.0-SNAPSHOT
9696
PUBLISH_COVERAGE_REPORTS: "false"
9797
depends_on:
9898
- step: "check"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ steps:
2121
env:
2222
SERVERLESS: "false"
2323
FORCE_CHECK_ALL: "true"
24-
STACK_VERSION: 8.19.12-SNAPSHOT
24+
STACK_VERSION: 8.19.15-SNAPSHOT
2525
PUBLISH_COVERAGE_REPORTS: "false"
2626
ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI: "true"
2727
depends_on:
2828
- step: "check"
2929
allow_failure: false
3030

31-
- label: "Check integrations local stacks and non-wolfi images for Elastic Agent - Stack Version v9.4"
31+
- label: "Check integrations local stacks and non-wolfi images for Elastic Agent - Stack Version v9.5"
3232
trigger: "integrations"
3333
build:
3434
env:
3535
SERVERLESS: "false"
3636
FORCE_CHECK_ALL: "true"
37-
STACK_VERSION: 9.4.0-SNAPSHOT
37+
STACK_VERSION: 9.5.0-SNAPSHOT
3838
PUBLISH_COVERAGE_REPORTS: "false"
3939
ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI: "true"
4040
depends_on:

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
/packages/azure/data_stream/provisioning @elastic/obs-infraobs-integrations
113113
/packages/azure/data_stream/signinlogs @elastic/obs-infraobs-integrations
114114
/packages/azure/data_stream/springcloudlogs @elastic/obs-infraobs-integrations
115+
/packages/azure_activity_otel @elastic/obs-infraobs-integrations
115116
/packages/azure_ai_foundry @elastic/obs-infraobs-integrations
116117
/packages/azure_app_service @elastic/obs-infraobs-integrations
117118
/packages/azure_app_service/data_stream/app_service_logs @elastic/obs-infraobs-integrations
@@ -208,6 +209,7 @@
208209
/packages/cyera @elastic/security-service-integrations
209210
/packages/cylance @elastic/security-service-integrations
210211
/packages/darktrace @elastic/security-service-integrations
212+
/packages/dataminr_pulse @elastic/security-service-integrations
211213
/packages/ded @elastic/sec-applied-ml @elastic/kibana-management
212214
/packages/dga @elastic/sec-applied-ml
213215
/packages/digital_guardian @elastic/security-service-integrations
@@ -356,6 +358,7 @@
356358
/packages/microsoft_dnsserver @elastic/sec-windows-platform
357359
/packages/microsoft_exchange_online_message_trace @elastic/security-service-integrations
358360
/packages/microsoft_exchange_server @elastic/sec-windows-platform
361+
/packages/microsoft_intune @elastic/security-service-integrations
359362
/packages/microsoft_sentinel @elastic/security-service-integrations
360363
/packages/microsoft_sqlserver @elastic/obs-infraobs-integrations
361364
/packages/microsoft_sqlserver_otel @elastic/obs-infraobs-integrations
@@ -411,6 +414,7 @@
411414
/packages/prisma_access @elastic/integration-experience
412415
/packages/prisma_cloud @elastic/security-service-integrations
413416
/packages/problemchild @elastic/sec-applied-ml
417+
/packages/profiling_otel @elastic/ingest-otel-data
414418
/packages/profilingmetrics_otel @elastic/ingest-otel-data
415419
/packages/prometheus @elastic/obs-infraobs-integrations
416420
/packages/prometheus/data_stream/collector @elastic/obs-infraobs-integrations

‎.github/ISSUE_TEMPLATE/integration_bug.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ body:
154154
- Cyware Intel Exchange [ti_cyware_intel_exchange]
155155
- Darktrace [darktrace]
156156
- Data Exfiltration Detection [ded]
157+
- Dataminr Pulse [dataminr_pulse]
157158
- Defend for Containers (BETA) [cloud_defend]
158159
- Digital Guardian [digital_guardian]
159160
- Docker OpenTelemetry Assets [docker_otel]
@@ -281,6 +282,7 @@ body:
281282
- Microsoft Exchange Online Message Trace [microsoft_exchange_online_message_trace]
282283
- Microsoft Exchange Server [microsoft_exchange_server]
283284
- Microsoft Foundry [azure_ai_foundry]
285+
- Microsoft Intune [microsoft_intune]
284286
- Microsoft Office 365 Metrics [o365_metrics]
285287
- Microsoft Office 365 [o365]
286288
- Microsoft Sentinel [microsoft_sentinel]
@@ -319,6 +321,7 @@ body:
319321
- OpenCanary [opencanary]
320322
- OpenCTI [ti_opencti]
321323
- OpenTelemetry Collector Internal Telemetry [otel_collector_internal_telemetry]
324+
- OpenTelemetry Profiling [profiling_otel]
322325
- Oracle OpenTelemetry Assets [oracle_otel]
323326
- Oracle WebLogic [oracle_weblogic]
324327
- Oracle [oracle]

‎.github/ISSUE_TEMPLATE/integration_feature_request.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ body:
154154
- Cyware Intel Exchange [ti_cyware_intel_exchange]
155155
- Darktrace [darktrace]
156156
- Data Exfiltration Detection [ded]
157+
- Dataminr Pulse [dataminr_pulse]
157158
- Defend for Containers (BETA) [cloud_defend]
158159
- Digital Guardian [digital_guardian]
159160
- Docker OpenTelemetry Assets [docker_otel]
@@ -281,6 +282,7 @@ body:
281282
- Microsoft Exchange Online Message Trace [microsoft_exchange_online_message_trace]
282283
- Microsoft Exchange Server [microsoft_exchange_server]
283284
- Microsoft Foundry [azure_ai_foundry]
285+
- Microsoft Intune [microsoft_intune]
284286
- Microsoft Office 365 Metrics [o365_metrics]
285287
- Microsoft Office 365 [o365]
286288
- Microsoft Sentinel [microsoft_sentinel]
@@ -319,6 +321,7 @@ body:
319321
- OpenCanary [opencanary]
320322
- OpenCTI [ti_opencti]
321323
- OpenTelemetry Collector Internal Telemetry [otel_collector_internal_telemetry]
324+
- OpenTelemetry Profiling [profiling_otel]
322325
- Oracle OpenTelemetry Assets [oracle_otel]
323326
- Oracle WebLogic [oracle_weblogic]
324327
- Oracle [oracle]

‎.github/workflows/bump-elastic-stack-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/checkout@v6
2626

2727
- name: Install Updatecli in the runner
28-
uses: updatecli/updatecli-action@7aab164eed4ee3bb279611182ba1e62a3a867640 #v3.1.1
28+
uses: updatecli/updatecli-action@2c3221bc5f4499a99fec2c87d9de4a83cb30e990 #v3.1.3
2929

3030
- name: Select diff action
3131
if: ${{ github.event_name == 'pull_request' }}

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.25.8
1+
1.26.2

‎dev/citools/kibana.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
func KibanaConstraintPackage(path string) (*semver.Constraints, error) {
15-
manifest, err := readPackageManifest(path)
15+
manifest, err := ReadPackageManifest(path)
1616
if err != nil {
1717
return nil, fmt.Errorf("failed to read package manifest: %w", err)
1818
}

‎dev/citools/logsdb.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func IsVersionLessThanLogsDBGA(version *semver.Version) bool {
2121
}
2222

2323
func packageKibanaConstraint(path string) (*semver.Constraints, error) {
24-
manifest, err := readPackageManifest(path)
24+
manifest, err := ReadPackageManifest(path)
2525
if err != nil {
2626
return nil, err
2727
}

‎dev/citools/packagemanifest.go‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,19 @@ type conditions struct {
2828
}
2929

3030
type packageManifest struct {
31-
Name string `config:"name" json:"name" yaml:"name"`
32-
License string `config:"license" json:"license" yaml:"license"`
33-
Conditions conditions `config:"conditions" json:"conditions" yaml:"conditions"`
31+
FormatVersion string `config:"format_version" json:"format_version" yaml:"format_version"`
32+
Name string `config:"name" json:"name" yaml:"name"`
33+
Type string `config:"type" json:"type" yaml:"type"`
34+
Version string `config:"version" json:"version" yaml:"version"`
35+
License string `config:"license" json:"license" yaml:"license"`
36+
Conditions conditions `config:"conditions" json:"conditions" yaml:"conditions"`
3437
}
3538

36-
func readPackageManifest(path string) (*packageManifest, error) {
39+
func (m *packageManifest) IsValid() bool {
40+
return m.FormatVersion != "" && m.Name != "" && m.Type != "" && m.Version != ""
41+
}
42+
43+
func ReadPackageManifest(path string) (*packageManifest, error) {
3744
cfg, err := yaml.NewConfigWithFile(path, ucfg.PathSep("."))
3845
if err != nil {
3946
return nil, fmt.Errorf("reading file failed (path: %s): %w", path, err)

0 commit comments

Comments
 (0)