From 490824f835e242b2ecb9300c12d2e9c93f834fc6 Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Mon, 8 Jan 2024 17:47:50 +0100 Subject: [PATCH 1/2] [4.5.1] Adds grpctls docs From https://github.com/kube-logging/logging-operator/pull/1634/ --- .../plugins/syslog-ng-outputs/auth.md | 4 +++- .../plugins/syslog-ng-outputs/tls.md | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/auth.md b/content/docs/configuration/plugins/syslog-ng-outputs/auth.md index 10b7e65a9..d84a2d05c 100644 --- a/content/docs/configuration/plugins/syslog-ng-outputs/auth.md +++ b/content/docs/configuration/plugins/syslog-ng-outputs/auth.md @@ -10,6 +10,8 @@ GRPC-based outputs use this configuration instead of the simple `tls` field foun ## Configuration ## Auth +Authentication settings. Only one authentication method can be set. Default: insecure + ### adc (*ADC, optional) {#auth-adc} Application Default Credentials (ADC). @@ -25,7 +27,7 @@ Application Layer Transport Security (ALTS) is a simple to use authentication, o This is the default method, authentication is disabled (`auth(insecure())`). -### tls (*TLS, optional) {#auth-tls} +### tls (*GrpcTLS, optional) {#auth-tls} This option sets various options related to TLS encryption, for example, key/certificate files and trusted CA locations. TLS can be used only with tcp-based transport protocols. For details, see [TLS for syslog-ng outputs](../tls/) and the [documentation of the AxoSyslog syslog-ng distribution](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions). diff --git a/content/docs/configuration/plugins/syslog-ng-outputs/tls.md b/content/docs/configuration/plugins/syslog-ng-outputs/tls.md index 10a8f001f..aba23ea27 100644 --- a/content/docs/configuration/plugins/syslog-ng-outputs/tls.md +++ b/content/docs/configuration/plugins/syslog-ng-outputs/tls.md @@ -49,3 +49,21 @@ Use the certificate store of the system for verifying HTTPS certificates. For de +## GrpcTLS + +### ca_file (*secret.Secret, optional) {#grpctls-ca_file} + +The name of a file that contains a set of trusted CA certificates in PEM format. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#ca-file). + + +### cert_file (*secret.Secret, optional) {#grpctls-cert_file} + +Name of a file that contains an X.509 certificate (or a certificate chain) in PEM format, suitable as a TLS certificate, matching the private key set in the key-file() option. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#cert-file). + + +### key_file (*secret.Secret, optional) {#grpctls-key_file} + +The name of a file that contains an unencrypted private key in PEM format, suitable as a TLS key. For details, see the [AxoSyslog Core documentation](https://axoflow.com/docs/axosyslog-core/chapter-encrypted-transport-tls/tlsoptions/#key-file). + + + From f2375377d787651fb4343294ff8e441eab838c1d Mon Sep 17 00:00:00 2001 From: Robert Fekete Date: Mon, 8 Jan 2024 17:49:39 +0100 Subject: [PATCH 2/2] [4.5.1] Bumps version number --- config/_default/config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/_default/config.toml b/config/_default/config.toml index 305a05ad2..3fc8bae33 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -69,7 +69,7 @@ twitter = "calisti12" # Used in the "version-banner" partial to display a version number for the # current doc set. - version = "4.5.0" + version = "4.5.1" version_menu = "Releases" version_menu_canonicallinks = true version_menu_pagelinks = true @@ -169,7 +169,7 @@ twitter = "calisti12" ####################### # Add your release versions here [[params.versions]] - version = "latest (4.5.0)" + version = "latest (4.5.1)" githubbranch = "master" url = "" [[params.versions]]