Skip to content

Commit cb3d884

Browse files
Merge pull request openshift#2411 from openshift-cherrypick-robot/cherry-pick-2410-to-release-4.16
[release-4.16] OCPBUGS-36907: Add deprecated config runbook
2 parents 70b819e + ac13571 commit cb3d884

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

assets/cluster-monitoring-operator/prometheus-rule.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,8 @@ spec:
242242
severity: warning
243243
- alert: ClusterMonitoringOperatorDeprecatedConfig
244244
annotations:
245-
description: The configuration field {{ $labels.field }} in {{ $labels.configmap }} was deprecated in {{ $labels.deprecation_version }} and has no effect, you can remove it.
245+
description: The configuration field {{ $labels.field }} in {{ $labels.configmap }} was deprecated in {{ $labels.deprecation_version }} and has no effect.
246+
runbook_url: https://github.com/openshift/runbooks/blob/master/alerts/cluster-monitoring-operator/ClusterMonitoringOperatorDeprecatedConfig.md
246247
summary: Cluster Monitoring Operator is being used with deprecated configuration.
247248
expr: max by (configmap, field, deprecation_version) (cluster_monitoring_operator_deprecated_config_in_use) == 1
248249
for: 1h

jsonnet/rules.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ function(params) {
376376
'for': '1h',
377377
annotations: {
378378
summary: 'Cluster Monitoring Operator is being used with deprecated configuration.',
379-
description: 'The configuration field {{ $labels.field }} in {{ $labels.configmap }} was deprecated in {{ $labels.deprecation_version }} and has no effect, you can remove it.',
379+
description: 'The configuration field {{ $labels.field }} in {{ $labels.configmap }} was deprecated in {{ $labels.deprecation_version }} and has no effect.',
380380
},
381381
labels: {
382382
severity: 'info',

jsonnet/utils/sanitize-rules.libsonnet

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ local includeRunbooks = {
472472
AlertmanagerClusterFailedToSendAlerts: openShiftRunbookCMO('AlertmanagerClusterFailedToSendAlerts.md'),
473473
AlertmanagerFailedReload: openShiftRunbookCMO('AlertmanagerFailedReload.md'),
474474
AlertmanagerFailedToSendAlerts: openShiftRunbookCMO('AlertmanagerFailedToSendAlerts.md'),
475+
ClusterMonitoringOperatorDeprecatedConfig: openShiftRunbookCMO('ClusterMonitoringOperatorDeprecatedConfig.md'),
475476
ClusterOperatorDegraded: openShiftRunbookCMO('ClusterOperatorDegraded.md'),
476477
ClusterOperatorDown: openShiftRunbookCMO('ClusterOperatorDown.md'),
477478
KubeAggregatedAPIErrors: openShiftRunbookCMO('KubeAggregatedAPIErrors.md'),

0 commit comments

Comments
 (0)