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

fix: default.metrics source is not imported when metrics are disabled… #2547

Merged
merged 4 commits into from
Oct 20, 2022
Merged

fix: default.metrics source is not imported when metrics are disabled… #2547

merged 4 commits into from
Oct 20, 2022

Conversation

pdelewski
Copy link
Contributor

… and traces are enabled

Description

Fill in your description here.

Checklist
  • Changelog updated
Testing performed
  • Redeploy fluentd and fluentd-events pods
  • Confirm events, logs, and metrics are coming in

@pdelewski pdelewski requested a review from a team as a code owner September 28, 2022 09:49
@pdelewski pdelewski force-pushed the SUMO-202643-import-default-metrics-source branch from 62e1338 to a644bda Compare September 28, 2022 09:56
@github-actions github-actions bot added the documentation documentation label Sep 28, 2022
sumo-drosiek
sumo-drosiek reviewed Sep 28, 2022
View reviewed changes
Copy link
Contributor

@sumo-drosiek sumo-drosiek left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Could you add unit tests for that?
They should be added here:
https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/main/tests/helm

You can take https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/main/tests/helm/remote_write_proxy as example

@pdelewski pdelewski force-pushed the SUMO-202643-import-default-metrics-source branch from a644bda to 11487a0 Compare September 28, 2022 10:07
@pdelewski
Copy link
Contributor Author

Could you add unit tests for that? They should be added here: https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/main/tests/helm

You can take https://github.com/SumoLogic/sumologic-kubernetes-collection/tree/main/tests/helm/remote_write_proxy as example

ok

@pdelewski pdelewski force-pushed the SUMO-202643-import-default-metrics-source branch from 11487a0 to 5815fcb Compare October 5, 2022 11:59
@pdelewski pdelewski force-pushed the SUMO-202643-import-default-metrics-source branch 2 times, most recently from d01ff12 to 5b7c0c8 Compare October 5, 2022 12:53
@pdelewski pdelewski force-pushed the SUMO-202643-import-default-metrics-source branch from 5b7c0c8 to 9f7786d Compare October 6, 2022 07:22
@swiatekm
Copy link

@pdelewski you can rebase on main and tests should pass. We should also backport this to v2 imo.

pdelewski pushed a commit that referenced this pull request Oct 20, 2022
fix: update test output (#2547)
5fe7e10
pdelewski pushed a commit that referenced this pull request Oct 20, 2022
fix: update test output (#2547)
6b8672a
@pdelewski pdelewski force-pushed the SUMO-202643-import-default-metrics-source branch from 5fe7e10 to 6b8672a Compare October 20, 2022 09:35
pdelewski pushed a commit that referenced this pull request Oct 20, 2022
fix: update test output (#2547)
dbb45a5
@pdelewski pdelewski force-pushed the SUMO-202643-import-default-metrics-source branch from 6b8672a to dbb45a5 Compare October 20, 2022 09:47
@pdelewski pdelewski force-pushed the SUMO-202643-import-default-metrics-source branch from dbb45a5 to f268937 Compare October 20, 2022 09:52
swiatekm
swiatekm approved these changes Oct 20, 2022
View reviewed changes
CHANGELOG.md
@@ -26,7 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- fix(openshift): fix remote write proxy - use unprivileged NGINX [#2510][#2510]
- fix(openshift): fix remote write proxy - use unprivileged NGINX [#2510], [#2510]
Copy link

Choose a reason for hiding this comment

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

Why this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually, I don't remember exactly the reason now, but I think that some check was failing

@pdelewski pdelewski merged commit 7c3ad33 into main Oct 20, 2022
@pdelewski pdelewski deleted the SUMO-202643-import-default-metrics-source branch October 20, 2022 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sumo-drosiek sumo-drosiek sumo-drosiek left review comments

@github-actions GitHub Actions github-actions approved these changes

@swiatekm swiatekm swiatekm approved these changes

Assignees
No one assigned
Labels
documentation documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pdelewski @swiatekm @sumo-drosiek