RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-31 07:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16902 from liewegas/wip-health-deprecation

Browse Source 
mon: add mon_health_preluminous_compat_warning

Reviewed-by: John Spray <john.spray@redhat.com>
This commit is contained in:
Sage Weil 2017-08-08 21:29:01 -05:00 committed by GitHub
commit d8f60f1f82
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/options.cc
View File

@ -1181,7 +1181,11 @@ std::vector<Option> get_global_options() {
Option("mon_health_preluminous_compat", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
.set_default(false)
.set_description(""),
.set_description("Include health warnings in preluminous JSON fields"),
Option("mon_health_preluminous_compat_warning", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
.set_default(true)
.set_description("Warn about the health JSON format change in preluminous JSON fields"),
Option("mon_health_max_detail", Option::TYPE_INT, Option::LEVEL_ADVANCED)
.set_default(50)

29
src/mon/Monitor.cc
View File

@ -2462,6 +2462,7 @@ health_status_t Monitor::get_health_status(
{
health_status_t r = HEALTH_OK;
bool compat = g_conf->mon_health_preluminous_compat;
bool compat_warn = g_conf->get_val<bool>("mon_health_preluminous_compat_warning");
if (f) {
f->open_object_section("health");
f->open_object_section("checks");
@ -2487,25 +2488,37 @@ health_status_t Monitor::get_health_status(
*plain += "\n";
}
if (f && compat) {
f->open_array_section("summary");
for (auto& svc : paxos_service) {
svc->get_health_checks().dump_summary_compat(f);
if (f && (compat || compat_warn)) {
health_status_t cr = compat_warn ? min(HEALTH_WARN, r) : r;
if (compat) {
f->open_array_section("summary");
if (compat_warn) {
f->open_object_section("item");
f->dump_stream("severity") << HEALTH_WARN;
f->dump_string("summary", "'ceph health' JSON format has changed in luminous; update your health monitoring scripts");
f->close_section();
}
for (auto& svc : paxos_service) {
svc->get_health_checks().dump_summary_compat(f);
}
f->close_section();
}
f->close_section();
f->dump_stream("overall_status") << r;
f->dump_stream("overall_status") << cr;
}
if (want_detail) {
if (f && compat) {
if (f && (compat || compat_warn)) {
f->open_array_section("detail");
if (compat_warn) {
f->dump_string("item", "'ceph health' JSON format has changed in luminous. If you see this your monitoring system is scraping the wrong fields. Disable this with 'mon health preluminous compat warning = false'");
}
}
for (auto& svc : paxos_service) {
svc->get_health_checks().dump_detail(f, plain, compat);
}
if (f && compat) {
if (f && (compat || compat_warn)) {
f->close_section();
}
}