chore: refactor promtail extraScrapeConfigs into scrapeConfigs #367
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
evidence of upstream default scrape config still working: evidence of uds core default scrape config for systemd messages: |
mjnagel
approved these changes
Apr 26, 2024
mjnagel
pushed a commit
that referenced
this pull request
Apr 30, 2024
🤖 I have created a release *beep* *boop* --- ## [0.21.0](v0.20.0...v0.21.0) (2024-04-30) ### Features * add `monitor` to operator, fix monitoring setup ([#256](#256)) ([bf67722](bf67722)) ### Bug Fixes * loki s3 overrides ([#365](#365)) ([3545066](3545066)) * update neuvector values for least privilege ([#373](#373)) ([7f4de4f](7f4de4f)) ### Miscellaneous * add debug logging to endpointslice watch ([#359](#359)) ([da3eb5a](da3eb5a)) * **deps:** update grafana to v7.3.9 ([#353](#353)) ([4a70f40](4a70f40)) * **deps:** update istio to v1.21.2 ([#258](#258)) ([51c6540](51c6540)) * **deps:** update keycloak ([#349](#349)) ([2ef1813](2ef1813)) * **deps:** update keycloak to v0.4.2 ([#375](#375)) ([b0bb8e4](b0bb8e4)) * **deps:** update zarf to v0.33.1 ([#368](#368)) ([296e547](296e547)) * move api service watch to reconcile ([#362](#362)) ([1822bca](1822bca)) * refactor promtail extraScrapeConfigs into scrapeConfigs ([#367](#367)) ([2220272](2220272)) * trigger eks nightly when related files are updated ([#366](#366)) ([6d6e4e0](6d6e4e0)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
rjferguson21
pushed a commit
that referenced
this pull request
Jul 11, 2024
## Description Move the `extraScrapeConfig` snippets into the `snippets.scrapeConfigs` and copy/paste the upstream default `scrapeConfig`. This will allow for adding `extraScrapeConfigs` at deploy time via overrides without needing to copy over the default configs provided by core. ## Related Issue is part of completing this PR defenseunicorns/uds-infrastructure#105 ## Type of change - [ ] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [x] Other (security config, docs update, etc) ## Checklist before merging - [ ] Test, docs, adr added or updated as needed - [ ] [Contributor Guide Steps](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md)(https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md#submitting-a-pull-request) followed
rjferguson21
pushed a commit
that referenced
this pull request
Jul 11, 2024
🤖 I have created a release *beep* *boop* --- ## [0.21.0](v0.20.0...v0.21.0) (2024-04-30) ### Features * add `monitor` to operator, fix monitoring setup ([#256](#256)) ([bf67722](bf67722)) ### Bug Fixes * loki s3 overrides ([#365](#365)) ([3545066](3545066)) * update neuvector values for least privilege ([#373](#373)) ([7f4de4f](7f4de4f)) ### Miscellaneous * add debug logging to endpointslice watch ([#359](#359)) ([da3eb5a](da3eb5a)) * **deps:** update grafana to v7.3.9 ([#353](#353)) ([4a70f40](4a70f40)) * **deps:** update istio to v1.21.2 ([#258](#258)) ([51c6540](51c6540)) * **deps:** update keycloak ([#349](#349)) ([2ef1813](2ef1813)) * **deps:** update keycloak to v0.4.2 ([#375](#375)) ([b0bb8e4](b0bb8e4)) * **deps:** update zarf to v0.33.1 ([#368](#368)) ([296e547](296e547)) * move api service watch to reconcile ([#362](#362)) ([1822bca](1822bca)) * refactor promtail extraScrapeConfigs into scrapeConfigs ([#367](#367)) ([2220272](2220272)) * trigger eks nightly when related files are updated ([#366](#366)) ([6d6e4e0](6d6e4e0)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Move the
extraScrapeConfigsnippets into thesnippets.scrapeConfigsand copy/paste the upstream defaultscrapeConfig. This will allow for addingextraScrapeConfigsat deploy time via overrides without needing to copy over the default configs provided by core.Related Issue
is part of completing this PR https://github.com/defenseunicorns/uds-prod-infrastructure/issues/105
Type of change
Checklist before merging