-
Notifications
You must be signed in to change notification settings - Fork 528
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/chainguard-image
- Loading branch information
Showing
30 changed files
with
382 additions
and
379 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -93,13 +93,13 @@ jobs: | |
| ${{ env.KIBANA_CREDENTIALS_PATH }} kibana_url | KIBANA_ENDPOINT ; | ||
| ${{ env.KIBANA_CREDENTIALS_PATH }} kibana_dashboard_url | KIBANA_DASHBOARD_URL ; | ||
| - uses: elastic/apm-pipeline-library/.github/actions/docker-login@main | ||
| - name: Log in to the Elastic Container registry | ||
| uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0 | ||
| with: | ||
| registry: docker.elastic.co | ||
| secret: secret/observability-team/ci/docker-registry/prod | ||
| url: ${{ secrets.VAULT_ADDR }} | ||
| roleId: ${{ secrets.VAULT_ROLE_ID }} | ||
| secretId: ${{ secrets.VAULT_SECRET_ID }} | ||
| registry: ${{ secrets.ELASTIC_DOCKER_REGISTRY }} | ||
| username: ${{ secrets.ELASTIC_DOCKER_USERNAME }} | ||
| password: ${{ secrets.ELASTIC_DOCKER_PASSWORD }} | ||
|
|
||
| - uses: hashicorp/setup-terraform@v3 | ||
| with: | ||
| terraform_version: 1.3.7 | ||
|
|
@@ -166,23 +166,20 @@ jobs: | |
|
|
||
| # Notify failure to Slack only on schedule (nightly run) | ||
| - if: failure() && github.event_name == 'schedule' | ||
| uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current | ||
| uses: elastic/oblt-actions/slack/notify-[email protected] | ||
| with: | ||
| bot-token: ${{ secrets.SLACK_BOT_TOKEN }} | ||
| channel-id: "#apm-server" | ||
| message: | | ||
| Nightly APM Server benchmarks failed! SDH Duty assignee, please have a look and follow this <https://github.com/elastic/observability-dev/blob/main/docs/apm/apm-server/runbooks/benchmarks.md|Runbook>! | ||
| vaultUrl: ${{ secrets.VAULT_ADDR }} | ||
| vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} | ||
| vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} | ||
| slackChannel: '#apm-server' | ||
| # Notify result to Slack only on schedule (nightly run) | ||
| - if: github.event_name == 'schedule' | ||
| uses: elastic/apm-pipeline-library/.github/actions/slack-message@current | ||
| uses: slackapi/slack-github-action@70cd7be8e40a46e8b0eced40b0de447bdb42f68e # v1.26.0 | ||
| env: | ||
| SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }} | ||
| with: | ||
| url: ${{ secrets.VAULT_ADDR }} | ||
| roleId: ${{ secrets.VAULT_ROLE_ID }} | ||
| secretId: ${{ secrets.VAULT_SECRET_ID }} | ||
| channel: '#apm-server' | ||
| channel-id: "#apm-server" | ||
| payload: | | ||
| { | ||
| "blocks": [ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,21 +3,15 @@ name: prepare-release | |
| description: Common tasks for preparing minor and patch releases | ||
|
|
||
| inputs: | ||
| slack-bot-token: | ||
| description: 'The slack bot token' | ||
| required: true | ||
| type: | ||
| description: 'Release type (minor or patch)' | ||
| required: true | ||
| version: | ||
| description: 'The version' | ||
| required: true | ||
| vault-url: | ||
| description: 'Vault URL' | ||
| required: true | ||
| vault-role-id: | ||
| description: 'Vault role ID' | ||
| required: true | ||
| vault-secret-id: | ||
| description: 'Vault secret ID' | ||
| required: true | ||
|
|
||
| outputs: | ||
| release-branch: | ||
|
|
@@ -28,19 +22,17 @@ outputs: | |
| value: ${{ steps.generate.outputs.release-version }} | ||
| slack-thread: | ||
| description: "Slack thread id" | ||
| value: ${{ steps.slack-thread.outputs.threadTimestamp }} | ||
| value: ${{ steps.slack-thread.outputs.thread-timestamp }} | ||
|
|
||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: Send slack message when started | ||
| id: slack-thread | ||
| uses: elastic/apm-pipeline-library/.github/actions/slack-message@current | ||
| uses: elastic/oblt-actions/slack/[email protected] | ||
| with: | ||
| url: ${{ inputs.vault-url }} | ||
| roleId: ${{ inputs.vault-role-id }} | ||
| secretId: ${{ inputs.vault-secret-id }} | ||
| channel: ${{ env.SLACK_CHANNEL }} | ||
| bot-token: ${{ inputs.slack-bot-token }} | ||
| channel-id: ${{ env.SLACK_CHANNEL }} | ||
| message: ":wave: This is the thread for the ${{ inputs.type }} release `${{ github.repository }}@${{ env.VERSION }}`. (<${{ env.JOB_URL }}|workflow run>)" | ||
| env: | ||
| VERSION: ${{ inputs.version }} | ||
|
|
@@ -93,17 +85,15 @@ runs: | |
| env: | ||
| TAG: 'refs/tags/v${{ steps.generate.outputs.release-version }}' | ||
|
|
||
| - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current | ||
| if: failure() | ||
| - if: failure() | ||
| uses: elastic/oblt-actions/slack/[email protected] | ||
| with: | ||
| url: ${{ inputs.vault-url }} | ||
| roleId: ${{ inputs.vault-role-id }} | ||
| secretId: ${{ inputs.vault-secret-id }} | ||
| channel: ${{ env.SLACK_CHANNEL }} | ||
| threadTimestamp: ${{ steps.slack-thread.outputs.threadTimestamp || '' }} | ||
| bot-token: ${{ inputs.slack-bot-token }} | ||
| channel-id: ${{ env.SLACK_CHANNEL }} | ||
| message: |- | ||
| :fire: Something went wrong with the ${{ inputs.type }} release preparation. It failed with the below error message: | ||
| `${{ env.FAILURE_MESSAGE }}`. | ||
| See <${{ env.JOB_URL }}|logs>. | ||
| thread-timestamp: ${{ steps.slack-thread.outputs.thread-timestamp || '' }} | ||
| env: | ||
| JOB_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,9 +33,7 @@ jobs: | |
| - id: prepare | ||
| uses: ./.github/workflows/prepare-release | ||
| with: | ||
| vault-url: ${{ secrets.VAULT_ADDR }} | ||
| vault-role-id: ${{ secrets.VAULT_ROLE_ID }} | ||
| vault-secret-id: ${{ secrets.VAULT_SECRET_ID }} | ||
| slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }} | ||
| version: ${{ inputs.version }} | ||
| type: 'minor' | ||
|
|
||
|
|
@@ -49,16 +47,14 @@ jobs: | |
| contents: write | ||
| steps: | ||
|
|
||
| - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current | ||
| - uses: elastic/oblt-actions/slack/[email protected] | ||
| with: | ||
| url: ${{ secrets.VAULT_ADDR }} | ||
| roleId: ${{ secrets.VAULT_ROLE_ID }} | ||
| secretId: ${{ secrets.VAULT_SECRET_ID }} | ||
| channel: ${{ env.SLACK_CHANNEL }} | ||
| threadTimestamp: ${{ needs.prepare.outputs.slack-thread || '' }} | ||
| bot-token: ${{ secrets.SLACK_BOT_TOKEN }} | ||
| channel-id: ${{ env.SLACK_CHANNEL }} | ||
| message: |- | ||
| Feature freeze for `${{ github.repository }}@${{ env.RELEASE_VERSION }}` just started. | ||
| The `${{ github.repository }}@${{ env.RELEASE_BRANCH }}` branch will be created Today. | ||
| thread-timestamp: ${{ needs.prepare.outputs.slack-thread || '' }} | ||
|
|
||
| - uses: actions/checkout@v4 | ||
| with: | ||
|
|
@@ -83,25 +79,21 @@ jobs: | |
|
|
||
| - run: make minor-release | ||
|
|
||
| - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current | ||
| if: success() | ||
| - if: success() | ||
| uses: elastic/oblt-actions/slack/[email protected] | ||
| with: | ||
| url: ${{ secrets.VAULT_ADDR }} | ||
| roleId: ${{ secrets.VAULT_ROLE_ID }} | ||
| secretId: ${{ secrets.VAULT_SECRET_ID }} | ||
| channel: ${{ env.SLACK_CHANNEL }} | ||
| threadTimestamp: ${{ needs.prepare.outputs.slack-thread || '' }} | ||
| bot-token: ${{ secrets.SLACK_BOT_TOKEN }} | ||
| channel-id: ${{ env.SLACK_CHANNEL }} | ||
| message: |- | ||
| `${{ github.repository }}@${{ env.RELEASE_BRANCH }}` is now available. | ||
| The docs and other references are updated. You can start using it. | ||
| thread-timestamp: ${{ needs.prepare.outputs.slack-thread || '' }} | ||
|
|
||
| - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current | ||
| if: failure() | ||
| - if: failure() | ||
| uses: elastic/oblt-actions/slack/[email protected] | ||
| with: | ||
| url: ${{ secrets.VAULT_ADDR }} | ||
| roleId: ${{ secrets.VAULT_ROLE_ID }} | ||
| secretId: ${{ secrets.VAULT_SECRET_ID }} | ||
| channel: ${{ env.SLACK_CHANNEL }} | ||
| threadTimestamp: ${{ needs.prepare.outputs.slack-thread || '' }} | ||
| bot-token: ${{ secrets.SLACK_BOT_TOKEN }} | ||
| channel-id: ${{ env.SLACK_CHANNEL }} | ||
| message: |- | ||
| :fire: Something went wrong with the release. See <${{ env.JOB_URL }}|logs>. | ||
| thread-timestamp: ${{ needs.prepare.outputs.slack-thread || '' }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,9 +34,7 @@ jobs: | |
| - id: prepare | ||
| uses: ./.github/workflows/prepare-release | ||
| with: | ||
| vault-url: ${{ secrets.VAULT_ADDR }} | ||
| vault-role-id: ${{ secrets.VAULT_ROLE_ID }} | ||
| vault-secret-id: ${{ secrets.VAULT_SECRET_ID }} | ||
| slack-bot-token: ${{ secrets.SLACK_BOT_TOKEN }} | ||
| version: ${{ inputs.version }} | ||
| type: 'patch' | ||
|
|
||
|
|
@@ -74,25 +72,21 @@ jobs: | |
|
|
||
| - run: make patch-release | ||
|
|
||
| - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current | ||
| if: success() | ||
| - if: success() | ||
| uses: elastic/oblt-actions/slack/[email protected] | ||
| with: | ||
| url: ${{ secrets.VAULT_ADDR }} | ||
| roleId: ${{ secrets.VAULT_ROLE_ID }} | ||
| secretId: ${{ secrets.VAULT_SECRET_ID }} | ||
| channel: ${{ env.SLACK_CHANNEL }} | ||
| threadTimestamp: ${{ needs.prepare.outputs.slack-thread || '' }} | ||
| bot-token: ${{ secrets.SLACK_BOT_TOKEN }} | ||
| channel-id: ${{ env.SLACK_CHANNEL }} | ||
| message: |- | ||
| Feature freeze for `${{ github.repository }}@${{ env.RELEASE_VERSION }}` is Today. | ||
| All the relevant PRs and issues have been created. | ||
| thread-timestamp: ${{ needs.prepare.outputs.slack-thread || '' }} | ||
|
|
||
| - uses: elastic/apm-pipeline-library/.github/actions/slack-message@current | ||
| if: failure() | ||
| - if: failure() | ||
| uses: elastic/oblt-actions/slack/[email protected] | ||
| with: | ||
| url: ${{ secrets.VAULT_ADDR }} | ||
| roleId: ${{ secrets.VAULT_ROLE_ID }} | ||
| secretId: ${{ secrets.VAULT_SECRET_ID }} | ||
| channel: ${{ env.SLACK_CHANNEL }} | ||
| threadTimestamp: ${{ needs.prepare.outputs.slack-thread || '' }} | ||
| bot-token: ${{ secrets.SLACK_BOT_TOKEN }} | ||
| channel-id: ${{ env.SLACK_CHANNEL }} | ||
| message: |- | ||
| :fire: Something went wrong with the patch release. See <${{ env.JOB_URL }}|logs>. | ||
| thread-timestamp: ${{ needs.prepare.outputs.slack-thread || '' }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,10 +54,8 @@ jobs: | |
| uses: elastic/apm-pipeline-library/.github/actions/check-dependent-jobs@current | ||
| with: | ||
| needs: ${{ toJSON(needs) }} | ||
| - uses: elastic/apm-pipeline-library/.github/actions/notify-build-status@current | ||
| - uses: elastic/oblt-actions/slack/notify-[email protected] | ||
| with: | ||
| bot-token: ${{ secrets.SLACK_BOT_TOKEN }} | ||
| channel-id: "#apm-server" | ||
| status: ${{ steps.check.outputs.status }} | ||
| vaultUrl: ${{ secrets.VAULT_ADDR }} | ||
| vaultRoleId: ${{ secrets.VAULT_ROLE_ID }} | ||
| vaultSecretId: ${{ secrets.VAULT_SECRET_ID }} | ||
| slackChannel: "#apm-server" | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.