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.

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

chore: refactor promtail extraScrapeConfigs into scrapeConfigs #367

Merged
merged 6 commits into from
Apr 29, 2024

Conversation

TristanHoladay
Copy link
Contributor

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 https://github.com/defenseunicorns/uds-prod-infrastructure/issues/105

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Other (security config, docs update, etc)

Checklist before merging

@TristanHoladay
Copy link
Contributor Author

evidence of upstream default scrape config still working:
Screenshot from 2024-04-25 08-36-35

evidence of uds core default scrape config for systemd messages:
Screenshot from 2024-04-25 08-35-16

Copy link
Contributor

@mjnagel mjnagel left a comment

Choose a reason for hiding this comment

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

LGTM - I like the approach of leaving extraScrapeConfigs empty to support the end user overriding without needing to copy/paste the defaults.

@mjnagel mjnagel enabled auto-merge (squash) April 26, 2024 21:56
@mjnagel mjnagel merged commit 2220272 into main Apr 29, 2024
9 checks passed
@mjnagel mjnagel deleted the update-promtail-scrape-configs branch April 29, 2024 14:13
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants