Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix ssl_cert deprecation warnings #9758

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix ssl_cert deprecation warnings #9758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47d65a1
ssl_cert: replace deprecated -n with --match
OdyX May 8, 2023
610ba8d
ssl_cert: drop now-unsupported --altnames
OdyX May 8, 2023
d3d74c2
ITL: ssl_cert: vars.ssl_cert_cn: default to "$ssl_cert_altnames$"
Al2Klimov May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions doc/10-icinga-template-library.md
View file
Open in desktop
Expand Up @@ -5784,8 +5784,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_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_cn | **Optional.** Pattern to match the CN of the certificate.
ssl_cert_altnames | **Optional.** Matches the pattern specified in -n with alternate
ssl_cert_cn | **Optional.** Pattern to match the CN or AltName 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_email | **Optional.** Pattern to match the email address contained in the certificate.
Expand Down
9 changes: 3 additions & 6 deletions itl/plugins-contrib.d/web.conf
View file
Open in desktop
Expand Up @@ -396,13 +396,9 @@ object CheckCommand "ssl_cert" {
value = "$ssl_cert_critical$"
description = "Minimum number of days a certificate has to be valid to issue a critical status"
}
"-n" = {
"--match" = {
value = "$ssl_cert_cn$"
description = "Pattern to match the CN of the certificate"
}
"--altnames" = {
set_if = "$ssl_cert_altnames$"
description = "Matches the pattern specified in -n with alternate"
OdyX marked this conversation as resolved.
Show resolved Hide resolved
description = "Pattern to match the CN or AltNames of the certificate"
}
"-i" = {
value = "$ssl_cert_issuer$"
Expand Down Expand Up @@ -583,6 +579,7 @@ object CheckCommand "ssl_cert" {

vars.ssl_cert_address = "$check_address$"
vars.ssl_cert_port = 443
vars.ssl_cert_cn = "$ssl_cert_altnames$"
}

object CheckCommand "varnish" {
Expand Down