diff --git a/INSTALL.md b/INSTALL.md index 10c3cd40a..e0573e0ec 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -7,7 +7,7 @@ of operating systems. Please check the documentation in the [doc/](doc/) directory for a current list of available packages and detailed installation instructions. -The online documentation is available on [icinga.com/docs](https://www.icinga.com/docs/) +The online documentation is available on [icinga.com/docs](https://icinga.com/docs/) and will guide you step by step. There are a number of known caveats when installing from source such as diff --git a/NEWS b/NEWS index ef80fe476..3cc501a7a 100644 --- a/NEWS +++ b/NEWS @@ -1 +1 @@ -News for this application can be found on the project website at https://www.icinga.com +News for this application can be found on the project website at https://icinga.com diff --git a/README.md b/README.md index 595af36fe..0a08c12c6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Icinga 2 -![Icinga Logo](https://www.icinga.com/wp-content/uploads/2014/06/icinga_logo.png) +![Icinga Logo](https://icinga.com/wp-content/uploads/2014/06/icinga_logo.png) #### Table of Contents @@ -21,11 +21,11 @@ network resources, notifies users of outages, and generates performance data for Scalable and extensible, Icinga 2 can monitor large, complex environments across multiple locations. -Icinga 2 as monitoring core works best with [Icinga Web 2](https://www.icinga.com/products/icinga-web-2/) +Icinga 2 as monitoring core works best with [Icinga Web 2](https://icinga.com/products/icinga-web-2/) as web interface. -More information can be found at [www.icinga.com](https://www.icinga.com/products/icinga-2/) -and inside the [documentation](https://www.icinga.com/docs/icinga2/latest/). +More information can be found at [icinga.com](https://icinga.com/products/icinga-2/) +and inside the [documentation](https://icinga.com/docs/icinga2/latest/). ## Licensing @@ -58,9 +58,9 @@ is also available on https://docs.icinga.com ## Support -Check the project website at https://www.icinga.com for status updates. Join the -[community channels](https://www.icinga.com/community) for questions -or ask an Icinga partner for [professional support](https://www.icinga.com/services/support/). +Check the project website at https://icinga.com for status updates. Join the +[community channels](https://icinga.com/community) for questions +or ask an Icinga partner for [professional support](https://icinga.com/services/support/). ## Contributing diff --git a/choco/icinga2.nuspec.cmake b/choco/icinga2.nuspec.cmake index 2fa56d64a..59af944f4 100755 --- a/choco/icinga2.nuspec.cmake +++ b/choco/icinga2.nuspec.cmake @@ -11,16 +11,16 @@ Icinga Development Team icinga2 - Monitoring Agent for Windows Icinga 2 is an open source monitoring platform which notifies users about host and service outages. - https://www.icinga.com/ + https://icinga.com/ icinga2 agent monitoring admin - https://www.icinga.com/resources/faq/ + https://icinga.com/resources/faq/ https://github.com/Icinga/icinga2/blob/master/ChangeLog https://docs.icinga.com/icinga2/ https://github.com/Icinga/icinga2/issues https://github.com/Icinga/icinga2 https://github.com/Icinga/icinga2 false - https://www.icinga.com/wp-content/uploads/2015/05/icinga_icon_128x128.png + https://icinga.com/wp-content/uploads/2015/05/icinga_icon_128x128.png diff --git a/cmake/InstallConfig.cmake b/cmake/InstallConfig.cmake index aa39b9dfb..3f24b39d0 100644 --- a/cmake/InstallConfig.cmake +++ b/cmake/InstallConfig.cmake @@ -1,5 +1,5 @@ # Icinga 2 -# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com) +# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com) # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/cmake/SetFullDir.cmake b/cmake/SetFullDir.cmake index bd63a68bf..3e9e2236a 100644 --- a/cmake/SetFullDir.cmake +++ b/cmake/SetFullDir.cmake @@ -1,5 +1,5 @@ # Icinga 2 -# Copyright (C) 2018 Icinga Development Team (https://www.icinga.com) +# Copyright (C) 2018 Icinga Development Team (https://icinga.com) # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/contrib/GPLHeader b/contrib/GPLHeader index 6bc8a95ba..3fd58b106 100644 --- a/contrib/GPLHeader +++ b/contrib/GPLHeader @@ -1,6 +1,6 @@ /****************************************************************************** * Icinga 2 * - * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/) * + * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * diff --git a/contrib/discover-api.py b/contrib/discover-api.py index 9c3dd6a20..27f06e6c7 100755 --- a/contrib/discover-api.py +++ b/contrib/discover-api.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # Icinga 2 -# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/) +# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/contrib/discover.py b/contrib/discover.py index a49b62c95..2a8618a78 100755 --- a/contrib/discover.py +++ b/contrib/discover.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # Icinga 2 -# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/) +# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/doc/01-about.md b/doc/01-about.md index efd65b67e..554c077b9 100644 --- a/doc/01-about.md +++ b/doc/01-about.md @@ -17,9 +17,9 @@ LICENSE file included in the source package. ## Support -Check the project website at [icinga.com](https://www.icinga.com) for status updates. Join the +Check the project website at [icinga.com](https://icinga.com) for status updates. Join the [community channels](https://icinga.com/community/) for questions -or ask an Icinga partner for [professional support](https://www.icinga.com/services/support/). +or ask an Icinga partner for [professional support](https://icinga.com/services/support/). ## Contribute @@ -40,4 +40,4 @@ file. ## What's New The Icinga 2 Changelog is located [here](https://github.com/Icinga/icinga2/blob/master/CHANGELOG.md). -Please follow our release announcements on [icinga.com](https://www.icinga.com/blog/) too. +Please follow our release announcements on [icinga.com](https://icinga.com/blog/) too. diff --git a/doc/02-getting-started.md b/doc/02-getting-started.md index 244a797de..285544e70 100644 --- a/doc/02-getting-started.md +++ b/doc/02-getting-started.md @@ -1003,10 +1003,10 @@ rc-service icinga2 restart ### Installing Icinga Web 2 -Please consult the [installation documentation](https://www.icinga.com/docs/icingaweb2/latest/doc/02-Installation/) +Please consult the [installation documentation](https://icinga.com/docs/icingaweb2/latest/doc/02-Installation/) for further instructions on how to install Icinga Web 2. -The Icinga 2 API can be defined as [command transport](https://www.icinga.com/docs/icingaweb2/latest/modules/monitoring/doc/05-Command-Transports/) +The Icinga 2 API can be defined as [command transport](https://icinga.com/docs/icingaweb2/latest/modules/monitoring/doc/05-Command-Transports/) in Icinga Web 2 >= 2.4. ## Addons diff --git a/doc/03-monitoring-basics.md b/doc/03-monitoring-basics.md index a4775c69f..3c44b67c5 100644 --- a/doc/03-monitoring-basics.md +++ b/doc/03-monitoring-basics.md @@ -2227,7 +2227,7 @@ in the service object then. > **Note** > > Keep in mind that the values are still visible with the [debug console](11-cli-commands.md#cli-command-console) -> and the inspect mode in the [Icinga Director](https://www.icinga.com/docs/director/latest/). +> and the inspect mode in the [Icinga Director](https://icinga.com/docs/director/latest/). You can also set global environment variables in the application's sysconfig configuration file, e.g. `HOME` or specific library paths diff --git a/doc/06-distributed-monitoring.md b/doc/06-distributed-monitoring.md index fa1bcdb67..44e1ae2e3 100644 --- a/doc/06-distributed-monitoring.md +++ b/doc/06-distributed-monitoring.md @@ -1209,14 +1209,14 @@ section where you can find detailed information on extending the setup. If you are eager to start fresh instead you might take a look into the -[Icinga Director](https://www.icinga.com/docs/director/latest/). +[Icinga Director](https://icinga.com/docs/director/latest/). ## Scenarios The following examples should give you an idea on how to build your own distributed monitoring environment. We've seen them all in production environments and received feedback from our [community](https://icinga.com/community/) -and [partner support](https://www.icinga.com/services/support/) channels: +and [partner support](https://icinga.com/services/support/) channels: * Single master with clients. * HA master with clients as command endpoint. diff --git a/doc/11-cli-commands.md b/doc/11-cli-commands.md index a6a625e5f..886dff5ea 100644 --- a/doc/11-cli-commands.md +++ b/doc/11-cli-commands.md @@ -55,7 +55,7 @@ Global options: -X [ --script-debugger ] whether to enable the script debugger Report bugs at -Icinga home page: +Icinga home page: ``` @@ -165,7 +165,7 @@ Global options: -X [ --script-debugger ] whether to enable the script debugger Report bugs at -Icinga home page: +Icinga home page: ``` ## CLI command: Ca @@ -200,7 +200,7 @@ Global options: -X [ --script-debugger ] whether to enable the script debugger Report bugs at -Icinga home page: +Icinga home page: ``` ## CLI command: Console @@ -254,7 +254,7 @@ Command options: --sandbox enable sandbox mode Report bugs at -Icinga home page: +Icinga home page: ``` @@ -394,7 +394,7 @@ Command options: --close-stdio do not log to stdout (or stderr) after startup Report bugs at -Icinga home page: +Icinga home page: ``` ### Config Files @@ -467,7 +467,7 @@ Global options: -X [ --script-debugger ] whether to enable the script debugger Report bugs at -Icinga home page: +Icinga home page: ``` ## CLI command: Object @@ -509,7 +509,7 @@ Global options: -X [ --script-debugger ] whether to enable the script debugger Report bugs at -Icinga home page: +Icinga home page: ``` ## CLI command: Pki @@ -556,7 +556,7 @@ Global options: -X [ --script-debugger ] whether to enable the script debugger Report bugs at -Icinga home page: +Icinga home page: ``` ## CLI command: Troubleshoot @@ -600,7 +600,7 @@ Command options: --include-vars Print all Variables (like `variable list`) Report bugs at -Icinga home page: +Icinga home page: ``` ## CLI command: Variable @@ -633,7 +633,7 @@ Global options: -X [ --script-debugger ] whether to enable the script debugger Report bugs at -Icinga home page: +Icinga home page: ``` ## Enabling/Disabling Features diff --git a/doc/12-icinga2-api.md b/doc/12-icinga2-api.md index c26ef937d..8709438d1 100644 --- a/doc/12-icinga2-api.md +++ b/doc/12-icinga2-api.md @@ -1875,7 +1875,7 @@ There are a couple of existing clients which can be used with the Icinga 2 API: * [curl](https://curl.haxx.se/) or any other HTTP client really * [Icinga 2 console (CLI command)](12-icinga2-api.md#icinga2-api-clients-cli-console) -* [Icinga Web 2 Director](https://www.icinga.com/products/icinga-web-2-modules/) +* [Icinga Web 2 Director](https://icinga.com/products/icinga-web-2-modules/) Demo cases: diff --git a/doc/13-addons.md b/doc/13-addons.md index 7a7e81d22..eaf1af858 100644 --- a/doc/13-addons.md +++ b/doc/13-addons.md @@ -102,7 +102,7 @@ is even simpler these days. * Configure the logstash `nagios` output to send passive traps to Icinga 2 using the external command pipe. * Execute a plugin to check Graylog alert streams. -More details can be found in [this blog post](https://www.icinga.com/2014/12/02/team-icinga-at-osmc-2014/). +More details can be found in [this blog post](https://icinga.com/2014/12/02/team-icinga-at-osmc-2014/). ## Notification Scripts and Interfaces @@ -116,19 +116,19 @@ There's a variety of resources available, for example different notification scr * Ticket systems * etc. -Additionally external services can be [integrated with Icinga 2](https://www.icinga.com/products/integrations/): +Additionally external services can be [integrated with Icinga 2](https://icinga.com/products/integrations/): -* [Pagerduty](https://www.icinga.com/partners/pagerduty/) -* [VictorOps](https://www.icinga.com/partners/victorops/) -* [StackStorm](https://www.icinga.com/partners/stackstorm/) +* [Pagerduty](https://icinga.com/partners/pagerduty/) +* [VictorOps](https://icinga.com/partners/victorops/) +* [StackStorm](https://icinga.com/partners/stackstorm/) -More information can be found on the [Icinga Website](https://www.icinga.com/). +More information can be found on the [Icinga Website](https://icinga.com/). ## Configuration Management Tools If you require your favourite configuration tool to export the Icinga 2 configuration, please get in touch with their developers. The Icinga project does not provide a configuration web interface -yet. Follow the [Icinga Blog](https://www.icinga.com/blog/) for updates on this topic. +yet. Follow the [Icinga Blog](https://icinga.com/blog/) for updates on this topic. If you're looking for puppet manifests, chef cookbooks, ansible recipes, etc. -- we're happy to integrate them upstream, so please get in touch with the [Icinga team](https://icinga.com/community/). diff --git a/doc/15-troubleshooting.md b/doc/15-troubleshooting.md index e4758921f..8ccfda895 100644 --- a/doc/15-troubleshooting.md +++ b/doc/15-troubleshooting.md @@ -18,8 +18,8 @@ findings and details please. * `icinga2 --version` * `icinga2 feature list` * `icinga2 daemon -C` - * [Icinga Web 2](https://www.icinga.com/products/icinga-web-2/) version (screenshot from System - About) - * [Icinga Web 2 modules](https://www.icinga.com/products/icinga-web-2-modules/) e.g. the Icinga Director (optional) + * [Icinga Web 2](https://icinga.com/products/icinga-web-2/) version (screenshot from System - About) + * [Icinga Web 2 modules](https://icinga.com/products/icinga-web-2-modules/) e.g. the Icinga Director (optional) * Configuration insights: * Provide complete configuration snippets explaining your problem in detail * Your [icinga2.conf](04-configuring-icinga-2.md#icinga2-conf) file @@ -568,7 +568,7 @@ trying because you probably have a problem that requires manual intervention. ### Late Check Results -[Icinga Web 2](https://www.icinga.com/products/icinga-web-2/) provides +[Icinga Web 2](https://icinga.com/products/icinga-web-2/) provides a dashboard overview for `overdue checks`. The REST API provides the [status](12-icinga2-api.md#icinga2-api-status) URL endpoint with some generic metrics @@ -584,7 +584,7 @@ You can also calculate late check results via the REST API: * Compare the timestamp with the current time and add `check_interval` multiple times (change it to see which results are really late, like five times check_interval) You can use the [icinga2 console](11-cli-commands.md#cli-command-console) to connect to the instance, fetch all data -and calculate the differences. More infos can be found in [this blogpost](https://www.icinga.com/2016/08/11/analyse-icinga-2-problems-using-the-console-api/). +and calculate the differences. More infos can be found in [this blogpost](https://icinga.com/2016/08/11/analyse-icinga-2-problems-using-the-console-api/). ``` # ICINGA2_API_USERNAME=root ICINGA2_API_PASSWORD=icinga icinga2 console --connect 'https://localhost:5665/' @@ -879,7 +879,7 @@ critical/config: Error: Cannot make SSL context for cert path: 'C:\ProgramData\i ``` A technical analysis and solution for re-creating the public CA certificate is -available in [this advisory](https://www.icinga.com/2017/08/30/advisory-for-ssl-problems-with-leading-zeros-on-openssl-1-1-0/). +available in [this advisory](https://icinga.com/2017/08/30/advisory-for-ssl-problems-with-leading-zeros-on-openssl-1-1-0/). ## Cluster and Clients Troubleshooting diff --git a/doc/16-upgrading-icinga-2.md b/doc/16-upgrading-icinga-2.md index bc15462bb..9809066d9 100644 --- a/doc/16-upgrading-icinga-2.md +++ b/doc/16-upgrading-icinga-2.md @@ -402,10 +402,10 @@ attributes. More details can be found [here](08-advanced-topics.md#check-flappin ## Upgrading to v2.7 v2.7.0 provided new notification scripts and commands. Please ensure to -update your configuration accordingly. An advisory has been published [here](https://www.icinga.com/2017/08/23/advisory-for-icinga-2-v2-7-update-and-mail-notification-scripts/). +update your configuration accordingly. An advisory has been published [here](https://icinga.com/2017/08/23/advisory-for-icinga-2-v2-7-update-and-mail-notification-scripts/). In case are having troubles with OpenSSL 1.1.0 and the -public CA certificates, please read [this advisory](https://www.icinga.com/2017/08/30/advisory-for-ssl-problems-with-leading-zeros-on-openssl-1-1-0/) +public CA certificates, please read [this advisory](https://icinga.com/2017/08/30/advisory-for-ssl-problems-with-leading-zeros-on-openssl-1-1-0/) and check the [troubleshooting chapter](15-troubleshooting.md#troubleshooting). If Icinga 2 fails to start with an empty reference to `$ICINGA2_CACHE_DIR` diff --git a/doc/icinga2.8 b/doc/icinga2.8 index f9ea45bb7..ca177eefd 100644 --- a/doc/icinga2.8 +++ b/doc/icinga2.8 @@ -90,9 +90,9 @@ Detach from the controlling terminal. .SH "REPORTING BUGS" Report bugs at .br -Icinga home page: +Icinga home page: .SH COPYRIGHT -Copyright \(co 2012\-2014 Icinga Development Team (https://www.icinga.com) +Copyright \(co 2012\-2014 Icinga Development Team (https://icinga.com) License GPLv2+: GNU GPL version 2 or later .br This is free software: you are free to change and redistribute it. diff --git a/etc/icinga2/scripts/mail-host-notification.sh b/etc/icinga2/scripts/mail-host-notification.sh index cecb2d754..781fee355 100755 --- a/etc/icinga2/scripts/mail-host-notification.sh +++ b/etc/icinga2/scripts/mail-host-notification.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/) +# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) # Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license PROG="`basename $0`" diff --git a/etc/icinga2/scripts/mail-service-notification.sh b/etc/icinga2/scripts/mail-service-notification.sh index c53d4d022..d4a1944dc 100755 --- a/etc/icinga2/scripts/mail-service-notification.sh +++ b/etc/icinga2/scripts/mail-service-notification.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/) +# Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) # Except of function urlencode which is Copyright (C) by Brian White (brian@aljex.com) used under MIT license PROG="`basename $0`" diff --git a/lib/config/config_lexer.ll b/lib/config/config_lexer.ll index 899280ff7..5fae7aabc 100644 --- a/lib/config/config_lexer.ll +++ b/lib/config/config_lexer.ll @@ -1,7 +1,7 @@ %{ /****************************************************************************** * Icinga 2 * - * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/) * + * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy index 5db8f5598..bad5796bd 100644 --- a/lib/config/config_parser.yy +++ b/lib/config/config_parser.yy @@ -3,7 +3,7 @@ /****************************************************************************** * Icinga 2 * - * Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/) * + * Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp index dcaf85218..504ad77e2 100644 --- a/lib/remote/apilistener.cpp +++ b/lib/remote/apilistener.cpp @@ -149,7 +149,7 @@ void ApiListener::OnConfigLoaded() CopyCertificateFile(oldCaPath, defaultCaPath); if (!oldCertPath.IsEmpty() && !oldKeyPath.IsEmpty() && !oldCaPath.IsEmpty()) { - Log(LogWarning, "ApiListener", "Please read the upgrading documentation for v2.8: https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"); + Log(LogWarning, "ApiListener", "Please read the upgrading documentation for v2.8: https://icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"); } /* set up SSL context */ diff --git a/plugins/README.md b/plugins/README.md index f524f31ab..0a34bffd8 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -34,7 +34,7 @@ A critical state always overwrites a warning state, meaning the check would be c ### License Icinga 2 -Copyright (C) 2012-2018 Icinga Development Team (https://www.icinga.com/) +Copyright (C) 2012-2018 Icinga Development Team (https://icinga.com/) This program is free software; you can redistribute it and/or modify it under the tems of the GNU General Public License diff --git a/tools/syntax/vim/syntax/icinga2.vim b/tools/syntax/vim/syntax/icinga2.vim index 33d178671..0374c7b5a 100644 --- a/tools/syntax/vim/syntax/icinga2.vim +++ b/tools/syntax/vim/syntax/icinga2.vim @@ -96,7 +96,7 @@ syn keyword icinga2ObjAttr contained timeout times tls_handshake_timeout tls_p syn keyword icinga2ObjAttr contained types update_interval user user_groups username users volatile zone syn match icinga2ObjAttr contained "\(vars.\w\+\)" -" keywords: https://www.icinga.com/docs/icinga2/latest/doc/17-language-reference/#reserved-keywords +" keywords: https://icinga.com/docs/icinga2/latest/doc/17-language-reference/#reserved-keywords syn keyword icinga2Keyword object template include include_recursive include_zones library syn keyword icinga2Keyword const var this globals locals use default ignore_on_error syn keyword icinga2Keyword current_filename current_line apply to where import assign @@ -107,7 +107,7 @@ syn keyword icinga2Keyword ignore function return in syn match icinga2AssignCond contained "\(assign[ \t]\+\where\|ignore[ \t]\+\where\)" -" Documentation reference: https://www.icinga.com/docs/icinga2/latest/doc/18-library-reference/ +" Documentation reference: https://icinga.com/docs/icinga2/latest/doc/18-library-reference/ " Global functions syn keyword icinga2GFunction contained regex match cidr_match range len union intersection keys string @@ -257,7 +257,7 @@ syn match icinga2Operators "[ \t]\+\(/=\)\+" " ### Global settings " Global constants -" https://www.icinga.com/docs/icinga2/snapshot/doc/17-language-reference/#icinga-2-specific-constants +" https://icinga.com/docs/icinga2/snapshot/doc/17-language-reference/#icinga-2-specific-constants " Path specific constants syn keyword icinga2PathConstant CacheDir ConfigDir DataDir IncludeConfDir InitRunDir LocalStateDir LogDir ModAttrPath