From: Michael Friedrich <michael.friedrich@netways.de>
Date: Fri, 17 Jun 2016 10:43:05 +0000 (+0200)
Subject: DB IDO: Enhance ido check with schema info
X-Git-Tag: v2.5.0~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4241ba185375dcc959d40c7c3c438a43a7e7509;p=icinga2

DB IDO: Enhance ido check with schema info

fixes #11968
---

diff --git a/lib/db_ido/idochecktask.cpp b/lib/db_ido/idochecktask.cpp
index a2cce8172..519262f49 100644
--- a/lib/db_ido/idochecktask.cpp
+++ b/lib/db_ido/idochecktask.cpp
@@ -111,16 +111,19 @@ void IdoCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckResult
 		}
 	} else {
 		String schema_version = conn->GetSchemaVersion();
+		std::ostringstream msgbuf;
 
 		if (Utility::CompareVersion(IDO_CURRENT_SCHEMA_VERSION, schema_version) < 0) {
-			cr->SetOutput("Outdated schema version: " + schema_version + "; Latest version: "  IDO_CURRENT_SCHEMA_VERSION);
+			msgbuf << "Outdated schema version: '" << schema_version << "'. Latest version: '" << IDO_CURRENT_SCHEMA_VERSION << "'.";
 			cr->SetState(ServiceWarning);
 		} else {
-			std::ostringstream msgbuf;
-			msgbuf << "Connected to the database server; queries per second: "  << std::fixed << std::setprecision(3) << qps;
-			cr->SetOutput(msgbuf.str());
+			msgbuf << "Connected to the database server (Schema version: '" << schema_version << "').";
 			cr->SetState(ServiceOK);
 		}
+
+		msgbuf << " Queries per second: " << std::fixed << std::setprecision(3) << qps;
+
+		cr->SetOutput(msgbuf.str());
 	}
 
 	Array::Ptr perfdata = new Array();