chore(promtail): Use minimal init config in rpm/deb packaging. #11511

kavirajk · 2023-12-18T11:43:04Z

What this PR does / why we need it:
Related issue: #11398

This minimal config scrape only single file thus not overloading the systems as described in the issue

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

Reviewed the CONTRIBUTING.md guide (required)
Documentation added
Tests updated
CHANGELOG.md updated
- If the change is worth mentioning in the release notes, add add-to-release-notes label
Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

Related issue: #11398 This minimal config scrape only single file thus not overloading the systems as described in the issue Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

github-actions · 2023-12-18T11:46:25Z

Trivy scan found the following vulnerabilities:

HIGH, Target: docker.io/grafana/loki:main-4421efe (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libcrypto3 v3.1.3-r0. Fixed in v3.1.4-r0
HIGH, Target: docker.io/grafana/loki:main-4421efe (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libssl3 v3.1.3-r0. Fixed in v3.1.4-r0
\nTo see more details on these vulnerabilities, and how/where to fix them, please run docker build -t grafana/loki:main-4421efe -f cmd/loki/Dockerfile .
trivy i grafana/loki:main-4421efe on your branch. If these were not introduced by your PR, please considering fixing them in via a subsequent PR. Thanks!

MichelHollands

LGTM

chaudum

Should we move the file into tools/packaging/ as it is intended for packaging purposes only.

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

CHANGELOG.md

tools/packaging/promtail-minimal-config.yaml

Co-authored-by: Christian Haudum <christian.haudum@gmail.com>

janfickler · 2023-12-19T23:04:02Z

@kavirajk, seems the package testing for deb is failing and doesn´t continue with rpm package testing :-)

janfickler · 2023-12-21T12:05:08Z

@chaudum, maybe you can help ?

janfickler · 2024-01-03T18:44:56Z

any update @chaudum / @kavirajk / @MichelHollands ?

kavirajk · 2024-01-09T13:30:26Z

Apologies for the delay. Got distracted with PTO and other works. I will take a look ASAP.

chaudum · 2024-01-10T08:23:01Z

tools/packaging/promtail-minimal-config.yaml

+  filename: /tmp/positions.yaml
+
+clients:
+  - url: http://localhost:3100/loki/api/v1/push


We should use consistent list indentation (compare with scrape_configs).

CHANGELOG.md

chaudum · 2024-01-10T08:27:16Z

tools/packaging/promtail-minimal-config.yaml

+      - localhost
+    labels:
+      job: varlogs
+      __path__: /var/log/messages


Can we add a comment that this section should be changed by the user after installation?

just a hint :-) - there is now more failing in the build-pipeline - https://drone.grafana.net/grafana/loki/32891/25/8

"Release stage" on drone pipeline seems flaky.

I think found the issue. The packaging test pipeline generate test log and writes to /var/log/test.log and checks if its scraped fine, By using minimal config we scrape only /var/log/messages and doesn't include /var/log/test.log.

I changed the filename from /var/log/test.log -> /var/log/messages instead in the scripts so test logs are properly scraped.

I think that should fix it.

Co-authored-by: Christian Haudum <christian.haudum@gmail.com>

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

Previously we are writing logs to /var/log/test.log. But with minimal config we scrape only /var/log/messages. So write to /var/log/messages instead Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

kavirajk · 2024-01-11T03:03:15Z

@chaudum addressed your comments. Also CI passes.

grafanabot · 2024-01-11T14:19:49Z

Hello @chaudum!
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 the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

janfickler · 2024-01-12T11:50:37Z

still problems here, seems the builds are ok.
is the grafanabot really complaining about labels - @kavirajk / @chaudum

Related issue: #11398 This minimal config scrape only single file thus not overloading the systems as described in the issue (cherry picked from commit 86f2001)

janfickler · 2024-01-17T10:32:50Z

any updates on this ? @kavirajk / @chaudum ?

…ackaging. (#11676) Backport 86f2001 from #11511 --- **What this PR does / why we need it**: Related issue: #11398 This minimal config scrape only single file thus not overloading the systems as described in the issue **Which issue(s) this PR fixes**: Fixes #<issue number> **Special notes for your reviewer**: **Checklist** - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (**required**) - [x] Documentation added - [ ] Tests updated - [ ] `CHANGELOG.md` updated - [ ] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/setup/upgrade/_index.md` - [ ] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](d10549e) - [ ] If the change is deprecating or removing a configuration option, update the `deprecated-config.yaml` and `deleted-config.yaml` files respectively in the `tools/deprecated-config-checker` directory. [Example PR](0d4416a) Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com> Co-authored-by: Poyzan <31743851+poyzannur@users.noreply.github.com>

janfickler · 2024-01-23T07:53:38Z

@poyzannur / @kavirajk - there is still no new version 2.9.4 released ?

…ted PR #11511

…na#11511) Related issue: grafana#11398 This minimal config scrape only single file thus not overloading the systems as described in the issue

chore(promtail): Use minimal init config in npm/deb packaging.

bd0dd7d

Related issue: #11398 This minimal config scrape only single file thus not overloading the systems as described in the issue Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

kavirajk requested a review from a team as a code owner December 18, 2023 11:43

pull-request-size bot added the size/M label Dec 18, 2023

add changelog

a3ab311

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

MichelHollands approved these changes Dec 18, 2023

View reviewed changes

chaudum reviewed Dec 18, 2023

View reviewed changes

move it to tools/packaging

cb4a913

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

kavirajk requested a review from chaudum December 18, 2023 13:27

chaudum reviewed Dec 18, 2023

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

tools/packaging/promtail-minimal-config.yaml Outdated Show resolved Hide resolved

kavirajk and others added 2 commits December 18, 2023 15:07

Update CHANGELOG.md

f8cee7a

Co-authored-by: Christian Haudum <christian.haudum@gmail.com>

Update tools/packaging/promtail-minimal-config.yaml

6c000c6

Co-authored-by: Christian Haudum <christian.haudum@gmail.com>

kavirajk changed the title ~~chore(promtail): Use minimal init config in npm/deb packaging.~~ chore(promtail): Use minimal init config in rpm/deb packaging. Dec 18, 2023

chaudum approved these changes Dec 18, 2023

View reviewed changes

kavirajk enabled auto-merge (squash) December 18, 2023 14:22

Merge branch 'main' into kavirajk/sane-init-config-packaging

47c551a

chaudum requested changes Jan 10, 2024

View reviewed changes

kavirajk and others added 5 commits January 10, 2024 20:19

Update CHANGELOG.md

c4f52a3

Co-authored-by: Christian Haudum <christian.haudum@gmail.com>

indendation fix

b452796

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

change rpm and deb packages testing log file name

c6dfb85

Previously we are writing logs to /var/log/test.log. But with minimal config we scrape only /var/log/messages. So write to /var/log/messages instead Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

Merge branch 'main' into kavirajk/sane-init-config-packaging

14443d9

Some dummy commit to force re-run CLA check

2d898a3

Signed-off-by: Kaviraj <kavirajkanagaraj@gmail.com>

kavirajk requested a review from chaudum January 11, 2024 05:08

chaudum approved these changes Jan 11, 2024

View reviewed changes

chaudum added the backport release-2.9.x label Jan 11, 2024

grafanabot added the missing-labels label Jan 11, 2024

chaudum added the product-approved label Jan 11, 2024

grafanabot removed the missing-labels label Jan 11, 2024

Merge branch 'main' into kavirajk/sane-init-config-packaging

fee7a9e

kavirajk merged commit 86f2001 into main Jan 14, 2024
8 checks passed

kavirajk deleted the kavirajk/sane-init-config-packaging branch January 14, 2024 14:10

grafanabot mentioned this pull request Jan 14, 2024

[release-2.9.x] chore(promtail): Use minimal init config in rpm/deb packaging. #11676

Merged

8 tasks

poyzannur added a commit that referenced this pull request Jan 24, 2024

remove unrelated changes to the patch release and add missing backpor…

005f5c5

…ted PR #11511

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(promtail): Use minimal init config in rpm/deb packaging. #11511

chore(promtail): Use minimal init config in rpm/deb packaging. #11511

kavirajk commented Dec 18, 2023

github-actions bot commented Dec 18, 2023 •

edited

MichelHollands left a comment

chaudum left a comment

janfickler commented Dec 19, 2023

janfickler commented Dec 21, 2023

janfickler commented Jan 3, 2024 •

edited

kavirajk commented Jan 9, 2024

chaudum Jan 10, 2024

chaudum Jan 10, 2024

janfickler Jan 10, 2024

kavirajk Jan 10, 2024

kavirajk Jan 11, 2024

kavirajk Jan 11, 2024

kavirajk commented Jan 11, 2024

grafanabot commented Jan 11, 2024

janfickler commented Jan 12, 2024

janfickler commented Jan 17, 2024

janfickler commented Jan 23, 2024

chore(promtail): Use minimal init config in rpm/deb packaging. #11511

chore(promtail): Use minimal init config in rpm/deb packaging. #11511

Conversation

kavirajk commented Dec 18, 2023

github-actions bot commented Dec 18, 2023 • edited

MichelHollands left a comment

Choose a reason for hiding this comment

chaudum left a comment

Choose a reason for hiding this comment

janfickler commented Dec 19, 2023

janfickler commented Dec 21, 2023

janfickler commented Jan 3, 2024 • edited

kavirajk commented Jan 9, 2024

chaudum Jan 10, 2024

Choose a reason for hiding this comment

chaudum Jan 10, 2024

Choose a reason for hiding this comment

janfickler Jan 10, 2024

Choose a reason for hiding this comment

kavirajk Jan 10, 2024

Choose a reason for hiding this comment

kavirajk Jan 11, 2024

Choose a reason for hiding this comment

kavirajk Jan 11, 2024

Choose a reason for hiding this comment

kavirajk commented Jan 11, 2024

grafanabot commented Jan 11, 2024

janfickler commented Jan 12, 2024

janfickler commented Jan 17, 2024

janfickler commented Jan 23, 2024

github-actions bot commented Dec 18, 2023 •

edited

janfickler commented Jan 3, 2024 •

edited