tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add version info in /v1 

fixes #12327
This commit is contained in:
Gunnar Beutner 2016-08-09 08:44:53 +02:00
parent 60dcf233ce
commit 26d048d6c3
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/remote/infohandler.cpp
View File

@ -19,6 +19,7 @@
#include "remote/infohandler.hpp" #include "remote/infohandler.hpp"
#include "remote/httputility.hpp" #include "remote/httputility.hpp"
#include "base/application.hpp"
using namespace icinga; using namespace icinga;
@ -70,6 +71,7 @@ bool InfoHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
result1->Set("user", user->GetName()); result1->Set("user", user->GetName());
result1->Set("permissions", Array::FromVector(permInfo)); result1->Set("permissions", Array::FromVector(permInfo));
result1->Set("version", Application::GetAppVersion());
result1->Set("info", "More information about API requests is available in the documentation at http://docs.icinga.org/icinga2/latest."); result1->Set("info", "More information about API requests is available in the documentation at http://docs.icinga.org/icinga2/latest.");
Array::Ptr results = new Array(); Array::Ptr results = new Array();
@ -82,7 +84,7 @@ bool InfoHandler::HandleRequest(const ApiUser::Ptr& user, HttpRequest& request,
} else { } else {
response.AddHeader("Content-Type", "text/html"); response.AddHeader("Content-Type", "text/html");
String body = "<html><head><title>Icinga 2</title></head><h1>Hello from Icinga 2!</h1>"; String body = "<html><head><title>Icinga 2</title></head><h1>Hello from Icinga 2 (Version: " + Application::GetAppVersion() + ")!</h1>";
body += "<p>You are authenticated as <b>" + user->GetName() + "</b>. "; body += "<p>You are authenticated as <b>" + user->GetName() + "</b>. ";
if (!permInfo.empty()) { if (!permInfo.empty()) {