forked from elastic/beats
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cherry-pick elastic#16927 to 7.x: Fix issue when building Agent snaps…
…hot and enable building the agent. (elastic#17574) * Fix issue when building Agent snapshot and enable building the agent. (elastic#16927) An extension in the generated files ("SNAPSHOT") was preventing us to correctly generate the agent artifact with the packaged metricbeat/filebeat. Fixes: elastic#16908 (cherry picked from commit 62d3683) * [Agent] Fix installers (elastic#17077) [Agent] Fix installers for snapshots (elastic#17077) * [Agent] fixed mage package for agent (elastic#17368) [Agent] fixed mage package for agent (elastic#17368) * [Agent] Make default config OS agnostic (elastic#17016) [Agent] Make default config OS agnostic (elastic#17016) * [Agent] Docker image for integration tests (elastic#16898) [Agent] Docker image for integration tests (elastic#16898) Co-authored-by: Michal Pristas <michal.pristas@gmail.com>
- Loading branch information
1 parent
0921532
commit 284b202
Showing
27 changed files
with
337 additions
and
84 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
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
52 changes: 52 additions & 0 deletions
52
dev-tools/packaging/templates/docker/Dockerfile.agent.tmpl
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,52 @@ | ||
| {{- $beatHome := printf "%s/%s" "/usr/share" .BeatName }} | ||
| {{- $beatBinary := printf "%s/%s" $beatHome .BeatName }} | ||
| {{- $repoInfo := repo }} | ||
|
|
||
| FROM {{ .from }} | ||
|
|
||
| LABEL \ | ||
| org.label-schema.build-date="{{ date }}" \ | ||
| org.label-schema.schema-version="1.0" \ | ||
| org.label-schema.vendor="{{ .BeatVendor }}" \ | ||
| org.label-schema.license="{{ .License }}" \ | ||
| org.label-schema.name="{{ .BeatName }}" \ | ||
| org.label-schema.version="{{ beat_version }}" \ | ||
| org.label-schema.url="{{ .BeatURL }}" \ | ||
| org.label-schema.vcs-url="{{ $repoInfo.RootImportPath }}" \ | ||
| org.label-schema.vcs-ref="{{ commit }}" \ | ||
| license="{{ .License }}" \ | ||
| description="{{ .BeatDescription }}" | ||
|
|
||
| ENV ELASTIC_CONTAINER "true" | ||
| ENV PATH={{ $beatHome }}:$PATH | ||
|
|
||
| COPY beat {{ $beatHome }} | ||
| COPY docker-entrypoint /usr/local/bin/docker-entrypoint | ||
| RUN chmod 755 /usr/local/bin/docker-entrypoint | ||
|
|
||
| RUN groupadd --gid 1000 {{ .BeatName }} | ||
|
|
||
| RUN mkdir -p {{ $beatHome }}/data {{ $beatHome }}/logs && \ | ||
| chown -R root:{{ .BeatName }} {{ $beatHome }} && \ | ||
| find {{ $beatHome }} -type d -exec chmod 0750 {} \; && \ | ||
| find {{ $beatHome }} -type f -exec chmod 0640 {} \; && \ | ||
| chmod 0750 {{ $beatBinary }} && \ | ||
| {{- if .linux_capabilities }} | ||
| setcap {{ .linux_capabilities }} {{ $beatBinary }} && \ | ||
| {{- end }} | ||
| {{- range $i, $modulesd := .ModulesDirs }} | ||
| chmod 0770 {{ $beatHome}}/{{ $modulesd }} && \ | ||
| {{- end }} | ||
| chmod 0770 {{ $beatHome }}/data {{ $beatHome }}/logs | ||
|
|
||
| {{- if ne .user "root" }} | ||
| RUN useradd -M --uid 1000 --gid 1000 --home {{ $beatHome }} {{ .user }} | ||
| {{- end }} | ||
| USER {{ .user }} | ||
|
|
||
| {{- range $i, $port := .ExposePorts }} | ||
| EXPOSE {{ $port }} | ||
| {{- end }} | ||
|
|
||
| WORKDIR {{ $beatHome }} | ||
| ENTRYPOINT ["/usr/local/bin/docker-entrypoint"] |
55 changes: 55 additions & 0 deletions
55
dev-tools/packaging/templates/docker/docker-entrypoint.agent.tmpl
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,55 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -eo pipefail | ||
|
|
||
| # Environment variables used | ||
| # FLEET_ADMIN_PASSWORD - used for new fleet user [elastic] | ||
| # FLEET_ADMIN_USERNAME - used for new fleet user [changeme] | ||
| # FLEET_CONFIG_ID - config related to new token [defaul] | ||
| # FLEET_ENROLLMENT_TOKEN - existing enrollment token to be used for enroll | ||
| # FLEET_ENROLL - if set to 1 enroll will be performed | ||
| # FLEET_SETUP - if set to 1 fleet setup will be performed | ||
| # FLEET_TOKEN_NAME - token name for a token to be created | ||
| # KIBANA_HOST - actual kibana host [http://localhost:5601] | ||
| # KIBANA_PASSWORD - password for accessing kibana API [changeme] | ||
| # KIBANA_USERNAME - username for accessing kibana API [elastic] | ||
|
|
||
| function setup(){ | ||
| curl -X POST ${KIBANA_HOST:-http://localhost:5601}/api/ingest_manager/setup -H 'kbn-xsrf: true' -u ${KIBANA_USERNAME:-elastic}:${KIBANA_PASSWORD:-changeme} | ||
| curl -X POST ${KIBANA_HOST:-http://localhost:5601}/api/ingest_manager/fleet/setup \ | ||
| -H 'Content-Type: application/json' \ | ||
| -H 'kbn-xsrf: true' \ | ||
| -d '{"admin_username":"'"${FLEET_ADMIN_USERNAME:-elastic}"'","admin_password":"'"${FLEET_ADMIN_PASSWORD:-changeme}"'"}' \ | ||
| -u ${KIBANA_USERNAME:-elastic}:${KIBANA_PASSWORD:-changeme} | ||
| } | ||
|
|
||
| function enroll(){ | ||
| local enrollResp | ||
| local apiKey | ||
|
|
||
| if [[ -n "${FLEET_ENROLLMENT_TOKEN}" ]] && [[ ${FLEET_ENROLLMENT_TOKEN} == 1 ]]; then | ||
| apikey = "${FLEET_ENROLLMENT_TOKEN}" | ||
| else | ||
| enrollResp=$(curl -X POST ${KIBANA_HOST:-http://localhost:5601}/api/ingest_manager/fleet/enrollment-api-keys \ | ||
| -H 'Content-Type: application/json' \ | ||
| -H 'kbn-xsrf: true' \ | ||
| -u ${KIBANA_USERNAME:-elastic}:${KIBANA_PASSWORD:-changeme} \ | ||
| -d '{"name":"'"${FLEET_TOKEN_NAME:-demotoken}"'","config_id":"'"${FLEET_CONFIG_ID:-default}"'"}') | ||
|
|
||
| local exitCode=$? | ||
| if [ $exitCode -ne 0 ]; then | ||
| exit $exitCode | ||
| fi | ||
|
|
||
| apikey=$(echo $enrollResp | jq -r '.item.api_key') | ||
| fi | ||
|
|
||
| ./{{ .BeatName }} enroll ${KIBANA_HOST:-http://localhost:5601} $apikey -f | ||
| } | ||
| yum install -y epel-release | ||
| yum install -y jq | ||
|
|
||
| if [[ -n "${FLEET_SETUP}" ]] && [[ ${FLEET_SETUP} == 1 ]]; then setup; fi | ||
| if [[ -n "${FLEET_ENROLL}" ]] && [[ ${FLEET_ENROLL} == 1 ]]; then enroll; fi | ||
|
|
||
| exec {{ .BeatName }} run "$@" |
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,21 @@ | ||
| // Use these for links to issue and pulls. Note issues and pulls redirect one to | ||
| // each other on Github, so don't worry too much on using the right prefix. | ||
| :issue: https://github.com/elastic/beats/issues/ | ||
| :pull: https://github.com/elastic/beats/pull/ | ||
|
|
||
|
|
||
| [[release-notes-8.0.0]] | ||
| === Agent version 8.0.0 | ||
|
|
||
|
|
||
| ==== Breaking changes | ||
|
|
||
| ==== Bugfixes | ||
|
|
||
| - Fixed tests on windows {pull}16922[16922] | ||
| - Fixed installers for SNAPSHOTs and windows {pull}17077[17077] | ||
|
|
||
| ==== New features | ||
|
|
||
| - Generate index name in a format type-dataset-namespace {pull}16903[16903] | ||
| - OS agnostic default configuration {pull}17016[17016] |
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
Oops, something went wrong.