Skip to content

Commit 8340a40

Browse files
committed
Resolve merge conflicts and add ILM policy for user and device data streams
2 parents e8b87ec + c1f8d2e commit 8340a40

File tree

1,411 files changed

+108883
-22914
lines changed

Some content is hidden

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

1,411 files changed

+108883
-22914
lines changed

.buildkite/pipeline.schedule-daily.yml

Lines changed: 2 additions & 2 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.4-SNAPSHOT
37+
STACK_VERSION: 8.19.5-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.4-SNAPSHOT
51+
STACK_VERSION: 8.19.5-SNAPSHOT
5252
STACK_LOGSDB_ENABLED: "true"
5353
PUBLISH_COVERAGE_REPORTS: "false"
5454
depends_on:

.buildkite/pipeline.schedule-weekly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ steps:
2121
env:
2222
SERVERLESS: "false"
2323
FORCE_CHECK_ALL: "true"
24-
STACK_VERSION: 8.19.4-SNAPSHOT
24+
STACK_VERSION: 8.19.5-SNAPSHOT
2525
PUBLISH_COVERAGE_REPORTS: "false"
2626
ELASTIC_PACKAGE_DISABLE_ELASTIC_AGENT_WOLFI: "true"
2727
depends_on:

.buildkite/pipeline.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -103,21 +103,6 @@ steps:
103103
build.env('BUILDKITE_PULL_REQUEST') != "false" &&
104104
build.env('BUILDKITE_PIPELINE_SLUG') == "integrations"
105105
106-
- label: ":sonarqube: Continuous Code Inspection"
107-
soft_fail: true # FIXME: Coverage is failing, remove this after solving the issue
108-
timeout_in_minutes: 120
109-
env:
110-
VAULT_SONAR_TOKEN_PATH: "kv/ci-shared/platform-ingest/elastic/integrations/sonar-analyze-token"
111-
agents:
112-
image: "docker.elastic.co/cloud-ci/sonarqube/buildkite-scanner:latest"
113-
cpu: "8"
114-
memory: "4G"
115-
command: ".buildkite/scripts/run_sonar_scanner.sh"
116-
artifact_paths:
117-
- build/test-coverage/coverage_merged.xml
118-
if: |
119-
build.env('BUILDKITE_PIPELINE_SLUG') == "integrations"
120-
121106
- label: ":junit: Junit annotate"
122107
agents:
123108
# requires at least "bash", "curl" and "git"

.buildkite/scripts/run_sonar_scanner.sh

Lines changed: 0 additions & 42 deletions
This file was deleted.

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/packages/activemq @elastic/obs-infraobs-integrations
1515
/packages/admin_by_request_epm @elastic/security-service-integrations
1616
/packages/airflow @elastic/obs-infraobs-integrations
17+
/packages/airlock_digital @elastic/security-service-integrations
1718
/packages/akamai @elastic/security-service-integrations
1819
/packages/amazon_security_lake @elastic/security-service-integrations
1920
/packages/apache @elastic/obs-infraobs-integrations
@@ -190,6 +191,7 @@
190191
/packages/cyberark_pta @elastic/security-service-integrations
191192
/packages/cyberarkpas @elastic/security-service-integrations
192193
/packages/cybereason @elastic/security-service-integrations
194+
/packages/cyera @elastic/security-service-integrations
193195
/packages/cylance @elastic/security-service-integrations
194196
/packages/darktrace @elastic/security-service-integrations
195197
/packages/ded @elastic/ml-ui @elastic/sec-applied-ml
@@ -269,6 +271,7 @@
269271
/packages/hta @elastic/sec-applied-ml
270272
/packages/http_endpoint @elastic/security-service-integrations
271273
/packages/httpjson @elastic/security-service-integrations
274+
/packages/ibm_qradar @elastic/security-service-integrations
272275
/packages/ibmmq @elastic/obs-infraobs-integrations
273276
/packages/iis @elastic/obs-infraobs-integrations
274277
/packages/iis_otel @elastic/obs-infraobs-integrations
@@ -293,6 +296,7 @@
293296
/packages/juniper_srx @elastic/integration-experience
294297
/packages/kafka @elastic/obs-infraobs-integrations
295298
/packages/kafka_log @elastic/obs-infraobs-integrations
299+
/packages/keeper_security_siem_integration @elastic/security-service-integrations
296300
/packages/keycloak @elastic/security-service-integrations
297301
/packages/kibana @elastic/stack-monitoring
298302
/packages/kubernetes @elastic/obs-ds-hosted-services

.github/ISSUE_TEMPLATE/integration_bug.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ body:
2020
- ActiveMQ [activemq]
2121
- Admin By Request EPM [admin_by_request_epm]
2222
- Airflow [airflow]
23+
- Airlock Digital [airlock_digital]
2324
- Akamai [akamai]
2425
- AlienVault OTX [ti_otx]
2526
- Amazon Bedrock [aws_bedrock]
@@ -132,6 +133,7 @@ body:
132133
- Cyberark Privileged Threat Analytics [cyberark_pta]
133134
- Cybereason [cybereason]
134135
- Cybersixgill [ti_cybersixgill]
136+
- Cyera [cyera]
135137
- CylanceProtect Logs (Deprecated) [cylance]
136138
- Cyware Intel Exchange [ti_cyware_intel_exchange]
137139
- Darktrace [darktrace]
@@ -214,6 +216,7 @@ body:
214216
- Juniper NetScreen (Deprecated) [juniper_netscreen]
215217
- Juniper SRX [juniper_srx]
216218
- Kafka [kafka]
219+
- Keeper Security [keeper_security_siem_integration]
217220
- Keycloak [keycloak]
218221
- Kibana [kibana]
219222
- Kubernetes OpenTelemetry Assets [kubernetes_otel]

.github/ISSUE_TEMPLATE/integration_feature_request.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ body:
2020
- ActiveMQ [activemq]
2121
- Admin By Request EPM [admin_by_request_epm]
2222
- Airflow [airflow]
23+
- Airlock Digital [airlock_digital]
2324
- Akamai [akamai]
2425
- AlienVault OTX [ti_otx]
2526
- Amazon Bedrock [aws_bedrock]
@@ -132,6 +133,7 @@ body:
132133
- Cyberark Privileged Threat Analytics [cyberark_pta]
133134
- Cybereason [cybereason]
134135
- Cybersixgill [ti_cybersixgill]
136+
- Cyera [cyera]
135137
- CylanceProtect Logs (Deprecated) [cylance]
136138
- Cyware Intel Exchange [ti_cyware_intel_exchange]
137139
- Darktrace [darktrace]
@@ -214,6 +216,7 @@ body:
214216
- Juniper NetScreen (Deprecated) [juniper_netscreen]
215217
- Juniper SRX [juniper_srx]
216218
- Kafka [kafka]
219+
- Keeper Security [keeper_security_siem_integration]
217220
- Keycloak [keycloak]
218221
- Kibana [kibana]
219222
- Kubernetes OpenTelemetry Assets [kubernetes_otel]

.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@v5
2626

2727
- name: Install Updatecli in the runner
28-
uses: updatecli/updatecli-action@0224b21c3687ac1a7510298d58c9a42db84e5814 #v2.92.0
28+
uses: updatecli/updatecli-action@57aa8966d4d775cb1420b90c270ba97a4b5abe47 #v2.93.0
2929

3030
- name: Select diff action
3131
if: ${{ github.event_name == 'pull_request' }}
Lines changed: 217 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,217 @@
1+
name: Documentation edit helper
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- synchronize
8+
paths:
9+
- 'packages/*/_dev/build/docs/README.md'
10+
11+
jobs:
12+
help-with-docs:
13+
if: |
14+
github.actor != 'github-actions[bot]' &&
15+
(startsWith(github.head_ref, 'docs-enhancement/') || startsWith(github.head_ref, 'docs-bugfix/'))
16+
runs-on: ubuntu-latest
17+
permissions:
18+
contents: read
19+
pull-requests: write
20+
21+
steps:
22+
- name: Checkout repository
23+
uses: actions/checkout@v5
24+
25+
- name: Analyze documentation changes and generate commands
26+
id: analyze
27+
env:
28+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
29+
run: |
30+
echo "🔍 Analyzing documentation changes..."
31+
32+
PR_NUMBER=${{ github.event.pull_request.number }}
33+
34+
# Get changed files directly from PR
35+
if ! PR_FILES=$(gh pr view $PR_NUMBER --json files -q '.files[].path' 2>/dev/null); then
36+
echo "Error: Failed to fetch PR files"
37+
exit 1
38+
fi
39+
CHANGED_DOCS=$(echo "$PR_FILES" | grep '^packages/.*/_dev/build/docs/README\.md$' || true)
40+
41+
if [ -z "$CHANGED_DOCS" ]; then
42+
echo "no_docs_changes=true" >> $GITHUB_OUTPUT
43+
exit 0
44+
fi
45+
46+
# Determine change type from branch name
47+
CHANGE_TYPE="enhancement"
48+
VERSION_BUMP="minor"
49+
LABEL="enhancement"
50+
if [[ "${{ github.head_ref }}" =~ ^docs-bugfix/ ]]; then
51+
CHANGE_TYPE="bugfix"
52+
VERSION_BUMP="patch"
53+
LABEL="bugfix"
54+
fi
55+
56+
# Get custom changelog description from PR body
57+
if ! PR_BODY=$(gh pr view $PR_NUMBER --json body -q '.body // ""' 2>/dev/null); then
58+
echo "Warning: Failed to fetch PR body, using default changelog description"
59+
PR_BODY=""
60+
fi
61+
62+
CHANGELOG_DESC="Improve documentation"
63+
if [ "$CHANGE_TYPE" = "bugfix" ]; then
64+
CHANGELOG_DESC="Fix documentation"
65+
fi
66+
67+
# Check for custom changelog description in PR body
68+
if echo "$PR_BODY" | grep -qi "^changelog:"; then
69+
CUSTOM_DESC=$(echo "$PR_BODY" | grep -i "^changelog:" | sed 's/^changelog://i' | xargs)
70+
if [ -n "$CUSTOM_DESC" ]; then
71+
# Escape quotes and special characters for safe command generation
72+
CHANGELOG_DESC=$(echo "$CUSTOM_DESC" | sed 's/"/\\"/g' | sed "s/'/\\'/g")
73+
fi
74+
fi
75+
76+
echo "change_type=$CHANGE_TYPE" >> $GITHUB_OUTPUT
77+
echo "version_bump=$VERSION_BUMP" >> $GITHUB_OUTPUT
78+
echo "label=$LABEL" >> $GITHUB_OUTPUT
79+
echo "changelog_desc=$CHANGELOG_DESC" >> $GITHUB_OUTPUT
80+
81+
# Get all changed files from PR to check what's already updated
82+
# Reuse the PR_FILES we already fetched to avoid another API call
83+
ALL_CHANGED_FILES="$PR_FILES"
84+
85+
# Find packages that need updates vs already done
86+
PACKAGES_NEEDING_UPDATE=""
87+
PACKAGES_ALREADY_DONE=""
88+
89+
while IFS= read -r doc_file; do
90+
[ -z "$doc_file" ] && continue
91+
92+
PACKAGE=$(echo "$doc_file" | sed 's|^packages/\([^/]*\)/.*|\1|')
93+
94+
# Check if manifest.yml or changelog.yml are in the changed files
95+
MANIFEST_CHANGED=$(echo "$ALL_CHANGED_FILES" | grep "^packages/$PACKAGE/manifest.yml$" || true)
96+
CHANGELOG_CHANGED=$(echo "$ALL_CHANGED_FILES" | grep "^packages/$PACKAGE/changelog.yml$" || true)
97+
98+
if [ -z "$MANIFEST_CHANGED" ] && [ -z "$CHANGELOG_CHANGED" ]; then
99+
PACKAGES_NEEDING_UPDATE="$PACKAGES_NEEDING_UPDATE $PACKAGE"
100+
else
101+
PACKAGES_ALREADY_DONE="$PACKAGES_ALREADY_DONE $PACKAGE"
102+
fi
103+
104+
done <<< "$CHANGED_DOCS"
105+
106+
echo "packages_needing_update=$PACKAGES_NEEDING_UPDATE" >> $GITHUB_OUTPUT
107+
echo "packages_already_done=$PACKAGES_ALREADY_DONE" >> $GITHUB_OUTPUT
108+
109+
- name: Comment with exact commands (same-repo PRs)
110+
if: steps.analyze.outputs.packages_needing_update && github.event.pull_request.head.repo.fork == false
111+
env:
112+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
113+
run: |
114+
PACKAGES="${{ steps.analyze.outputs.packages_needing_update }}"
115+
CHANGE_TYPE="${{ steps.analyze.outputs.change_type }}"
116+
VERSION_BUMP="${{ steps.analyze.outputs.version_bump }}"
117+
CHANGELOG_DESC="${{ steps.analyze.outputs.changelog_desc }}"
118+
PR_NUMBER=${{ github.event.pull_request.number }}
119+
120+
# Create clean package list for the for loop
121+
PACKAGE_LIST=$(echo $PACKAGES | xargs)
122+
123+
# Safety check for empty package list
124+
if [ -z "$PACKAGE_LIST" ]; then
125+
echo "No packages found, skipping comment"
126+
exit 0
127+
fi
128+
129+
COMMENT_FILE=$(mktemp)
130+
{
131+
echo "Please run these commands to update changelogs and build docs:"
132+
echo ""
133+
echo '```bash'
134+
echo "for pkg in ${PACKAGE_LIST}; do"
135+
echo ' cd packages/$pkg'
136+
echo " elastic-package changelog add --type $CHANGE_TYPE --description \"$CHANGELOG_DESC\" --link \"https://github.com/${{ github.repository }}/pull/$PR_NUMBER\" --next $VERSION_BUMP"
137+
echo " elastic-package build"
138+
echo " cd ../.."
139+
echo "done"
140+
echo "git add -u"
141+
echo "git commit -m \"docs: update changelogs and build documentation\""
142+
echo "git push"
143+
echo '```'
144+
echo ""
145+
echo "Prerequisite: \`go install github.com/elastic/elastic-package\`"
146+
} > "$COMMENT_FILE"
147+
148+
if [ -n "${{ steps.analyze.outputs.packages_already_done }}" ]; then
149+
echo "" >> "$COMMENT_FILE"
150+
echo "Note: These packages already updated: \`${{ steps.analyze.outputs.packages_already_done }}\`" >> "$COMMENT_FILE"
151+
fi
152+
153+
if ! gh pr comment "$PR_NUMBER" --body-file "$COMMENT_FILE"; then
154+
{
155+
echo "## 📋 Documentation follow-up"
156+
echo
157+
cat "$COMMENT_FILE"
158+
} >> "$GITHUB_STEP_SUMMARY"
159+
fi
160+
161+
- name: Show commands in summary (fork PRs)
162+
if: steps.analyze.outputs.packages_needing_update && github.event.pull_request.head.repo.fork == true
163+
run: |
164+
PACKAGES="${{ steps.analyze.outputs.packages_needing_update }}"
165+
CHANGE_TYPE="${{ steps.analyze.outputs.change_type }}"
166+
VERSION_BUMP="${{ steps.analyze.outputs.version_bump }}"
167+
CHANGELOG_DESC="${{ steps.analyze.outputs.changelog_desc }}"
168+
PR_NUMBER=${{ github.event.pull_request.number }}
169+
170+
PACKAGE_LIST=$(echo $PACKAGES | xargs)
171+
172+
if [ -z "$PACKAGE_LIST" ]; then
173+
exit 0
174+
fi
175+
176+
{
177+
echo "## 📋 Documentation follow-up"
178+
echo ""
179+
echo "Please run these commands to update changelogs and build docs:"
180+
echo ""
181+
echo '```bash'
182+
echo "for pkg in ${PACKAGE_LIST}; do"
183+
echo ' cd packages/$pkg'
184+
echo " elastic-package changelog add --type $CHANGE_TYPE --description \"$CHANGELOG_DESC\" --link \"https://github.com/${{ github.repository }}/pull/$PR_NUMBER\" --next $VERSION_BUMP"
185+
echo " elastic-package build"
186+
echo " cd ../.."
187+
echo "done"
188+
echo "git add -u"
189+
echo "git commit -m \"docs: update changelogs and build documentation\""
190+
echo "git push"
191+
echo '```'
192+
echo ""
193+
echo "Prerequisite: \`go install github.com/elastic/elastic-package\`"
194+
if [ -n "${{ steps.analyze.outputs.packages_already_done }}" ]; then
195+
echo ""
196+
echo "Note: These packages already updated: \`${{ steps.analyze.outputs.packages_already_done }}\`"
197+
fi
198+
} >> "$GITHUB_STEP_SUMMARY"
199+
200+
- name: Add labels
201+
run: |
202+
echo "Please add the following labels — '${{ steps.analyze.outputs.label }}' and 'documentation'" >> "$GITHUB_STEP_SUMMARY"
203+
204+
- name: Handle edge cases
205+
if: steps.analyze.outputs.no_docs_changes == 'true' || (steps.analyze.outputs.packages_needing_update == '' && steps.analyze.outputs.packages_already_done != '')
206+
run: |
207+
if [ "${{ steps.analyze.outputs.no_docs_changes }}" = "true" ]; then
208+
MESSAGE="No documentation files (packages/*/_dev/build/docs/README.md) were changed in this PR."
209+
else
210+
MESSAGE="All packages with documentation changes already have updated changelogs and manifests."
211+
fi
212+
213+
echo "## 📚 Documentation Status
214+
215+
$MESSAGE
216+
217+
Your PR is ready for review! 🎉" >> "$GITHUB_STEP_SUMMARY"

0 commit comments

Comments
 (0)