diff --git a/CMakeLists.txt b/CMakeLists.txt index 0afef498f..5f863fa63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -512,25 +512,6 @@ set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE) include(InstallRequiredSystemLibraries) if(WIN32) - if(CMAKE_VS_PLATFORM_NAME STREQUAL "x64") - set(NSCP_URL "https://github.com/mickem/nscp/releases/download/0.5.2.39/NSCP-0.5.2.39-x64.msi") - set(NSCP_SHA256 "dfe93c293f30586b02510d8b7884e4e177b93a5fead8b5dc6de8103532e6e159") - else() - set(NSCP_URL "https://github.com/mickem/nscp/releases/download/0.5.2.39/NSCP-0.5.2.39-Win32.msi") - set(NSCP_SHA256 "ca6a67fb01c1468f2b510fd2f9eb0750887db3fb49a0302732c1421c85c6627c") - endif() - - set(NSCP_SHA256SUM "") - if (EXISTS ${CMAKE_CURRENT_BINARY_DIR}/NSCP.msi) - file(SHA256 ${CMAKE_CURRENT_BINARY_DIR}/NSCP.msi NSCP_SHA256SUM) - endif() - - if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/NSCP.msi OR NOT ${NSCP_SHA256SUM} STREQUAL ${NSCP_SHA256}) - file(DOWNLOAD ${NSCP_URL} ${CMAKE_CURRENT_BINARY_DIR}/NSCP.msi SHOW_PROGRESS) - endif() - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/NSCP.msi DESTINATION ${CMAKE_INSTALL_SBINDIR}) - if (OPENSSL_VERSION_MINOR GREATER_EQUAL 1) if (CMAKE_VS_PLATFORM_NAME STREQUAL "x64") list (APPEND ICINGA2_OPENSSL_DLLS ${OPENSSL_INCLUDE_DIR}/../bin/libcrypto-1_1-x64.dll ${OPENSSL_INCLUDE_DIR}/../bin/libssl-1_1-x64.dll) diff --git a/agent/windows-setup-agent/SetupWizard.Designer.cs b/agent/windows-setup-agent/SetupWizard.Designer.cs index 7dc52d1c4..dc36ac1c8 100644 --- a/agent/windows-setup-agent/SetupWizard.Designer.cs +++ b/agent/windows-setup-agent/SetupWizard.Designer.cs @@ -49,7 +49,6 @@ this.chkDisableConf = new System.Windows.Forms.CheckBox(); this.txtUser = new System.Windows.Forms.TextBox(); this.chkRunServiceAsThisUser = new System.Windows.Forms.CheckBox(); - this.chkInstallNSCP = new System.Windows.Forms.CheckBox(); this.chkAcceptConfig = new System.Windows.Forms.CheckBox(); this.chkAcceptCommands = new System.Windows.Forms.CheckBox(); this.txtTicket = new System.Windows.Forms.TextBox(); @@ -281,7 +280,6 @@ this.groupBox3.Controls.Add(this.chkDisableConf); this.groupBox3.Controls.Add(this.txtUser); this.groupBox3.Controls.Add(this.chkRunServiceAsThisUser); - this.groupBox3.Controls.Add(this.chkInstallNSCP); this.groupBox3.Controls.Add(this.chkAcceptConfig); this.groupBox3.Controls.Add(this.chkAcceptCommands); this.groupBox3.Location = new System.Drawing.Point(308, 326); @@ -323,16 +321,6 @@ this.chkRunServiceAsThisUser.UseVisualStyleBackColor = true; this.chkRunServiceAsThisUser.CheckedChanged += new System.EventHandler(this.chkRunServiceAsThisUser_CheckedChanged); // - // chkInstallNSCP - // - this.chkInstallNSCP.AutoSize = true; - this.chkInstallNSCP.Location = new System.Drawing.Point(9, 114); - this.chkInstallNSCP.Name = "chkInstallNSCP"; - this.chkInstallNSCP.Size = new System.Drawing.Size(190, 17); - this.chkInstallNSCP.TabIndex = 6; - this.chkInstallNSCP.Text = "Install/Update bundled NSClient++"; - this.chkInstallNSCP.UseVisualStyleBackColor = true; - // // chkAcceptConfig // this.chkAcceptConfig.AutoSize = true; @@ -813,7 +801,6 @@ private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.CheckBox chkAcceptConfig; private System.Windows.Forms.CheckBox chkAcceptCommands; - private System.Windows.Forms.CheckBox chkInstallNSCP; private System.Windows.Forms.TextBox txtUser; private System.Windows.Forms.CheckBox chkRunServiceAsThisUser; private System.Windows.Forms.Button btnEditEndpoint; diff --git a/agent/windows-setup-agent/SetupWizard.cs b/agent/windows-setup-agent/SetupWizard.cs index 10aabdb0a..327611c4b 100644 --- a/agent/windows-setup-agent/SetupWizard.cs +++ b/agent/windows-setup-agent/SetupWizard.cs @@ -272,16 +272,6 @@ namespace Icinga return; } - if (chkInstallNSCP.Checked) { - SetConfigureStatus(85, "Waiting for NSClient++ installation to complete..."); - - Process proc = new Process(); - proc.StartInfo.FileName = "msiexec.exe"; - proc.StartInfo.Arguments = "/i \"" + Program.Icinga2InstallDir + "\\sbin\\NSCP.msi\""; - proc.Start(); - proc.WaitForExit(); - } - SetConfigureStatus(100, "Finished."); // Override the completed text diff --git a/doc/06-distributed-monitoring.md b/doc/06-distributed-monitoring.md index 7d28a9ba2..f9e978456 100644 --- a/doc/06-distributed-monitoring.md +++ b/doc/06-distributed-monitoring.md @@ -769,9 +769,6 @@ The preferred flavor is `x86_64` for modern Windows systems. The Windows package provides native [monitoring plugin binaries](06-distributed-monitoring.md#distributed-monitoring-windows-plugins) to get you started more easily. -The installer package also includes the [NSClient++](https://www.nsclient.org/) package -to allow using its built-in plugins. You can find more details in -[this chapter](06-distributed-monitoring.md#distributed-monitoring-windows-nscp). > **Note** > @@ -830,7 +827,6 @@ Optionally enable the following settings: Accept commands from master/satellite instance(s) | **Optional.** Whether this node accepts command execution messages from the master node (required for [command endpoint mode](06-distributed-monitoring.md#distributed-monitoring-top-down-command-endpoint)). For [security reasons](06-distributed-monitoring.md#distributed-monitoring-security) this is disabled by default. Accept config updates from master/satellite instance(s) | **Optional.** Whether this node accepts configuration sync from the master node (required for [config sync mode](06-distributed-monitoring.md#distributed-monitoring-top-down-config-sync)). For [security reasons](06-distributed-monitoring.md#distributed-monitoring-security) this is disabled by default. Run Icinga 2 service as this user | **Optional.** Specify a different Windows user. This defaults to `NT AUTHORITY\Network Service` and is required for more privileged service checks. - Install/Update bundled NSClient++ | **Optional.** The Windows installer bundles the NSClient++ installer for additional [plugin checks](06-distributed-monitoring.md#distributed-monitoring-windows-nscp). Disable including local 'conf.d' directory | **Optional.** Allows to disable the `include_recursive "conf.d"` directive except for the `api-users.conf` file in the `icinga2.conf` file. Defaults to `true`. ![Icinga 2 Windows Setup](images/distributed-monitoring/icinga2_windows_setup_wizard_03.png) @@ -840,44 +836,6 @@ Verify the certificate from the master/satellite instance where this node should ![Icinga 2 Windows Setup](images/distributed-monitoring/icinga2_windows_setup_wizard_04.png) -#### Bundled NSClient++ Setup - -If you have chosen to install/update the NSClient++ package, the Icinga 2 setup wizard asks -you to do so. - -![Icinga 2 Windows Setup NSClient++](images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_01.png) - -Choose the `Generic` setup. - -![Icinga 2 Windows Setup NSClient++](images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_02.png) - -Choose the `Custom` setup type. - -![Icinga 2 Windows Setup NSClient++](images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_03.png) - -NSClient++ does not install a sample configuration by default. Change this as shown in the screenshot. - -![Icinga 2 Windows Setup NSClient++](images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_04.png) - -Generate a secure password and enable the web server module. **Note**: The webserver module is -available starting with NSClient++ 0.5.0. Icinga 2 v2.6+ is required which includes this version. - -![Icinga 2 Windows Setup NSClient++](images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_05.png) - -Finish the installation. - -![Icinga 2 Windows Setup NSClient++](images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_06.png) - -Open a web browser and navigate to `https://localhost:8443`. Enter the password you've configured -during the setup. In case you lost it, look into the `C:\Program Files\NSClient++\nsclient.ini` -configuration file. - -![Icinga 2 Windows Setup NSClient++](images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_07.png) - -The NSClient++ REST API can be used to query metrics. [check_nscp_api](06-distributed-monitoring.md#distributed-monitoring-windows-nscp-check-api) -uses this transport method. - - #### Finish Windows Agent Setup Finish the Windows setup wizard. @@ -943,7 +901,6 @@ C:\> Restart-Service icinga2 C:\> Get-Service icinga2 ``` - Now that you've successfully installed a Windows agent, please proceed to the [detailed configuration modes](06-distributed-monitoring.md#distributed-monitoring-configuration-modes). @@ -2790,9 +2747,8 @@ CPU utilization, please use the HTTP API instead of the CLI sample call. #### NSCLient++ with check_nscp_api -The [Windows setup](06-distributed-monitoring.md#distributed-monitoring-setup-agent-windows) already allows -you to install the NSClient++ package. In addition to the Windows plugins you can -use the [nscp_api command](10-icinga-template-library.md#nscp-check-api) provided by the Icinga Template Library (ITL). +In addition to the Windows plugins you can use the +[nscp_api command](10-icinga-template-library.md#nscp-check-api) provided by the Icinga Template Library (ITL). The initial setup for the NSClient++ API and the required arguments is the described in the ITL chapter for the [nscp_api](10-icinga-template-library.md#nscp-check-api) CheckCommand. @@ -2902,9 +2858,8 @@ apply Service "nscp-api-" for (svc in host.vars.services) { #### NSCLient++ with nscp-local -The [Windows setup](06-distributed-monitoring.md#distributed-monitoring-setup-agent-windows) allows -you to install the bundled NSClient++ package. In addition to the Windows plugins you can -use the [nscp-local commands](10-icinga-template-library.md#nscp-plugin-check-commands) +In addition to the Windows plugins you can use the +[nscp-local commands](10-icinga-template-library.md#nscp-plugin-check-commands) provided by the Icinga Template Library (ITL). Add the following `include` statement on all your nodes (master, satellite, agent): diff --git a/doc/07-agent-based-monitoring.md b/doc/07-agent-based-monitoring.md index a5a466e11..51e41acc4 100644 --- a/doc/07-agent-based-monitoring.md +++ b/doc/07-agent-based-monitoring.md @@ -47,8 +47,7 @@ Key benefits: Follow the setup and configuration instructions [here](06-distributed-monitoring.md#distributed-monitoring-setup-agent-satellite). On Windows hosts, the Icinga agent can query a local NSClient++ service -for additional checks in case there are no plugins available. The NSCP -installer is bundled with Icinga and can be installed with the setup wizard. +for additional checks in case there are no plugins available. ![Icinga 2 Windows Setup](images/distributed-monitoring/icinga2_windows_setup_wizard_01.png) diff --git a/doc/15-troubleshooting.md b/doc/15-troubleshooting.md index 1a6b3f00b..0797450cf 100644 --- a/doc/15-troubleshooting.md +++ b/doc/15-troubleshooting.md @@ -666,12 +666,6 @@ C:\Program Files\ICINGA2\sbin\icinga2.exe console --eval "dirname(msi_get_compon If this command does not return anything, NSClient++ is not properly installed. Verify that inside the `Programs and Features` (`appwiz.cpl`) control panel. -You can run the bundled NSClient++ installer from the Icinga 2 Windows package. -The msi package is located in `C:\Program Files\ICINGA2\sbin`. - -The bundled NSClient++ version has properly been tested with Icinga 2. Keep that -in mind when using a different package. - ### Check Thresholds Not Applied diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png index c74857ab6..1b7a1f117 100644 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png and b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_01.png differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png index 7084985b0..73f555963 100644 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png and b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02.png differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png index c0bc4e04c..1b4ad2771 100644 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png and b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_02_global_zone.png differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png index 0d246f4c3..ab0713458 100644 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png and b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_03.png differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_01.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_01.png deleted file mode 100644 index 8f9df0dc6..000000000 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_01.png and /dev/null differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_02.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_02.png deleted file mode 100644 index 1867db46a..000000000 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_02.png and /dev/null differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_03.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_03.png deleted file mode 100644 index 0775e292e..000000000 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_03.png and /dev/null differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_04.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_04.png deleted file mode 100644 index dd0d2fd24..000000000 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_04.png and /dev/null differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_05.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_05.png deleted file mode 100644 index bacd0691b..000000000 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_05.png and /dev/null differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_06.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_06.png deleted file mode 100644 index fa8331f8d..000000000 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_06.png and /dev/null differ diff --git a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_07.png b/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_07.png deleted file mode 100644 index 58b569931..000000000 Binary files a/doc/images/distributed-monitoring/icinga2_windows_setup_wizard_05_nsclient_07.png and /dev/null differ