Skip to content

Commit 94ece03

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feature/packaging-dra
* upstream/main: (63 commits) [Automation] Update elastic stack version to 8.6.0-f20b7179 for testing (elastic#1692) Remove non-agent Dockerfile templates. (elastic#1539) [Automation] Update elastic stack version to 8.6.0-3f5f98b7 for testing (elastic#1685) [Automation] Update elastic stack version to 8.6.0-8a615646 for testing (elastic#1682) Disable creating GH issues for build failures. (elastic#1677) [Automation] Update elastic stack version to 8.6.0-4765d2b0 for testing (elastic#1674) Generate the consolidated 8.5.0 changelog. (elastic#1642) (elastic#1670) [Automation] Update elastic stack version to 8.6.0-26dc1164 for testing (elastic#1660) Update node version to 18.12.0 on complete image (elastic#1657) [Automation] Update elastic stack version to 8.6.0-949a38d2 for testing (elastic#1647) [Automation] Add GH action to add issues to ingest board (elastic#1629) [Automation] Update elastic stack version to 8.6.0-89d224d2 for testing (elastic#1633) Improve shutdown logs (elastic#1618) [Automation] Update elastic stack version to 8.6.0-a892f234 for testing (elastic#1621) Create stale config (elastic#1607) [Automation] Update elastic stack version to 8.6.0-b8b35931 for testing (elastic#1602) Fix: Windows Agent Left Unhealthy After Removing Endpoint Integration (elastic#1286) [automation] Publish kubernetes templates for elastic-agent (elastic#1594) [Automation] Update elastic stack version to 8.6.0-22d60ec9 for testing (elastic#1587) [Automation] Update elastic stack version to 8.6.0-baf193e8 for testing (elastic#1579) ...
2 parents 073bce3 + 657f66d commit 94ece03

File tree

131 files changed

+2093
-1605
lines changed

Some content is hidden

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

131 files changed

+2093
-1605
lines changed

.ci/Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ pipeline {
424424
cleanup {
425425
notifyBuildResult(prComment: true,
426426
analyzeFlakey: !isTag(), jobName: getFlakyJobName(withBranch: (isPR() ? env.CHANGE_TARGET : env.BRANCH_NAME)),
427-
githubIssue: isBranch() && currentBuild.currentResult != "SUCCESS",
427+
githubIssue: false, // Disable creating gh issues for build failures while the E2E tests are stabilized.
428428
githubLabels: 'Team:Elastic-Agent-Control-Plane')
429429
}
430430
}

.ci/schedule-daily.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pipeline {
2020
stages {
2121
stage('Nighly beats builds') {
2222
steps {
23-
runBuilds(quietPeriodFactor: 2000, branches: ['main', '8.<minor>', '8.<next-patch>', '7.<minor>'])
23+
runBuilds(quietPeriodFactor: 2000, branches: ['main', '8.<minor>', '8.<next-patch>'])
2424
}
2525
}
2626
}

.github/stale.yml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# Configuration for probot-stale - https://github.com/probot/stale
2+
3+
# Number of days of inactivity before an Issue or Pull Request becomes stale
4+
daysUntilStale: 90
5+
6+
# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
7+
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
8+
daysUntilClose: 90
9+
10+
# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
11+
onlyLabels: []
12+
13+
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
14+
exemptLabels:
15+
- flaky-test
16+
17+
# Set to true to ignore issues in a project (defaults to false)
18+
exemptProjects: false
19+
20+
# Set to true to ignore issues in a milestone (defaults to false)
21+
exemptMilestones: true
22+
23+
# Set to true to ignore issues with an assignee (defaults to false)
24+
exemptAssignees: true
25+
26+
# Label to use when marking as stale
27+
staleLabel: Stalled
28+
29+
# Comment to post when marking as stale. Set to `false` to disable
30+
markComment: >
31+
Hi!
32+
33+
We just realized that we haven't looked into this issue in a while. We're
34+
sorry!
35+
36+
37+
We're labeling this issue as `Stale` to make it hit our filters and
38+
make sure we get back to it as soon as possible. In the meantime, it'd
39+
be extremely helpful if you could take a look at it as well and confirm its
40+
relevance. A simple comment with a nice emoji will be enough `:+1`.
41+
42+
Thank you for your contribution!
43+
44+
# Comment to post when removing the stale label.
45+
# unmarkComment: >
46+
# Your comment here.
47+
48+
# Comment to post when closing a stale Issue or Pull Request.
49+
# closeComment: >
50+
# Your comment here.
51+
52+
# Limit the number of actions per hour, from 1-30. Default is 30
53+
limitPerRun: 30
54+
55+
# Limit to only `issues` or `pulls`
56+
# only: issues
57+
58+
# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
59+
pulls:
60+
daysUntilStale: 60
61+
daysUntilClose: 30
62+
markComment: >
63+
Hi!
64+
65+
We just realized that we haven't looked into this PR in a while. We're
66+
sorry!
67+
68+
69+
We're labeling this issue as `Stale` to make it hit our filters and
70+
make sure we get back to it as soon as possible. In the meantime, it'd
71+
be extremely helpful if you could take a look at it as well and confirm its
72+
relevance. A simple comment with a nice emoji will be enough `:+1`.
73+
74+
Thank you for your contribution!
75+
76+
closeComment: >
77+
Hi!
78+
79+
This PR has been stale for a while and we're going to close it as part of
80+
our cleanup procedure.
81+
82+
We appreciate your contribution and would like to apologize if we have not
83+
been able to review it, due to the current heavy load of the team.
84+
85+
Feel free to re-open this PR if you think it should stay open and is worth rebasing.
86+
87+
Thank you for your contribution!
88+
89+
# issues:
90+
# exemptLabels:
91+
# - confirmed
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Add issue to Platform Ingest project
2+
3+
on:
4+
issues:
5+
types:
6+
- labeled
7+
8+
env:
9+
INGEST_PROJECT_ID: 'PVT_kwDOAGc3Zs4AEzn4'
10+
DATA_PLANE_LABEL: 'Team:Elastic-Agent-Data-Plane'
11+
CONTROL_PLANE_LABEL: 'Team:Elastic-Agent-Control-Plane'
12+
ELASTIC_AGENT_LABEL: 'Team:Elastic-Agent'
13+
AREA_FIELD_ID: 'PVTSSF_lADOAGc3Zs4AEzn4zgEgZSo'
14+
ELASTIC_AGENT_OPTION_ID: 'c1e1a30a'
15+
16+
jobs:
17+
add_to_ingest_project:
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: octokit/[email protected]
21+
id: add_to_project
22+
if: github.event.label.name == env.DATA_PLANE_LABEL || github.event.label.name == env.CONTROL_PLANE_LABEL || github.event.label.name == env.ELASTIC_AGENT_LABEL
23+
with:
24+
query: |
25+
# Variables have to be snake cased because of https://github.com/octokit/graphql-action/issues/164
26+
mutation AddToIngestProject($project_id: ID!, $content_id: ID!) {
27+
addProjectV2ItemById(input: { projectId: $project_id, contentId: $content_id }) {
28+
item {
29+
id
30+
}
31+
}
32+
}
33+
project_id: ${{ env.INGEST_PROJECT_ID }}
34+
content_id: ${{ github.event.issue.node_id }}
35+
env:
36+
GITHUB_TOKEN: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
37+
- uses: octokit/[email protected]
38+
id: set_elastic_agent_area
39+
if: github.event.label.name == env.DATA_PLANE_LABEL || github.event.label.name == env.CONTROL_PLANE_LABEL || github.event.label.name == env.ELASTIC_AGENT_LABEL
40+
with:
41+
query: |
42+
mutation updateIngestArea($item_id: ID!, $project_id: ID!, $area_field_id: ID!, $area_id: String) {
43+
updateProjectV2ItemFieldValue(
44+
input: { itemId: $item_id, projectId: $project_id, fieldId: $area_field_id, value: { singleSelectOptionId: $area_id } }) {
45+
clientMutationId
46+
}
47+
}
48+
item_id: ${{ fromJSON(steps.add_to_project.outputs.data).addProjectV2ItemById.item.id }}
49+
project_id: ${{ env.INGEST_PROJECT_ID }}
50+
area_field_id: ${{ env.AREA_FIELD_ID }}
51+
area_id: ${{ env.ELASTIC_AGENT_OPTION_ID }}
52+
env:
53+
GITHUB_TOKEN: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}

.github/workflows/changelog.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Changelog
2+
on: [pull_request]
3+
4+
jobs:
5+
fragments:
6+
runs-on: ubuntu-latest
7+
steps:
8+
- uses: actions/checkout@v3
9+
- name: Fetch Go version from .go-version
10+
run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
11+
- uses: actions/setup-go@v3
12+
with:
13+
go-version: ${{ env.GO_VERSION }}
14+
- name: check pr-has-fragment
15+
run: |
16+
GOBIN=$PWD/bin go install github.com/elastic/elastic-agent-changelog-tool@latest
17+
./bin/elastic-agent-changelog-tool pr-has-fragment --repo ${{ github.event.repository.name }} ${{github.event.number}}

.github/workflows/golangci-lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ jobs:
1818
name: lint
1919
runs-on: ${{ matrix.os }}
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
2222

2323
# Uses Go version from the repository.
2424
- name: Read .go-version file
2525
id: goversion
2626
run: echo "::set-output name=version::$(cat .go-version)"
2727

28-
- uses: actions/setup-go@v2
28+
- uses: actions/setup-go@v3
2929
with:
3030
go-version: "${{ steps.goversion.outputs.version }}"
3131

3232
- name: golangci-lint
33-
uses: golangci/golangci-lint-action@v2
33+
uses: golangci/golangci-lint-action@v3
3434
with:
3535
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
36-
version: v1.45.2
36+
version: v1.47.2
3737

3838
# Give the job more time to execute.
3939
# Regarding `--whole-files`, the linter is supposed to support linting of changed a patch only but,

.github/workflows/qa-labels.yml

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

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.18.6
1+
1.18.7

0 commit comments

Comments
 (0)