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

Merge pull request #5773 from Icinga/feature/windows-client-requirements 

Update Windows Client requirements for 2.8
This commit is contained in:
Michael Friedrich 2017-11-17 14:45:03 +01:00 committed by GitHub
parent 21efdae8b7 6244ab1e8c
commit df10d2a295
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/06-distributed-monitoring.md
View File

@ -597,6 +597,7 @@ Download the MSI-Installer package from [https://packages.icinga.com/windows/](h
Requirements: Requirements:
* Windows Vista/Server 2008 or higher * Windows Vista/Server 2008 or higher
* Versions older than Windows 10/Server 2016 require the [Universal C Runtime for Windows](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows)
* [Microsoft .NET Framework 2.0](https://www.microsoft.com/de-de/download/details.aspx?id=1639) for the setup wizard * [Microsoft .NET Framework 2.0](https://www.microsoft.com/de-de/download/details.aspx?id=1639) for the setup wizard
The installer package includes the [NSClient++](https://www.nsclient.org/) package The installer package includes the [NSClient++](https://www.nsclient.org/) package

4
doc/16-upgrading-icinga-2.md
View File

@ -117,6 +117,10 @@ In order to use these features, **all instances must be upgraded to v2.8**.
More details in [this chapter](06-distributed-monitoring.md#distributed-monitoring-setup-sign-certificates-master). More details in [this chapter](06-distributed-monitoring.md#distributed-monitoring-setup-sign-certificates-master).
### Windows Client <a id="upgrading-to-2-8-windows-client"></a>
Windows versions older than Windows 10/Server 2016 require the [Universal C Runtime for Windows](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows).
### Removed Bottom Up Client Mode <a id="upgrading-to-2-8-removed-bottom-up-client-mode"></a> ### Removed Bottom Up Client Mode <a id="upgrading-to-2-8-removed-bottom-up-client-mode"></a>
This client mode was deprecated in 2.6 and was removed in 2.8. This client mode was deprecated in 2.6 and was removed in 2.8.

6
icinga-installer/icinga2.wixpatch.cmake
View File

@ -10,12 +10,9 @@
<Binary Id="icinga2_installer" SourceFile="$<TARGET_FILE:icinga-installer>" /> <Binary Id="icinga2_installer" SourceFile="$<TARGET_FILE:icinga-installer>" />
<InstallExecuteSequence> <InstallExecuteSequence>
<!-- Removed for builds with VS2013, kept intact for VS2015 -->
<!--
<Custom Action='CheckForUCRT' Before='LaunchConditions'> <Custom Action='CheckForUCRT' Before='LaunchConditions'>
<![CDATA[Not REMOVE="ALL" AND Not PREVIOUSFOUND AND UCRTINSTALLED = ""]]> <![CDATA[Not REMOVE="ALL" AND Not PREVIOUSFOUND AND UCRTINSTALLED = ""]]>
</Custom> </Custom>
-->
<Custom Action="XtraUpgradeNSIS" After="InstallInitialize">$CM_CP_sbin.icinga2_installer.exe&gt;2</Custom> <Custom Action="XtraUpgradeNSIS" After="InstallInitialize">$CM_CP_sbin.icinga2_installer.exe&gt;2</Custom>
<Custom Action="XtraInstall" Before="InstallFinalize">$CM_CP_sbin.icinga2_installer.exe&gt;2</Custom> <Custom Action="XtraInstall" Before="InstallFinalize">$CM_CP_sbin.icinga2_installer.exe&gt;2</Custom>
<Custom Action="XtraUninstall" Before="RemoveExistingProducts">$CM_CP_sbin.icinga2_installer.exe=2</Custom> <Custom Action="XtraUninstall" Before="RemoveExistingProducts">$CM_CP_sbin.icinga2_installer.exe=2</Custom>
@ -36,8 +33,6 @@
Value="LaunchIcinga2Wizard">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish> Value="LaunchIcinga2Wizard">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
</UI> </UI>
<!-- Removed for builds with VS2013, kept intact for VS2015 -->
<!--
<Property Id="UCRTINSTALLED" Secure="yes"> <Property Id="UCRTINSTALLED" Secure="yes">
<DirectorySearch Id="searchSystem2" Path="[SystemFolder]" Depth="0"> <DirectorySearch Id="searchSystem2" Path="[SystemFolder]" Depth="0">
<FileSearch Id="UCRT_FileSearch" <FileSearch Id="UCRT_FileSearch"
@ -47,6 +42,5 @@
</Property> </Property>
<CustomAction Id="CheckForUCRT" Error="Installation cannot continue because the Microsoft Universal C Runtime is not installed. Please see https://support.microsoft.com/en-us/kb/2999226 for more details." /> <CustomAction Id="CheckForUCRT" Error="Installation cannot continue because the Microsoft Universal C Runtime is not installed. Please see https://support.microsoft.com/en-us/kb/2999226 for more details." />
-->
</CPackWiXFragment> </CPackWiXFragment>
</CPackWiXPatch> </CPackWiXPatch>

4
lib/icinga/checkable-flapping.cpp
View File

@ -26,6 +26,8 @@ using namespace icinga;
void Checkable::UpdateFlappingStatus(bool stateChange) void Checkable::UpdateFlappingStatus(bool stateChange)
{ {
/* TODO: Add support for Windows satellites/masters. */
#ifndef _WIN32 /* _WIN32 */
std::bitset<20> stateChangeBuf = GetFlappingBuffer(); std::bitset<20> stateChangeBuf = GetFlappingBuffer();
int oldestIndex = GetFlappingIndex(); int oldestIndex = GetFlappingIndex();
@ -56,6 +58,8 @@ void Checkable::UpdateFlappingStatus(bool stateChange)
if (flapping != GetFlapping()) if (flapping != GetFlapping())
SetFlappingLastChange(Utility::GetTime()); SetFlappingLastChange(Utility::GetTime());
#endif /* _WIN32 */
} }
bool Checkable::IsFlapping(void) const bool Checkable::IsFlapping(void) const