Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package java-attacher alongside apm-server #6593

Merged
merged 13 commits into from
Nov 16, 2021
Merged

package java-attacher alongside apm-server #6593

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5812326
package java-attacher alongside apm-server
stuartnelson3 Nov 11, 2021
1da4821
update changelog
stuartnelson3 Nov 11, 2021
35d10e8
update magefile for .deb/.rpm
stuartnelson3 Nov 11, 2021
2c3f539
verify java attacher jar md5
stuartnelson3 Nov 15, 2021
ca16c88
Merge branch 'master' into package-java-attacher
stuartnelson3 Nov 15, 2021
545d934
verify attacher with gpg signature
stuartnelson3 Nov 15, 2021
b8ac054
Merge branch 'master' into package-java-attacher
stuartnelson3 Nov 15, 2021
d10c592
use -slim jar + different base url
stuartnelson3 Nov 15, 2021
9477d3a
Merge branch 'master' into package-java-attacher
stuartnelson3 Nov 15, 2021
d174994
typo in changelog
stuartnelson3 Nov 15, 2021
94010ca
Update attacher to 1.27.0
felixbarny Nov 15, 2021
baa1b25
Merge branch 'master' into package-java-attacher
felixbarny Nov 15, 2021
c62bbec
Merge branch 'master' into package-java-attacher
stuartnelson3 Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,15 @@ release-manager-snapshot: release
.PHONY: release-manager-release
release-manager-release: release

JAVA_ATTACHER_VERSION:=1.26.0
JAVA_ATTACHER_JAR:=apm-agent-attach-cli-$(JAVA_ATTACHER_VERSION).jar
JAVA_ATTACHER_URL:=https://search.maven.org/remotecontent?filepath=co/elastic/apm/apm-agent-attach-cli/$(JAVA_ATTACHER_VERSION)/$(JAVA_ATTACHER_JAR)

build/$(JAVA_ATTACHER_JAR):
curl -sSL $(JAVA_ATTACHER_URL) > $@
cp $@ build/java-attacher.jar

.PHONY: release
release: export PATH:=$(dir $(BIN_MAGE)):$(PATH)
release: $(MAGE)
release: $(MAGE) build/$(JAVA_ATTACHER_JAR)
$(MAGE) package
1 change: 1 addition & 0 deletions changelogs/head.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ https://github.com/elastic/apm-server/compare/7.15\...master[View commits]
- Added support for gzip compression to the experimental Elasticsearch output {pull}6449[6449]
- Introduced a delete phase for all data streams. Traces, errors and logs are kept for 10 days, metrics are kept for 90 days {pull}6480[6480]
- Changed RUM traces to use a dedicated data stream (`traces-apm.rum`). RUM traces are kept for 90 days {pull}6480[6480]
- `apm-server` artifacts now have the apm java-attacher.jar pacakaged alongside them {pull}6593[6593]

[float]
==== Deprecated
Expand Down
3 changes: 3 additions & 0 deletions magefile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,18 +348,21 @@ func customizePackaging() {
// Replace the README.md with an APM specific file.
args.Spec.ReplaceFile("README.md", readmeTemplate)
args.Spec.Files[ingestTarget] = ingest
args.Spec.Files["java-attacher.jar"] = mage.PackageFile{Mode: 0750, Source: "build/java-attacher.jar", Owner: mage.BeatUser}

case mage.Docker:
delete(args.Spec.Files, "{{.BeatName}}.reference.yml")
args.Spec.ReplaceFile("README.md", readmeTemplate)
args.Spec.Files[ingestTarget] = ingest
args.Spec.ExtraVars["expose_ports"] = config.DefaultPort
args.Spec.ExtraVars["repository"] = "docker.elastic.co/apm"
args.Spec.Files["java-attacher.jar"] = mage.PackageFile{Mode: 0750, Source: "build/java-attacher.jar", Owner: mage.BeatUser}

case mage.Deb, mage.RPM:
delete(args.Spec.Files, "/etc/{{.BeatName}}/{{.BeatName}}.reference.yml")
args.Spec.ReplaceFile("/usr/share/{{.BeatName}}/README.md", readmeTemplate)
args.Spec.Files["/usr/share/{{.BeatName}}/"+ingestTarget] = ingest
args.Spec.Files["/usr/share/{{.BeatName}}/bin/java-attacher.jar"] = mage.PackageFile{Mode: 0750, Source: "build/java-attacher.jar", Owner: mage.BeatUser}

// update config file Owner
pf := args.Spec.Files["/etc/{{.BeatName}}/{{.BeatName}}.yml"]
Expand Down