Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into feature/packaging-dra
Browse files Browse the repository at this point in the history
* 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)
  ...
  • Loading branch information
v1v committed Nov 7, 2022
2 parents 073bce3 + 657f66d commit 94ece03
Show file tree
Hide file tree
Showing 131 changed files with 2,093 additions and 1,605 deletions.
2 changes: 1 addition & 1 deletion .ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ pipeline {
cleanup {
notifyBuildResult(prComment: true,
analyzeFlakey: !isTag(), jobName: getFlakyJobName(withBranch: (isPR() ? env.CHANGE_TARGET : env.BRANCH_NAME)),
githubIssue: isBranch() && currentBuild.currentResult != "SUCCESS",
githubIssue: false, // Disable creating gh issues for build failures while the E2E tests are stabilized.
githubLabels: 'Team:Elastic-Agent-Control-Plane')
}
}
Expand Down
2 changes: 1 addition & 1 deletion .ci/schedule-daily.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pipeline {
stages {
stage('Nighly beats builds') {
steps {
runBuilds(quietPeriodFactor: 2000, branches: ['main', '8.<minor>', '8.<next-patch>', '7.<minor>'])
runBuilds(quietPeriodFactor: 2000, branches: ['main', '8.<minor>', '8.<next-patch>'])
}
}
}
Expand Down
91 changes: 91 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
# Configuration for probot-stale - https://github.com/probot/stale

# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 90

# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 90

# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
onlyLabels: []

# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels:
- flaky-test

# Set to true to ignore issues in a project (defaults to false)
exemptProjects: false

# Set to true to ignore issues in a milestone (defaults to false)
exemptMilestones: true

# Set to true to ignore issues with an assignee (defaults to false)
exemptAssignees: true

# Label to use when marking as stale
staleLabel: Stalled

# Comment to post when marking as stale. Set to `false` to disable
markComment: >
Hi!
We just realized that we haven't looked into this issue in a while. We're
sorry!
We're labeling this issue as `Stale` to make it hit our filters and
make sure we get back to it as soon as possible. In the meantime, it'd
be extremely helpful if you could take a look at it as well and confirm its
relevance. A simple comment with a nice emoji will be enough `:+1`.
Thank you for your contribution!
# Comment to post when removing the stale label.
# unmarkComment: >
# Your comment here.

# Comment to post when closing a stale Issue or Pull Request.
# closeComment: >
# Your comment here.

# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30

# Limit to only `issues` or `pulls`
# only: issues

# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
pulls:
daysUntilStale: 60
daysUntilClose: 30
markComment: >
Hi!
We just realized that we haven't looked into this PR in a while. We're
sorry!
We're labeling this issue as `Stale` to make it hit our filters and
make sure we get back to it as soon as possible. In the meantime, it'd
be extremely helpful if you could take a look at it as well and confirm its
relevance. A simple comment with a nice emoji will be enough `:+1`.
Thank you for your contribution!
closeComment: >
Hi!
This PR has been stale for a while and we're going to close it as part of
our cleanup procedure.
We appreciate your contribution and would like to apologize if we have not
been able to review it, due to the current heavy load of the team.
Feel free to re-open this PR if you think it should stay open and is worth rebasing.
Thank you for your contribution!
# issues:
# exemptLabels:
# - confirmed
53 changes: 53 additions & 0 deletions .github/workflows/add-issues-to-ingest-board.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Add issue to Platform Ingest project

on:
issues:
types:
- labeled

env:
INGEST_PROJECT_ID: 'PVT_kwDOAGc3Zs4AEzn4'
DATA_PLANE_LABEL: 'Team:Elastic-Agent-Data-Plane'
CONTROL_PLANE_LABEL: 'Team:Elastic-Agent-Control-Plane'
ELASTIC_AGENT_LABEL: 'Team:Elastic-Agent'
AREA_FIELD_ID: 'PVTSSF_lADOAGc3Zs4AEzn4zgEgZSo'
ELASTIC_AGENT_OPTION_ID: 'c1e1a30a'

jobs:
add_to_ingest_project:
runs-on: ubuntu-latest
steps:
- uses: octokit/graphql-action@v2.x
id: add_to_project
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
with:
query: |
# Variables have to be snake cased because of https://github.com/octokit/graphql-action/issues/164
mutation AddToIngestProject($project_id: ID!, $content_id: ID!) {
addProjectV2ItemById(input: { projectId: $project_id, contentId: $content_id }) {
item {
id
}
}
}
project_id: ${{ env.INGEST_PROJECT_ID }}
content_id: ${{ github.event.issue.node_id }}
env:
GITHUB_TOKEN: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
- uses: octokit/graphql-action@v2.x
id: set_elastic_agent_area
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
with:
query: |
mutation updateIngestArea($item_id: ID!, $project_id: ID!, $area_field_id: ID!, $area_id: String) {
updateProjectV2ItemFieldValue(
input: { itemId: $item_id, projectId: $project_id, fieldId: $area_field_id, value: { singleSelectOptionId: $area_id } }) {
clientMutationId
}
}
item_id: ${{ fromJSON(steps.add_to_project.outputs.data).addProjectV2ItemById.item.id }}
project_id: ${{ env.INGEST_PROJECT_ID }}
area_field_id: ${{ env.AREA_FIELD_ID }}
area_id: ${{ env.ELASTIC_AGENT_OPTION_ID }}
env:
GITHUB_TOKEN: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
17 changes: 17 additions & 0 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Changelog
on: [pull_request]

jobs:
fragments:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Fetch Go version from .go-version
run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
- uses: actions/setup-go@v3
with:
go-version: ${{ env.GO_VERSION }}
- name: check pr-has-fragment
run: |
GOBIN=$PWD/bin go install github.com/elastic/elastic-agent-changelog-tool@latest
./bin/elastic-agent-changelog-tool pr-has-fragment --repo ${{ github.event.repository.name }} ${{github.event.number}}
8 changes: 4 additions & 4 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ jobs:
name: lint
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

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

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

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

# Give the job more time to execute.
# Regarding `--whole-files`, the linter is supposed to support linting of changed a patch only but,
Expand Down
93 changes: 0 additions & 93 deletions .github/workflows/qa-labels.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.18.6
1.18.7
Loading

0 comments on commit 94ece03

Please sign in to comment.