Skip to content

Commit 1afba5c

Browse files
authored
Merge pull request ceph#53653 from rhcs-dashboard/fix-alert-generation
mgr/dashboard: fix broken alert generator Reviewed-by: Aashish Sharma <[email protected]> Reviewed-by: Anthony D Atri <[email protected]> Reviewed-by: Ankush Behl <[email protected]> Reviewed-by: Ernesto Puerta <[email protected]> Reviewed-by: Guillaume Abrioux <[email protected]>
2 parents 9ee47b0 + a5027e3 commit 1afba5c

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

monitoring/ceph-mixin/README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,10 @@ The jsonnet code located in this directory depends on some Jsonnet third party
7373
libraries. To update those libraries you can run `jb update` and then update
7474
the generated files using `tox -egrafonnet-fix`.
7575

76+
### Building alerts from `prometheus_alerts.libsonnet`
77+
78+
To rebuild the `prometheus_alerts.yml` file from the corresponding libsonnet,
79+
you can run `tox -ealerts-fix`.
80+
81+
7682
##### Any upgrade or downgrade to different major versions of the recommended tools mentioned above is not supported.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
std.manifestYamlDoc(((import 'config.libsonnet') + (import 'alerts.libsonnet')).prometheusAlerts, indent_array_in_object=true, quote_keys=false)
1+
std.manifestYamlDoc((import 'mixin.libsonnet').prometheusAlerts, indent_array_in_object=true, quote_keys=false)

monitoring/ceph-mixin/jsonnetfile.lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"subdir": "grafonnet"
99
}
1010
},
11-
"version": "30280196507e0fe6fa978a3e0eaca3a62844f817",
11+
"version": "a1d61cce1da59c71409b99b5c7568511fec661ea",
1212
"sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc="
1313
}
1414
],

monitoring/ceph-mixin/prometheus_alerts.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
annotations: {
237237
documentation: 'https://docs.ceph.com/en/latest/rados/operations/health-checks#device-health-toomany',
238238
summary: 'Too many devices are predicted to fail, unable to resolve%(cluster)s' % $.MultiClusterSummary(),
239-
description: 'The device health module has determined that devices predicted to fail can not be remediated automatically, since too many OSDs would be removed from the cluster to ensure performance and availabililty. Prevent data integrity issues by adding new OSDs so that data may be relocated.',
239+
description: 'The device health module has determined that devices predicted to fail can not be remediated automatically, since too many OSDs would be removed from the cluster to ensure performance and availability. Prevent data integrity issues by adding new OSDs so that data may be relocated.',
240240
},
241241
},
242242
{

0 commit comments

Comments
 (0)