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

[prometheus][deckhouse] Add supporting ServiceMonitors and PodMonitors from user-space #604

Merged
merged 1 commit into from
Jan 19, 2022

Conversation

name212
Copy link
Member

@name212 name212 commented Jan 17, 2022

Description

Change podMonitorNamespaceSelector and serviceMonitorNamespaceSelector from label heritage: deckhouse to new custom prometheus.deckhouse.io/monitor-watcher-enabled label. Because we do not want give an opportunity for usage heritage: deckhouse label for non-deckhouse namespaces, but we need pass namespace selectors into Prometheus resource. We can not implement OR logic with LabelSelector and we should change labels.

Add prometheus.deckhouse.io/monitor-watcher-enabled to d8-monitoring namespace. All own Pod and Service Monitor located in d8-monitoring namespace.

Add FAQ for connect user-space Service/Pod Monitors to Prometheus.

Change alert description about custom monitors.

Custom monitors alert logic did not change, because it already has correct logic.

Why do we need it, and what problem does it solve?

There is no way to connect custom ServiceMonitor to Prometheus from Deckhouse. However, all modern helm charts are bundled with a ServiceMonitor. Users have to alter charts to provide monitoring.

Changelog entries

module: prometheus
type: feature
description: Add supporting ServiceMonitors and PodMonitors from user-space
note: Prometheus will be restarted

@name212 name212 linked an issue Jan 17, 2022 that may be closed by this pull request
2 tasks
@name212 name212 self-assigned this Jan 17, 2022
@name212 name212 added the area/monitoring Pull requests that update monitoring modules label Jan 17, 2022
@name212 name212 force-pushed the 488-nm-service-monitors-for-user-space branch from 042a3fc to 765e04c Compare January 18, 2022 08:08
@name212 name212 marked this pull request as ready for review January 18, 2022 09:20
@nabokihms nabokihms added this to the v1.31.0 milestone Jan 19, 2022
@nabokihms nabokihms merged commit b0a3bcf into main Jan 19, 2022
@nabokihms nabokihms deleted the 488-nm-service-monitors-for-user-space branch January 19, 2022 18:12
@konstantin-axenov konstantin-axenov modified the milestones: v1.31.0, v1.30.6 Feb 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/monitoring Pull requests that update monitoring modules
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[prometheus] Support ServiceMonitors from user-space
3 participants