From 8e1b7dc0873127f7d3152bb3607f9f4c513c8d09 Mon Sep 17 00:00:00 2001 From: "Zsolt Gyulai (zgyulai)" Date: Fri, 31 May 2024 12:21:51 +0200 Subject: [PATCH 1/2] Added MQTT_TOPIC macro to the list of available macros. Signed-off-by: Zsolt Gyulai (zgyulai) --- .../000_Customize_message_format/004_Macros_of_syslog-ng.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/_admin-guide/110_Template_and_rewrite/000_Customize_message_format/004_Macros_of_syslog-ng.md b/doc/_admin-guide/110_Template_and_rewrite/000_Customize_message_format/004_Macros_of_syslog-ng.md index bfe53a2d..339c6da6 100644 --- a/doc/_admin-guide/110_Template_and_rewrite/000_Customize_message_format/004_Macros_of_syslog-ng.md +++ b/doc/_admin-guide/110_Template_and_rewrite/000_Customize_message_format/004_Macros_of_syslog-ng.md @@ -218,6 +218,11 @@ The millisecond the message was sent. Available in {{ site.product.short_name }} version 3.4 and later. +## ${MQTT_TOPIC} + +This macro is available in syslog-ng OSE 4.7 and later versions. +The mqtt() source sets the `${MQTT_TOPIC}` name-value pair automatically for the messages it receives. This macro can be used when the name of the topic contains MQTT wildcards characters ($, +, #). For more information, see mqtt: Receiving messages from an MQTT broker. + ## ${MSG} The ${MSG} macro is an alias of the ${MESSAGE} macro, using ${MSG} in From 3d7d7f89df8fbe6484b5baca66c4924e985bdcba Mon Sep 17 00:00:00 2001 From: "Zsolt Gyulai (zgyulai)" Date: Wed, 5 Jun 2024 10:23:51 +0200 Subject: [PATCH 2/2] Removed backtick. Signed-off-by: Zsolt Gyulai (zgyulai) --- .../000_Customize_message_format/004_Macros_of_syslog-ng.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/_admin-guide/110_Template_and_rewrite/000_Customize_message_format/004_Macros_of_syslog-ng.md b/doc/_admin-guide/110_Template_and_rewrite/000_Customize_message_format/004_Macros_of_syslog-ng.md index 339c6da6..9da1d930 100644 --- a/doc/_admin-guide/110_Template_and_rewrite/000_Customize_message_format/004_Macros_of_syslog-ng.md +++ b/doc/_admin-guide/110_Template_and_rewrite/000_Customize_message_format/004_Macros_of_syslog-ng.md @@ -221,7 +221,7 @@ Available in {{ site.product.short_name }} version 3.4 and later. ## ${MQTT_TOPIC} This macro is available in syslog-ng OSE 4.7 and later versions. -The mqtt() source sets the `${MQTT_TOPIC}` name-value pair automatically for the messages it receives. This macro can be used when the name of the topic contains MQTT wildcards characters ($, +, #). For more information, see mqtt: Receiving messages from an MQTT broker. +The mqtt() source sets the ${MQTT_TOPIC} name-value pair automatically for the messages it receives. This macro can be used when the name of the topic contains MQTT wildcards characters ($, +, #). For more information, see mqtt: Receiving messages from an MQTT broker. ## ${MSG}