This repository has been archived by the owner on May 16, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into issue_267
# Conflicts: # metricbeat/tests/metricbeat_test.py
- Loading branch information
Showing
84 changed files
with
1,934 additions
and
113 deletions.
There are no files selected for viewing
39 changes: 39 additions & 0 deletions
39
.ci/jobs/elastic+helm-charts+master+integration-logstash.yml
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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| --- | ||
| - job: | ||
| name: elastic+helm-charts+master+integration-logstash | ||
| display-name: elastic / helm-charts - master - integration logstash | ||
| description: Master - integration logstash | ||
| scm: | ||
| - git: | ||
| wipe-workspace: 'True' | ||
| axes: | ||
| - axis: | ||
| type: slave | ||
| name: label | ||
| values: | ||
| - docker&&virtual | ||
| - axis: | ||
| type: yaml | ||
| name: LOGSTASH_SUITE | ||
| filename: helpers/matrix.yml | ||
| - axis: | ||
| type: yaml | ||
| name: KUBERNETES_VERSION | ||
| filename: helpers/matrix.yml | ||
| builders: | ||
| - shell: |- | ||
| #!/usr/local/bin/runbld | ||
| set -euo pipefail | ||
| source /usr/local/bin/bash_standard_lib.sh | ||
| set +x | ||
| VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") | ||
| export VAULT_TOKEN | ||
| unset VAULT_ROLE_ID VAULT_SECRET_ID | ||
| set -x | ||
| cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}" | ||
| cd helpers/terraform/ | ||
| ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${LOGSTASH_SUITE} CHART=logstash |
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
39 changes: 39 additions & 0 deletions
39
.ci/jobs/elastic+helm-charts+pull-request+integration-logstash.yml
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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| --- | ||
| - job: | ||
| name: elastic+helm-charts+pull-request+integration-logstash | ||
| display-name: elastic / helm-charts - pull-request - integration logstash | ||
| description: Pull request - integration logstash | ||
| scm: | ||
| - git: | ||
| refspec: +refs/pull/*:refs/remotes/origin/pr/* | ||
| axes: | ||
| - axis: | ||
| type: slave | ||
| name: label | ||
| values: | ||
| - docker&&virtual | ||
| - axis: | ||
| type: yaml | ||
| name: LOGSTASH_SUITE | ||
| filename: helpers/matrix.yml | ||
| - axis: | ||
| type: yaml | ||
| name: KUBERNETES_VERSION | ||
| filename: helpers/matrix.yml | ||
| builders: | ||
| - shell: |- | ||
| #!/usr/local/bin/runbld | ||
| set -euo pipefail | ||
| source /usr/local/bin/bash_standard_lib.sh | ||
| set +x | ||
| VAULT_TOKEN=$(retry 5 vault write -field=token auth/approle/login role_id="$VAULT_ROLE_ID" secret_id="$VAULT_SECRET_ID") | ||
| export VAULT_TOKEN | ||
| unset VAULT_ROLE_ID VAULT_SECRET_ID | ||
| set -x | ||
| cluster_name="helm-${KUBERNETES_VERSION//./}-${branch_specifier:0:10}" | ||
| cd helpers/terraform/ | ||
| ./in-docker make integration KUBERNETES_VERSION=${KUBERNETES_VERSION} CLUSTER_NAME=${cluster_name} SUITE=${LOGSTASH_SUITE} CHART=logstash |
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 |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| apiVersion: v1 | ||
| description: Official Elastic helm chart for Elasticsearch | ||
| home: https://github.com/elastic/helm-charts | ||
| maintainers: | ||
| - email: [email protected] | ||
| name: Elastic | ||
| name: elasticsearch | ||
| version: 7.4.0 | ||
| appVersion: 7.4.0 | ||
| version: 7.4.1 | ||
| appVersion: 7.4.1 | ||
| sources: | ||
| - https://github.com/elastic/elasticsearch | ||
| icon: https://helm.elastic.co/icons/elasticsearch.png |
Oops, something went wrong.