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

Remove promtail configuration option #15763

Merged
merged 1 commit into from
Jul 25, 2024
Merged

Remove promtail configuration option #15763

merged 1 commit into from
Jul 25, 2024

Conversation

ogajduse
Copy link
Member

Problem Statement

We have removed config_sat.j2 from our internal repository. The promtail configuration that made promtail watch for changes in Satellite-related log files was merged to a general config file, therefore we do not need to specify the file anymore.

Solution

Remove the promtail_config_template_file broker argument, use the default (the only one we now have) promtail configuration file.

Related Issues

  • satlab-tower!1090 (merged)

@ogajduse ogajduse added 6.13.z Introduced in or relating directly to Satellite 6.13 6.14.z Introduced in or relating directly to Satellite 6.14 6.15.z Introduced in or relating directly to Satellite 6.15 labels Jul 25, 2024
@ogajduse ogajduse self-assigned this Jul 25, 2024
@ogajduse ogajduse requested a review from a team as a code owner July 25, 2024 12:55
@ogajduse ogajduse added CherryPick PR needs CherryPick to previous branches AutoMerge_Cherry_Picked The cherrypicked PRs of master PR would be automerged if all checks passing labels Jul 25, 2024
@ogajduse
Copy link
Member Author

trigger: test-robottelo
pytest: tests/foreman/sys/test_katello_certs_check.py::test_positive_install_sat_with_katello_certs

@Satellite-QE
Copy link
Collaborator

PRT Result

Build Number: 7853
Build Status: SUCCESS
PRT Comment: pytest tests/foreman/sys/test_katello_certs_check.py::test_positive_install_sat_with_katello_certs --external-logging
Test Result : ================= 1 passed, 13 warnings in 1889.83s (0:31:29) ==================

@Satellite-QE Satellite-QE added the PRT-Passed Indicates that latest PRT run is passed for the PR label Jul 25, 2024
@omkarkhatavkar omkarkhatavkar merged commit 303489b into SatelliteQE:master Jul 25, 2024
10 of 14 checks passed
github-actions bot pushed a commit that referenced this pull request Jul 25, 2024
@ogajduse @web-flow
Remove promtail configuration option (#15763)
c3e66bb 
(cherry picked from commit 303489b)
@Satellite-QE Satellite-QE mentioned this pull request Jul 25, 2024
Merged
github-actions bot pushed a commit that referenced this pull request Jul 25, 2024
@ogajduse @web-flow
Remove promtail configuration option (#15763)
b91a211 
(cherry picked from commit 303489b)
@Satellite-QE Satellite-QE mentioned this pull request Jul 25, 2024
Merged
github-actions bot pushed a commit that referenced this pull request Jul 25, 2024
@ogajduse @web-flow
Remove promtail configuration option (#15763)
a327cc6 
(cherry picked from commit 303489b)
@Satellite-QE Satellite-QE mentioned this pull request Jul 25, 2024
Merged
@ogajduse ogajduse deleted the fix/remove-promtail-conf branch July 25, 2024 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@omkarkhatavkar omkarkhatavkar omkarkhatavkar approved these changes

@rmynar rmynar rmynar approved these changes

Assignees

@ogajduse ogajduse

Labels
6.13.z Introduced in or relating directly to Satellite 6.13 6.14.z Introduced in or relating directly to Satellite 6.14 6.15.z Introduced in or relating directly to Satellite 6.15 AutoMerge_Cherry_Picked The cherrypicked PRs of master PR would be automerged if all checks passing CherryPick PR needs CherryPick to previous branches PRT-Passed Indicates that latest PRT run is passed for the PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ogajduse @Satellite-QE @omkarkhatavkar @rmynar