From affe913cf5ace704635a68fb375affa040112d5d Mon Sep 17 00:00:00 2001 From: i-ky Date: Mon, 21 Oct 2019 23:17:02 +0300 Subject: [PATCH] Fix resolving of positional macros in item name in case of MySQL --- src/history_influxdb.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/history_influxdb.c b/src/history_influxdb.c index 4661aed..3a2824b 100644 --- a/src/history_influxdb.c +++ b/src/history_influxdb.c @@ -300,15 +300,15 @@ char *itemid_to_influx_data(zbx_uint64_t itemid) // +------------------------------------------------+-----------------------------------------------+---------------------------------------------------------------------------------------------------------------------------+ // find first '[' and last ']' in the key_ and for what is between use substring_index() to extract correct parameter "replace(replace(replace(replace(replace(replace(replace(replace(replace(i.name," - " '$1', substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 1))," - " '$2', substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 2))," - " '$3', substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 3))," - " '$4', substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 4))," - " '$5', substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 5))," - " '$6', substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 6))," - " '$7', substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 7))," - " '$8', substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 8))," - " '$9', substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 9))," + " '$1', substring_index(substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 1), ',', -1))," + " '$2', substring_index(substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 2), ',', -1))," + " '$3', substring_index(substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 3), ',', -1))," + " '$4', substring_index(substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 4), ',', -1))," + " '$5', substring_index(substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 5), ',', -1))," + " '$6', substring_index(substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 6), ',', -1))," + " '$7', substring_index(substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 7), ',', -1))," + " '$8', substring_index(substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 8), ',', -1))," + " '$9', substring_index(substring_index(substring(i.key_, position('[' in i.key_)+1, length(i.key_) - position('[' in i.key_) - position(']' in reverse(i.key_))), ',', 9), ',', -1))," // or use plain item name if no variables to replace "i.name" "), "