Skip to content

Commit 2fe8770

Browse files
Merge pull request kubernetes#178 from simonpasquier/fix-alerting-oep
user-workload-monitoring: be more accurate about alerts & silences enpoints
2 parents d857f7c + b1fac87 commit 2fe8770

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

enhancements/monitoring/user-workload-monitoring.md

+9-7
Original file line numberDiff line numberDiff line change
@@ -251,20 +251,22 @@ OpenShift console executes queries against `/query` endpoint of Thanos Querier t
251251

252252
Access to this endpoint is gated by the permission to `get pods.metrics.k8s.io` in the requested namespace.
253253

254-
#### Available Rules and declared alerts
254+
#### Available Rules and alerts
255255

256256
OpenShift console executes queries against the `/rules` and `/alerts` endpoint of Prometheus and Thanos Ruler
257-
to retrieve a list of declared alerts and recording rules. Recording rules as well as alerting rules deployed via user workload monitoring are having enforced namespace labels set. The list of rules and alerts is being filtered by prom-label-proxy based on the tenant namespace label.
257+
to retrieve a list of declared alerting/recording rules and a list of active alerts. Recording rules as well as alerting rules deployed via user workload monitoring are having enforced namespace labels set. The list of rules and alerts is being filtered by prom-label-proxy based on the tenant namespace label.
258258

259-
Access to this endpoint is gated by the permission to `get prometheusrules.monitoring.coreos.com` in the requested namespace.
259+
Access to these endpoints is gated by the permission to `get prometheusrules.monitoring.coreos.com` in the requested namespace.
260260

261-
#### Alertmanager alerts and silences
261+
#### Alertmanager silences
262262

263-
OpenShift console executes requests against the `/alerts` endpoint of Alertmanager to retrieve the list of currently firing alerts and to silence alerts. Firing alerts originating from user workload monitoring are having enforced namespace labels set. A user can only create and update silences as well as get alerts and silences filtered by the namespace label in flight.
263+
OpenShift console executes requests against the `/silences` endpoint of Alertmanager to retrieve the list of silences and to silence alerts. A user can only create, delete and update silences as well as get silences filtered by the namespace label in flight.
264264

265-
Access to read the list of currently firing alerts is gated by the permission to `get prometheusrules.monitoring.coreos.com` in the requested namespace.
265+
Access to list the silences is gated by the permission to `get prometheusrules.monitoring.coreos.com` in the requested namespace.
266266

267-
Access to post a new silence or update an existing silence is gated by the permission to `create prometheusrules.monitoring.coreos.com`.
267+
Access to create a new silence or update an existing silence is gated by the permission to `create prometheusrules.monitoring.coreos.com` in the requested namespace.
268+
269+
Access to delete an existing silence is gated by the permission to `delete prometheusrules.monitoring.coreos.com` in the requested namespace.
268270

269271
### Multitenancy
270272

0 commit comments

Comments
 (0)