Skip to content

Commit 6a6f6c2

Browse files
maxcoldmaxcold
committed
Merge branch 'main' into csp-add-wiz-misconfigruation-findings-transform
2 parents c75def5 + 7b14f75 commit 6a6f6c2

274 files changed

Lines changed: 18405 additions & 4142 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.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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" && build.env('STACK_LOGSDB_ENABLED') != "true"
106+
build.source == "trigger_job" && build.env('BUILDKITE_TRIGGERED_FROM_BUILD_PIPELINE_SLUG') == "integrations-schedule-daily"

‎.github/CODEOWNERS‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,13 @@
140140
/packages/cisco_secure_email_gateway @elastic/sec-deployment-and-devices
141141
/packages/cisco_secure_endpoint @elastic/security-service-integrations
142142
/packages/cisco_umbrella @elastic/security-service-integrations
143-
/packages/citrix_adc @elastic/obs-infraobs-integrations
143+
/packages/citrix_adc @elastic/obs-infraobs-integrations @elastic/sec-deployment-and-devices
144+
/packages/citrix_adc/data_stream/interface @elastic/obs-infraobs-integrations
145+
/packages/citrix_adc/data_stream/lbvserver @elastic/obs-infraobs-integrations
146+
/packages/citrix_adc/data_stream/log @elastic/sec-deployment-and-devices
147+
/packages/citrix_adc/data_stream/service @elastic/obs-infraobs-integrations
148+
/packages/citrix_adc/data_stream/system @elastic/obs-infraobs-integrations
149+
/packages/citrix_adc/data_stream/vpn @elastic/obs-infraobs-integrations
144150
/packages/citrix_waf @elastic/sec-deployment-and-devices
145151
/packages/claroty_ctd @elastic/security-service-integrations
146152
/packages/cloud_defend @elastic/sec-linux-platform
@@ -234,6 +240,8 @@
234240
/packages/iptables @elastic/sec-deployment-and-devices
235241
/packages/istio @elastic/obs-cloudnative-monitoring
236242
/packages/jamf_compliance_reporter @elastic/security-service-integrations
243+
/packages/jamf_pro @elastic/security-service-integrations
244+
/packages/jamf_protect @elastic/security-service-integrations
237245
/packages/jolokia_input @elastic/obs-infraobs-integrations
238246
/packages/journald @elastic/elastic-agent-data-plane
239247
/packages/jumpcloud @elastic/security-service-integrations
@@ -419,4 +427,3 @@
419427
/packages/zoom @elastic/security-service-integrations
420428
/packages/zscaler_zia @elastic/security-service-integrations
421429
/packages/zscaler_zpa @elastic/security-service-integrations
422-
/packages/jamf_protect @elastic/security-service-integrations

‎.github/ISSUE_TEMPLATE/integration_bug.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ body:
151151
- Iptables [iptables]
152152
- Istio [istio]
153153
- Jamf Compliance Reporter [jamf_compliance_reporter]
154+
- Jamf Pro [jamf_pro]
154155
- Jamf Protect [jamf_protect]
155156
- Jolokia Input [jolokia_input]
156157
- Custom Journald logs [journald]

‎.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@v4
2626

2727
- name: Install Updatecli in the runner
28-
uses: updatecli/updatecli-action@d0950ebbe80f4f80c3392b288d6a218fae872f69 #v2.66.0
28+
uses: updatecli/updatecli-action@6b8881a17fc8038e884ec94ff72a49e8e8a4069f #v2.67.0
2929

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

‎.mergify.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
queue_rules:
22
- name: default
3+
merge_method: squash
34
conditions:
45
- check-success=integrations/pr-merge
56

@@ -12,5 +13,4 @@ pull_request_rules:
1213
- author~=^dependabot(|-preview)\[bot\]$
1314
actions:
1415
queue:
15-
method: squash
1616
name: default

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ Elastic Packages have a certain, well-defined structure. This structure is descr
1010

1111
While this repository contains _sources_ for Elastic Integrations, _built_ Elastic Integrations are published into a storage based on Google Cloud bucket (more info [here](https://github.com/elastic/elastic-package/blob/85d6fcacad736e543e459a044a5e0fa48b5d43c6/docs/howto/use_package_storage_v2.md)) and served up via the [Package Registry](#package-registry). The Fleet UI in Kibana connects to the Package Registry and allows users to discover, install, and configure Elastic Packages.
1212

13+
## Documentation
14+
Public documentation is compiled and exported to our [Elastic docs](https://www.elastic.co/docs/current/integrations).
15+
1316
## Contributing
1417

1518
Please review the [Contributing Guide](CONTRIBUTING.md) to learn how to build and develop packages, understand the release procedure and

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ toolchain go1.22.5
77
require (
88
github.com/blang/semver v3.5.1+incompatible
99
github.com/cli/go-gh/v2 v2.9.0
10-
github.com/elastic/elastic-package v0.103.0
10+
github.com/elastic/elastic-package v0.104.0
1111
github.com/elastic/go-licenser v0.4.2
12-
github.com/elastic/package-registry v1.24.1
12+
github.com/elastic/package-registry v1.25.0
1313
github.com/magefile/mage v1.15.0
1414
github.com/pkg/errors v0.9.1
1515
github.com/stretchr/testify v1.9.0
16-
golang.org/x/tools v0.24.0
16+
golang.org/x/tools v0.25.0
1717
gopkg.in/yaml.v3 v3.0.1
1818
)
1919

@@ -142,7 +142,7 @@ require (
142142
github.com/pkg/xattr v0.4.10 // indirect
143143
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
144144
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
145-
github.com/prometheus/client_golang v1.20.2 // indirect
145+
github.com/prometheus/client_golang v1.20.3 // indirect
146146
github.com/prometheus/client_model v0.6.1 // indirect
147147
github.com/prometheus/common v0.55.0 // indirect
148148
github.com/prometheus/procfs v0.15.1 // indirect
@@ -181,9 +181,9 @@ require (
181181
go.starlark.net v0.0.0-20240725214946-42030a7cedce // indirect
182182
go.uber.org/multierr v1.11.0 // indirect
183183
go.uber.org/zap v1.27.0 // indirect
184-
golang.org/x/crypto v0.26.0 // indirect
184+
golang.org/x/crypto v0.27.0 // indirect
185185
golang.org/x/mod v0.21.0 // indirect
186-
golang.org/x/net v0.28.0 // indirect
186+
golang.org/x/net v0.29.0 // indirect
187187
golang.org/x/oauth2 v0.23.0 // indirect
188188
golang.org/x/sync v0.8.0 // indirect
189189
golang.org/x/sys v0.25.0 // indirect

‎go.sum‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
108108
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
109109
github.com/elastic/elastic-integration-corpus-generator-tool v0.10.0 h1:sx1lpZuTG5suJuvgix4FWQFCLFFbzkoOmPoHWYOPLCY=
110110
github.com/elastic/elastic-integration-corpus-generator-tool v0.10.0/go.mod h1:2/30n+2QRzRzus4TPVUV1T3U/j8g2ItUgvP0pcpjLGk=
111-
github.com/elastic/elastic-package v0.103.0 h1:iGfZCnt5jbBWvuwCAgqZ0aNCqgQhfrdaR5hwfoER0lQ=
112-
github.com/elastic/elastic-package v0.103.0/go.mod h1:X3pav1fywMMWSy+k5WsqxW4SItsCiYWC+kTymDnw+Cw=
111+
github.com/elastic/elastic-package v0.104.0 h1:OicSOpASVNoCa+EMqxP+edH5AvOfES4FmGirDnYqYSc=
112+
github.com/elastic/elastic-package v0.104.0/go.mod h1:2DDsLKQyN3paH60XGJQfulLYloLPVtu9vK+i2iFoNys=
113113
github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo=
114114
github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4=
115115
github.com/elastic/go-licenser v0.4.2 h1:bPbGm8bUd8rxzSswFOqvQh1dAkKGkgAmrPxbUi+Y9+A=
@@ -126,8 +126,8 @@ github.com/elastic/gojsonschema v1.2.1 h1:cUMbgsz0wyEB4x7xf3zUEvUVDl6WCz2RKcQPul
126126
github.com/elastic/gojsonschema v1.2.1/go.mod h1:biw5eBS2Z4T02wjATMRSfecfjCmwaDPvuaqf844gLrg=
127127
github.com/elastic/kbncontent v0.1.4 h1:GoUkJkqkn2H6iJTnOHcxEqYVVYyjvcebLQVaSR1aSvU=
128128
github.com/elastic/kbncontent v0.1.4/go.mod h1:kOPREITK9gSJsiw/WKe7QWSO+PRiZMyEFQCw+CMLAHI=
129-
github.com/elastic/package-registry v1.24.1 h1:NMZXrxjiZEFeLtjeuBjvPt8TSObA0y9jN1MhBH65uiU=
130-
github.com/elastic/package-registry v1.24.1/go.mod h1:mC4u1hZ88rfet1oLFIlfClVm6TCNlL21feWD1zlwWi4=
129+
github.com/elastic/package-registry v1.25.0 h1:41iQHERvcpPfdUTSYrw2Cfa0LtYWiEQgnTx6Qr6/Iro=
130+
github.com/elastic/package-registry v1.25.0/go.mod h1:wTbMbItNmw74Yfvk8OvRUFrta8ZsaTuKN4MSQ9DQpnE=
131131
github.com/elastic/package-spec/v3 v3.2.2 h1:ZVJxt4Icpys4sSI35tBKj/hlozdMQEcTBFnVb6hbNbE=
132132
github.com/elastic/package-spec/v3 v3.2.2/go.mod h1:RB/f2+00YBBMlFXF0DVHYv/znnmqkkZmD4F50azVRDE=
133133
github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
@@ -389,8 +389,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
389389
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
390390
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
391391
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
392-
github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg=
393-
github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
392+
github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4=
393+
github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
394394
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
395395
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
396396
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
@@ -510,8 +510,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
510510
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
511511
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
512512
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
513-
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
514-
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
513+
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
514+
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
515515
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
516516
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
517517
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -536,8 +536,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
536536
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
537537
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
538538
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
539-
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
540-
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
539+
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
540+
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
541541
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
542542
golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
543543
golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
@@ -600,8 +600,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
600600
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
601601
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
602602
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
603-
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
604-
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
603+
golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
604+
golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
605605
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
606606
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
607607
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎packages/apache/changelog.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "1.25.0"
3+
changes:
4+
- description: "Allow configuration of ignoring older events in apache access log datastream."
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/10809
27
- version: "1.24.0"
38
changes:
49
- description: "Allow @custom pipeline access to event.original without setting preserve_original_event."

‎packages/apache/data_stream/access/agent/stream/log.yml.hbs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ paths:
22
{{#each paths as |path i|}}
33
- {{path}}
44
{{/each}}
5+
{{#if ignore_older}}
6+
ignore_older: {{ignore_older}}
7+
{{/if}}
58
tags:
69
{{#if preserve_original_event}}
710
- preserve_original_event

0 commit comments

Comments
 (0)