upstream/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2026-02-03 20:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge ee815307af into 274a0e39d5

Browse source
This commit is contained in:
Alexander Aleksandrovič Klimov 2026-02-03 15:23:52 +01:00 committed by GitHub
commit 7367140472
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lib/base/utility.cpp
View file

@ -5,6 +5,7 @@
#include "base/convert.hpp"
#include "base/application.hpp"
#include "base/defer.hpp"
#include "base/lazy-init.hpp"
#include "base/logger.hpp"
#include "base/exception.hpp"
#include "base/socket.hpp"
@ -1731,17 +1732,20 @@ static bool ReleaseHelper(String *platformName, String *platformVersion)
#endif /* _WIN32 */
}
String Utility::GetPlatformKernel()
{
static LazyInit<String> l_PlatformKernel ([]() -> String {
#ifdef _WIN32
return "Windows";
#else /* _WIN32 */
return UnameHelper('s');
#endif /* _WIN32 */
});
String Utility::GetPlatformKernel()
{
return l_PlatformKernel.Get();
}
String Utility::GetPlatformKernelVersion()
{
static LazyInit<String> l_PlatformKernelVersion ([]() -> String {
#ifdef _WIN32
OSVERSIONINFO info;
info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
@ -1754,26 +1758,38 @@ String Utility::GetPlatformKernelVersion()
#else /* _WIN32 */
return UnameHelper('r');
#endif /* _WIN32 */
});
String Utility::GetPlatformKernelVersion()
{
return l_PlatformKernelVersion.Get();
}
String Utility::GetPlatformName()
{
static LazyInit<String> l_PlatformName ([]() -> String {
String platformName;
if (!ReleaseHelper(&platformName, nullptr))
return "Unknown";
return platformName;
});
String Utility::GetPlatformName()
{
return l_PlatformName.Get();
}
String Utility::GetPlatformVersion()
{
static LazyInit<String> l_PlatformVersion ([]() -> String {
String platformVersion;
if (!ReleaseHelper(nullptr, &platformVersion))
return "Unknown";
return platformVersion;
});
String Utility::GetPlatformVersion()
{
return l_PlatformVersion.Get();
}
String Utility::GetPlatformArchitecture()
{
static LazyInit<String> l_PlatformArchitecture ([]() -> String {
#ifdef _WIN32
SYSTEM_INFO info;
GetNativeSystemInfo(&info);
@ -1790,6 +1806,11 @@ String Utility::GetPlatformArchitecture()
#else /* _WIN32 */
return UnameHelper('m');
#endif /* _WIN32 */
});
String Utility::GetPlatformArchitecture()
{
return l_PlatformArchitecture.Get();
}
const char l_Utf8Replacement[] = "\xEF\xBF\xBD";

7
lib/methods/icingachecktask.cpp
View file

@ -155,7 +155,12 @@ void IcingaCheckTask::ScriptFunc(const Checkable::Ptr& checkable, const CheckRes
String appVersion = Application::GetAppVersion();
String output = "Icinga 2 has been running for " + Utility::FormatDuration(uptime) +
". Version: " + appVersion;
". Version: " + appVersion +
"; Platform: " + Utility::GetPlatformName() +
"; Platform version: " + Utility::GetPlatformVersion() +
"; Kernel: " + Utility::GetPlatformKernel() +
"; Kernel version: " + Utility::GetPlatformKernelVersion() +
"; Architecture: " + Utility::GetPlatformArchitecture();
/* Indicate a warning if the last reload failed. */
double lastReloadFailed = Application::GetLastReloadFailed();