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

merged 6 commits into from
Apr 11, 2023

Conversation

JordanRushing
Copy link
Contributor

@JordanRushing JordanRushing commented Apr 10, 2023 •
edited
Loading

What this PR does / why we need it:

Previously, in #8131, we enabled journald support for Promtail arm/arm64 binary builds but not amd64.

Which issue(s) this PR fixes:

Special notes for your reviewer:

N/A

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/upgrading/_index.md

trevorwhitney and others added 2 commits April 10, 2023 13:03
@trevorwhitney
attempt to fix promtail build
943b89a
@JordanRushing
Run make drone
9468875 
Signed-off-by: JordanRushing <rushing.jordan@gmail.com>
@JordanRushing JordanRushing requested a review from a team as a code owner April 10, 2023 20:01
@JordanRushing JordanRushing self-assigned this Apr 10, 2023
DylanGuedes
DylanGuedes previously requested changes Apr 10, 2023
View reviewed changes
.drone/drone.yml Outdated Show resolved Hide resolved
This was referenced Apr 11, 2023
Closed
Closed
jeschkies
jeschkies requested changes Apr 11, 2023
View reviewed changes
Copy link
Contributor

@jeschkies jeschkies left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also change the dist target for ARM builds. We pass the promtail journald tag explicitly which we probably should not be doing.

jeschkies
jeschkies reviewed Apr 11, 2023
View reviewed changes
.drone/drone.jsonnet Outdated Show resolved Hide resolved
@JordanRushing
Temporarily enable publish drone step on push to test new Promtail …
0fb567e 
…binary; add PROMTAIL_JOURNAL_ENABLED to `test packaging` stage

Signed-off-by: JordanRushing <rushing.jordan@gmail.com>
@trevorwhitney trevorwhitney added backport release-2.8.x type/bug Somehing is not working as expected labels Apr 11, 2023
@grafanabot
Copy link
Collaborator

Hello @trevorwhitney!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@JordanRushing JordanRushing changed the title Fix promtail release Add journald support to Promtail amd64 binary builds Apr 11, 2023
@JordanRushing
Hardcode promtail_journal_enabled for arm/arm64/amd64 promtail binary…
cdcd50f 
… builds; revert Drone changess

Signed-off-by: JordanRushing <rushing.jordan@gmail.com>
trevorwhitney
trevorwhitney reviewed Apr 11, 2023
View reviewed changes
.drone/drone.yml Outdated Show resolved Hide resolved
@JordanRushing
Run make drone
90b4c1d 
Signed-off-by: JordanRushing <rushing.jordan@gmail.com>
trevorwhitney
trevorwhitney approved these changes Apr 11, 2023
View reviewed changes
Copy link
Collaborator

@trevorwhitney trevorwhitney left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@JordanRushing JordanRushing merged commit 7edda37 into grafana:main Apr 11, 2023
@grafanabot grafanabot mentioned this pull request Apr 11, 2023
Merged
grafanabot pushed a commit that referenced this pull request Apr 11, 2023
@JordanRushing @grafanabot
Add journald support to Promtail amd64 binary builds (#9095)
aa3730c 
**What this PR does / why we need it**:

Previously, in #8131, we enabled
journald support for Promtail arm/arm64 binary builds but not amd64.

**Which issue(s) this PR fixes**:

- #9060

**Special notes for your reviewer**:

N/A

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/upgrading/_index.md`

---------

Signed-off-by: JordanRushing <rushing.jordan@gmail.com>
Co-authored-by: Trevor Whitney <trevorjwhitney@gmail.com>
(cherry picked from commit 7edda37)
trevorwhitney pushed a commit that referenced this pull request Apr 11, 2023
@grafanabot @JordanRushing
[release-2.8.x] Add journald support to Promtail amd64 binary builds (#…
1857671 
…9104)

Backport 7edda37 from #9095

Co-authored-by: JordanRushing <rushing.jordan@gmail.com>
@trevorwhitney trevorwhitney mentioned this pull request Apr 12, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@trevorwhitney trevorwhitney trevorwhitney approved these changes

@jeschkies jeschkies jeschkies approved these changes

@DylanGuedes DylanGuedes DylanGuedes left review comments

Assignees

@JordanRushing JordanRushing

Labels
backport release-2.8.x component/promtail product-approved size/XS type/bug Somehing is not working as expected
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@JordanRushing @grafanabot @trevorwhitney @jeschkies @DylanGuedes