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

Promtail: Add go build tag promtail_journal_enabled #7587

Merged

MichelHollands merged 2 commits into grafana:main from mar4uk:promtail_journal_enabled_tag

Nov 9, 2022

Contributor

mar4uk commented Nov 3, 2022 •

edited

Loading

What this PR does / why we need it:
This PR introduces the new go build tag promtail_journal_enabled. This tag is passed to go build if the environment variable PROMTAIL_JOURNAL_ENABLED=true is present.
It is useful for users with Linux OS and CGO enabled. Currently, if the user has Linux and CGO enabled he has to install libsystemd-dev library (sudo apt install -y libsystemd-dev) even when he doesn't need journald support.

Special notes for your reviewer:

Checklist

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

pull-request-size bot added the size/M label

Collaborator

grafanabot commented Nov 3, 2022

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

Collaborator

grafanabot commented Nov 3, 2022

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0.1%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

Collaborator

grafanabot commented Nov 3, 2022

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

mar4uk force-pushed the promtail_journal_enabled_tag branch from 1115eb5 to 550e40f Compare

November 3, 2022 11:28

Collaborator

grafanabot commented Nov 3, 2022

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
-        distributor	-0.2%
+            querier	0%
- querier/queryrange	-0.1%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

mar4uk force-pushed the promtail_journal_enabled_tag branch from 550e40f to 0b3085f Compare

November 4, 2022 09:33

Collaborator

grafanabot commented Nov 4, 2022

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

1 similar comment

Collaborator

grafanabot commented Nov 4, 2022

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

mar4uk marked this pull request as ready for review

November 4, 2022 10:40

mar4uk requested a review from a team as a code owner

November 4, 2022 10:40

mar4uk mentioned this pull request

[receiver/promtailreceiver] Add promtail receiver open-telemetry/opentelemetry-collector-contrib#14632

Merged

Contributor

MichelHollands commented Nov 7, 2022 •

edited

Loading

@mar4uk This looks good but it changes the default functionality for a (small) subset of customers if they don't set the new env variable. So can you add this to the upgrade document as well? That's where people will look rather than in the changelog.

mar4uk force-pushed the promtail_journal_enabled_tag branch from 0b3085f to 1491e25 Compare

November 8, 2022 08:58

github-actions bot added the type/docs label

Collaborator

grafanabot commented Nov 8, 2022

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

mar4uk force-pushed the promtail_journal_enabled_tag branch from 1491e25 to 628b3ce Compare

November 8, 2022 09:06

Collaborator

grafanabot commented Nov 8, 2022

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
- querier/queryrange	-0.1%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

Contributor Author

mar4uk commented Nov 8, 2022

@MichelHollands thank you for your review. I updated docs/sources/upgrading/_index.md as you suggested

Collaborator

grafanabot commented Nov 8, 2022

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
- querier/queryrange	-0.1%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

mar4uk added 2 commits

November 8, 2022 09:26


          Promtail: Add go build tag promtail_journal_enbaled

afbaf03


          Promtail: Add go build tag promtail_journal_enbaled. Add doc, update …

899a7a3

…changelog

mar4uk force-pushed the promtail_journal_enabled_tag branch from 628b3ce to 899a7a3 Compare

November 8, 2022 09:27

Collaborator

grafanabot commented Nov 8, 2022

./tools/diff_coverage.sh ../loki-target-branch/test_results.txt test_results.txt ingester,distributor,querier,querier/queryrange,iter,storage,chunkenc,logql,loki

Change in test coverage per package. Green indicates 0 or positive change, red indicates that test coverage for a package fell.

+           ingester	0%
+        distributor	0%
+            querier	0%
+ querier/queryrange	0%
+               iter	0%
+            storage	0%
+           chunkenc	0%
+              logql	0%
+               loki	0%

MichelHollands changed the title ~~Promtail: Add go build tag promtail_journal_enbaled~~ Promtail: Add go build tag promtail_journal_enabled

MichelHollands approved these changes

View reviewed changes

Contributor

MichelHollands left a comment

LGTM

MichelHollands merged commit bdb0aa0 into grafana:main

mar4uk deleted the promtail_journal_enabled_tag branch

November 15, 2022 11:40

Abuelodelanada pushed a commit to canonical/loki that referenced this pull request


          Promtail: Add go build tag promtail_journal_enabled (grafana#7587)

**What this PR does / why we need it**:
This PR introduces the new go build tag `promtail_journal_enabled`. This
tag is passed to go build if the environment variable
`PROMTAIL_JOURNAL_ENABLED=true` is present.
It is useful for users with Linux OS and CGO enabled. Currently, if the
user has Linux and CGO enabled he has to install `libsystemd-dev`
library (`sudo apt install -y libsystemd-dev`) even when he doesn't need
journald support.

trevorwhitney mentioned this pull request

The official Linux release binary of promtail 2.8.0 is built without systemd journal support (on at least amd64) #9060

Closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/M type/docs