Skip to content

Commit 6c3b2c0

Browse files
committed
Merge branch 'var_groups' of github.com:seanrathier/integrations into var_groups
2 parents 4cc961c + 17e4347 commit 6c3b2c0

File tree

101 files changed

+6140
-527
lines changed

Some content is hidden

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

101 files changed

+6140
-527
lines changed

.buildkite/scripts/packages/security_detection_engine.sh

Lines changed: 57 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,48 @@ if [[ "${BUILDKITE_PULL_REQUEST}" == "false" ]]; then
66
exit 0
77
fi
88

9-
# Fetch active Kibana versions
10-
ACTIVE_KIBANA_VERSIONS=$(curl -sL https://raw.githubusercontent.com/elastic/kibana/main/versions.json | yq '.versions[].version' | xargs)
11-
echo "Active Kibana versions: $ACTIVE_KIBANA_VERSIONS"
9+
# Use Release API to get released and supported Elastic Stack versions
10+
PAST_RELEASES_URL="https://ela.st/past-stack-releases"
11+
PAST_VERSIONS=$(curl -sL $PAST_RELEASES_URL | jq -r '
12+
.releases
13+
| map(
14+
select(
15+
.is_end_of_support == false
16+
and .is_retired == false
17+
and (.version | test("^\\d+\\.\\d+\\.\\d+$"))
18+
)
19+
)
20+
| group_by(
21+
.version
22+
| capture("^(?<maj>\\d+)\\.(?<min>\\d+)")
23+
| "\(.maj).\(.min)"
24+
)
25+
| map(
26+
max_by(
27+
.version
28+
| split(".")
29+
| map(tonumber)
30+
)
31+
)
32+
| .[].version'
33+
)
34+
35+
FUTURE_RELEASES_URL="https://ela.st/future-stack-releases"
36+
FUTURE_VERSIONS=$(curl -sL $FUTURE_RELEASES_URL | jq -r '
37+
.releases[]
38+
| select(.active_release == true)
39+
| select(
40+
.snapshots
41+
| to_entries
42+
| any(.value.date_removed > (now | strftime("%Y-%m-%d %H:%M:%S")))
43+
)
44+
| "\(.version)-SNAPSHOT"
45+
'
46+
)
47+
48+
ACTIVE_VERSIONS="$(echo -e "${PAST_VERSIONS}\n${FUTURE_VERSIONS}" | sort -V | xargs)"
49+
50+
echo "Active Elastic Stack versions: $ACTIVE_VERSIONS"
1251

1352
# Extract version spec from the manifest
1453
KIBANA_REQ=$(yq .conditions.kibana.version ./packages/security_detection_engine/manifest.yml)
@@ -34,16 +73,27 @@ func main() {
3473
panic(err)
3574
}
3675
37-
for _, s := range strings.Split(os.Args[2], " ") {
38-
if v, _ := semver.NewVersion(s); c.Check(v) {
39-
fmt.Println(s + "-SNAPSHOT")
76+
for _, s := range strings.Split(os.Args[2], " ") {
77+
checkVersion := s
78+
79+
if strings.HasSuffix(s, "-SNAPSHOT") {
80+
checkVersion = strings.TrimSuffix(s, "-SNAPSHOT")
81+
}
82+
83+
v, err := semver.NewVersion(checkVersion)
84+
if err != nil {
85+
continue
86+
}
87+
88+
if c.Check(v) {
89+
fmt.Println(s)
4090
}
4191
}
4292
}
4393
GO
4494

4595
# Capture the "returned" array in STACK_VERSIONS
46-
read -r -a STACK_VERSIONS <<< "$(go run "${SEMVER_FILTER_PATH}" "${KIBANA_REQ}" "${ACTIVE_KIBANA_VERSIONS}" | xargs)"
96+
read -r -a STACK_VERSIONS <<< "$(go run "${SEMVER_FILTER_PATH}" "${KIBANA_REQ}" "${ACTIVE_VERSIONS}" | xargs)"
4797

4898
if [[ ! -n "${STACK_VERSIONS+x}" ]]; then
4999
echo "There are no active versions satisfying the constraint ${KIBANA_REQ}."

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
/packages/aws_securityhub @elastic/security-service-integrations
9393
/packages/aws_bedrock_agentcore @elastic/obs-infraobs-integrations
9494
/packages/aws_vpcflow_otel @elastic/obs-infraobs-integrations
95+
/packages/aws_waf_otel @elastic/obs-infraobs-integrations
9596
/packages/awsfargate @elastic/obs-infraobs-integrations
9697
/packages/awsfirehose @elastic/obs-ds-hosted-services
9798
/packages/azure @elastic/obs-infraobs-integrations @elastic/obs-ds-hosted-services @elastic/security-service-integrations
@@ -142,6 +143,7 @@
142143
/packages/beyondinsight_password_safe @elastic/security-service-integrations
143144
/packages/beyondtrust_pra @elastic/security-service-integrations
144145
/packages/bitdefender @elastic/security-service-integrations
146+
/packages/bitsight @elastic/security-service-integrations
145147
/packages/bitwarden @elastic/security-service-integrations
146148
/packages/blacklens @elastic/security-service-integrations
147149
/packages/bluecoat @elastic/integration-experience

.github/ISSUE_TEMPLATE/integration_bug.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ body:
153153
- EclecticIQ [ti_eclecticiq]
154154
- Elastic Agent [elastic_agent]
155155
- Elastic APM [apm]
156+
- Elastic Cloud Enterprise [ece]
156157
- Elastic Connectors [elastic_connectors]
157158
- Elastic Package Registry [elastic_package_registry]
158159
- Elastic Security [elastic_security]

.github/ISSUE_TEMPLATE/integration_feature_request.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ body:
153153
- EclecticIQ [ti_eclecticiq]
154154
- Elastic Agent [elastic_agent]
155155
- Elastic APM [apm]
156+
- Elastic Cloud Enterprise [ece]
156157
- Elastic Connectors [elastic_connectors]
157158
- Elastic Package Registry [elastic_package_registry]
158159
- Elastic Security [elastic_security]

packages/aws_waf_otel/LICENSE.txt

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Elastic License 2.0
2+
3+
URL: https://www.elastic.co/licensing/elastic-license
4+
5+
## Acceptance
6+
7+
By using the software, you agree to all of the terms and conditions below.
8+
9+
## Copyright License
10+
11+
The licensor grants you a non-exclusive, royalty-free, worldwide,
12+
non-sublicensable, non-transferable license to use, copy, distribute, make
13+
available, and prepare derivative works of the software, in each case subject to
14+
the limitations and conditions below.
15+
16+
## Limitations
17+
18+
You may not provide the software to third parties as a hosted or managed
19+
service, where the service provides users with access to any substantial set of
20+
the features or functionality of the software.
21+
22+
You may not move, change, disable, or circumvent the license key functionality
23+
in the software, and you may not remove or obscure any functionality in the
24+
software that is protected by the license key.
25+
26+
You may not alter, remove, or obscure any licensing, copyright, or other notices
27+
of the licensor in the software. Any use of the licensor’s trademarks is subject
28+
to applicable law.
29+
30+
## Patents
31+
32+
The licensor grants you a license, under any patent claims the licensor can
33+
license, or becomes able to license, to make, have made, use, sell, offer for
34+
sale, import and have imported the software, in each case subject to the
35+
limitations and conditions in this license. This license does not cover any
36+
patent claims that you cause to be infringed by modifications or additions to
37+
the software. If you or your company make any written claim that the software
38+
infringes or contributes to infringement of any patent, your patent license for
39+
the software granted under these terms ends immediately. If your company makes
40+
such a claim, your patent license ends immediately for work on behalf of your
41+
company.
42+
43+
## Notices
44+
45+
You must ensure that anyone who gets a copy of any part of the software from you
46+
also gets a copy of these terms.
47+
48+
If you modify the software, you must include in any modified copies of the
49+
software prominent notices stating that you have modified the software.
50+
51+
## No Other Rights
52+
53+
These terms do not imply any licenses other than those expressly granted in
54+
these terms.
55+
56+
## Termination
57+
58+
If you use the software in violation of these terms, such use is not licensed,
59+
and your licenses will automatically terminate. If the licensor provides you
60+
with a notice of your violation, and you cease all violation of this license no
61+
later than 30 days after you receive that notice, your licenses will be
62+
reinstated retroactively. However, if you violate these terms after such
63+
reinstatement, any additional violation of these terms will cause your licenses
64+
to terminate automatically and permanently.
65+
66+
## No Liability
67+
68+
*As far as the law allows, the software comes as is, without any warranty or
69+
condition, and the licensor will not be liable to you for any damages arising
70+
out of these terms or the use or nature of the software, under any kind of
71+
legal claim.*
72+
73+
## Definitions
74+
75+
The **licensor** is the entity offering these terms, and the **software** is the
76+
software the licensor makes available under these terms, including any portion
77+
of it.
78+
79+
**you** refers to the individual or entity agreeing to these terms.
80+
81+
**your company** is any legal entity, sole proprietorship, or other kind of
82+
organization that you work for, plus all organizations that have control over,
83+
are under the control of, or are under common control with that
84+
organization. **control** means ownership of substantially all the assets of an
85+
entity, or the power to direct its management and policies by vote, contract, or
86+
otherwise. Control can be direct or indirect.
87+
88+
**your licenses** are all the licenses granted to you for the software under
89+
these terms.
90+
91+
**use** means anything you do with the software requiring one of your licenses.
92+
93+
**trademark** means trademarks, service marks, and similar rights.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# newer versions go on top
2+
- version: "0.1.0"
3+
changes:
4+
- description: Initial draft of the AWS WAF Logs OpenTelemetry Assets package
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/15964
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# AWS Web Application Firewall (WAF) Logs OpenTelemetry Assets
2+
3+
## Overview
4+
5+
The AWS WAF OpenTelemetry Assets allow you to monitor [Amazon WAF logs](https://aws.amazon.com/waf/). With AWS WAF, you can protect your web applications from common exploits and monitor detailed logs of each web request inspected, including its action (allow, block, count), source, and matching rules.
6+
7+
The [EDOT Cloud Forwarder for AWS](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/aws) enables you to collect **WAF Logs** from Amazon S3 and forward them directly into Elastic Observability. Use this integration to visualize that data in Kibana, create alerts to notify you if something goes wrong, and reference logs when troubleshooting an issue.
8+
9+
## What do I need to use this integration?
10+
11+
You need an Elastic Observability project (**Serverless only**) for storing, analyzing, and visualizing your WAF logs.
12+
13+
From the AWS side, to collect WAF logs, you need:
14+
15+
- An S3 bucket for storing logs
16+
- AWS WAF logging enabled on your Web ACL to send logs to the S3 bucket
17+
18+
## How do I deploy this integration?
19+
20+
For step-by-step instructions on how to set up an EDOT Cloud Forwarder for AWS, refer to the
21+
[EDOT Cloud Forwarder for AWS](https://www.elastic.co/docs/reference/opentelemetry/edot-cloud-forwarder/aws) guide.
22+
23+
## Logs Reference
24+
25+
For a complete list of all available logs and their detailed descriptions, refer to:
26+
- [AWS WAF Logging Fields documentation](https://docs.aws.amazon.com/waf/latest/developerguide/logging-fields.html)
27+
- [OpenTelemetry AWS Logs encoding extension](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/encoding/awslogsencodingextension#aws-waf-log-record-fields)
Lines changed: 24 additions & 0 deletions
Loading
340 KB
Loading

0 commit comments

Comments
 (0)