tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 13:45:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9758 from liip-forks/OdyX-fix-ssl-cert-warnings

Browse Source 
Fix ssl_cert deprecation warnings
This commit is contained in:
Alexander Aleksandrovič Klimov 2024-05-24 11:57:34 +02:00 committed by GitHub
commit b56839fe18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/10-icinga-template-library.md
View File

@ -5834,8 +5834,7 @@ ssl_cert_proxy | **Optional.** Proxy server to use for connecting
ssl_cert_file | **Optional.** Local file path. Works only if `ssl_cert_address` is set to "localhost". ssl_cert_file | **Optional.** Local file path. Works only if `ssl_cert_address` is set to "localhost".
ssl_cert_warn | **Optional.** Minimum number of days a certificate has to be valid. ssl_cert_warn | **Optional.** Minimum number of days a certificate has to be valid.
ssl_cert_critical | **Optional.** Minimum number of days a certificate has to be valid to issue a critical status. ssl_cert_critical | **Optional.** Minimum number of days a certificate has to be valid to issue a critical status.
ssl_cert_cn | **Optional.** Pattern to match the CN of the certificate. ssl_cert_cn | **Optional.** Pattern to match the CN or AltName of the certificate.
ssl_cert_altnames | **Optional.** Matches the pattern specified in -n with alternate
ssl_cert_issuer | **Optional.** Pattern to match the issuer of the certificate. ssl_cert_issuer | **Optional.** Pattern to match the issuer of the certificate.
ssl_cert_org | **Optional.** Pattern to match the organization of the certificate. ssl_cert_org | **Optional.** Pattern to match the organization of the certificate.
ssl_cert_email | **Optional.** Pattern to match the email address contained in the certificate. ssl_cert_email | **Optional.** Pattern to match the email address contained in the certificate.

9
itl/plugins-contrib.d/web.conf
View File

@ -396,13 +396,9 @@ object CheckCommand "ssl_cert" {
value = "$ssl_cert_critical$" value = "$ssl_cert_critical$"
description = "Minimum number of days a certificate has to be valid to issue a critical status" description = "Minimum number of days a certificate has to be valid to issue a critical status"
} }
"-n" = { "--match" = {
value = "$ssl_cert_cn$" value = "$ssl_cert_cn$"
description = "Pattern to match the CN of the certificate" description = "Pattern to match the CN or AltNames of the certificate"
}
"--altnames" = {
set_if = "$ssl_cert_altnames$"
description = "Matches the pattern specified in -n with alternate"
} }
"-i" = { "-i" = {
value = "$ssl_cert_issuer$" value = "$ssl_cert_issuer$"
@ -587,6 +583,7 @@ object CheckCommand "ssl_cert" {
vars.ssl_cert_address = "$check_address$" vars.ssl_cert_address = "$check_address$"
vars.ssl_cert_port = 443 vars.ssl_cert_port = 443
vars.ssl_cert_cn = "$ssl_cert_altnames$"
} }
object CheckCommand "varnish" { object CheckCommand "varnish" {