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

Jump to bottom

Add journald support to Promtail amd64 binary builds #9095

Merged
merged 6 commits into from
Apr 11, 2023
Merged

Add journald support to Promtail amd64 binary builds #9095

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
943b89a
attempt to fix promtail build
trevorwhitney Apr 10, 2023
9468875
Run `make drone`
JordanRushing Apr 10, 2023
f5bf8d2
Merge branch 'main' into fix-promtail-release
JordanRushing Apr 11, 2023
0fb567e
Temporarily enable `publish` drone step on push to test new Promtail …
JordanRushing Apr 11, 2023
cdcd50f
Hardcode promtail_journal_enabled for arm/arm64/amd64 promtail binary…
JordanRushing Apr 11, 2023
90b4c1d
Run `make drone`
JordanRushing Apr 11, 2023
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
4 changes: 3 additions & 1 deletion .drone/drone.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,6 +806,7 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {
env={
NFPM_PASSPHRASE: { from_secret: gpg_passphrase.name },
NFPM_SIGNING_KEY_FILE: '/drone/src/private-key.key',
PROMTAIL_JOURNAL_ENABLED: 'true',
}),
{
name: 'test deb package',
Expand Down Expand Up @@ -837,7 +838,8 @@ local manifest_ecr(apps, archs) = pipeline('manifest-ecr') {
GITHUB_TOKEN: { from_secret: github_secret.name },
NFPM_PASSPHRASE: { from_secret: gpg_passphrase.name },
NFPM_SIGNING_KEY_FILE: '/drone/src/private-key.key',
}) { when: { event: ['tag'] } },
PROMTAIL_JOURNAL_ENABLED: 'true',
JordanRushing marked this conversation as resolved.
Show resolved Hide resolved
}) { when: { event: ['tag', 'push'] } },
],
},
pipeline('docker-driver') {
Expand Down
5 changes: 4 additions & 1 deletion .drone/drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,6 +1437,7 @@ steps:
NFPM_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
PROMTAIL_JOURNAL_ENABLED: "true"
image: grafana/loki-build-image:0.28.2
name: test packaging
- commands:
Expand All @@ -1463,11 +1464,13 @@ steps:
NFPM_PASSPHRASE:
from_secret: gpg_passphrase
NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
PROMTAIL_JOURNAL_ENABLED: "true"
DylanGuedes marked this conversation as resolved.
Show resolved Hide resolved
image: grafana/loki-build-image:0.28.2
name: publish
when:
event:
- tag
- push
trigger:
event:
- pull_request
Expand Down Expand Up @@ -1740,6 +1743,6 @@ kind: secret
name: gpg_private_key
---
kind: signature
hmac: 3ccc42237f6cdd3de6afacf997575dafa52c9d5fee83cd3fee610e5fd365a283
hmac: 4ae4390771c303d31bfb655f62af656a7cc762696fbc989a291517e8b4e555fe

...
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ dist: clean
CGO_ENABLED=0 $(GOX) -osarch="linux/amd64 linux/arm64 linux/arm darwin/amd64 darwin/arm64 windows/amd64 freebsd/amd64" ./cmd/logcli
CGO_ENABLED=0 $(GOX) -osarch="linux/amd64 linux/arm64 linux/arm darwin/amd64 darwin/arm64 windows/amd64 freebsd/amd64" ./cmd/loki-canary
CGO_ENABLED=0 $(GOX) -osarch="darwin/amd64 darwin/arm64 windows/amd64 windows/386 freebsd/amd64" ./clients/cmd/promtail
PKG_CONFIG_PATH="/usr/lib/aarch64-linux-gnu/pkgconfig" CC="aarch64-linux-gnu-gcc" $(CGO_GOX) -tags promtail_journal_enabled -osarch="linux/arm64" ./clients/cmd/promtail
PKG_CONFIG_PATH="/usr/lib/arm-linux-gnueabihf/pkgconfig" CC="arm-linux-gnueabihf-gcc" $(CGO_GOX) -tags promtail_journal_enabled -osarch="linux/arm" ./clients/cmd/promtail
PKG_CONFIG_PATH="/usr/lib/aarch64-linux-gnu/pkgconfig" CC="aarch64-linux-gnu-gcc" $(CGO_GOX) -osarch="linux/arm64" ./clients/cmd/promtail
PKG_CONFIG_PATH="/usr/lib/arm-linux-gnueabihf/pkgconfig" CC="arm-linux-gnueabihf-gcc" $(CGO_GOX) -osarch="linux/arm" ./clients/cmd/promtail
CGO_ENABLED=1 $(CGO_GOX) -osarch="linux/amd64" ./clients/cmd/promtail
for i in dist/*; do zip -j -m $$i.zip $$i; done
pushd dist && sha256sum * > SHA256SUMS && popd
Expand Down