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: use custom ServiceMonitor for Prometheus' own metrics #2238

Merged
merged 1 commit into from
Apr 19, 2022
Merged

fix: use custom ServiceMonitor for Prometheus' own metrics #2238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- fix: use custom ServiceMonitor for Prometheus' own metrics [#2238]

### Fixed

- fix: set source name and category in the FluentD output for events [#2222][#2222]
- docs: FluentD buffer size configuration [#2232][#2232]

[#2232]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2232
[#2222]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2222
[#2238]: https://github.com/SumoLogic/sumologic-kubernetes-collection/pull/2238
[Unreleased]: https://github.com/SumoLogic/sumologic-kubernetes-collection/compare/v2.6.0...main

## [v2.7.0][v2.7.0]
Expand Down
13 changes: 13 additions & 0 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1739,6 +1739,16 @@ kube-prometheus-stack:
matchLabels:
sumologic.com/app: otelcol
sumologic.com/scrape: "true"
- name: collection-sumologic-prometheus
endpoints:
- port: web
path: /metrics
namespaceSelector:
matchNames:
- $(NAMESPACE)
selector:
matchLabels:
operated-prometheus: "true"
prometheusSpec:
## Prometheus default scrape interval, default from upstream Kube Prometheus Stack Helm chart
## NOTE changing the scrape interval to be >1m can result in metrics
Expand Down Expand Up @@ -3219,6 +3229,9 @@ kube-prometheus-stack:
regex: (?:squid_(uptime|cache(Ip(Entries|Requests|Hits)|Fqdn(Entries|Requests|Misses|NegativeHits)|Dns(Requests|Replies|SvcTime5)|Sys(PageFaults|NumReads)|Current(FileDescrCnt|UnusedFDescrCnt|ResFileDescrCnt)|Server(Requests|InKb|OutKb)|Http(AllSvcTime5|Errors|InKb|OutKb|AllSvcTime1)|Mem(MaxSize|Usage)|NumObjCount|CpuTime|MaxResSize|ProtoClientHttpRequests|Clients)))
sourceLabels: [__name__]

serviceMonitor:
selfMonitor: false

## Configure optional OpenTelemetry Collector in Agent mode
otelagent:
enabled: false
Expand Down