From 78fe0dd7a9af4d51232634174c55fd24cc3c99bc Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Wed, 25 Aug 2021 12:06:25 +0300
Subject: [PATCH] Fix expanding item name with unicode params, fixes #1269

---
 pkg/zabbix/utils.go      |  3 +--
 pkg/zabbix/utils_test.go | 57 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 pkg/zabbix/utils_test.go

diff --git a/pkg/zabbix/utils.go b/pkg/zabbix/utils.go
index 562331b..77f4b28 100644
--- a/pkg/zabbix/utils.go
+++ b/pkg/zabbix/utils.go
@@ -14,8 +14,7 @@ func (item *Item) ExpandItemName() string {
 		return name
 	}
 
-	keyRunes := []rune(item.Key)
-	keyParamsStr := string(keyRunes[strings.Index(key, "[")+1 : strings.LastIndex(key, "]")])
+	keyParamsStr := key[strings.Index(key, "[")+1 : strings.LastIndex(key, "]")]
 	keyParams := splitKeyParams(keyParamsStr)
 
 	for i := len(keyParams); i >= 1; i-- {
diff --git a/pkg/zabbix/utils_test.go b/pkg/zabbix/utils_test.go
new file mode 100644
index 0000000..499b30c
--- /dev/null
+++ b/pkg/zabbix/utils_test.go
@@ -0,0 +1,57 @@
+package zabbix
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestExpandItemName(t *testing.T) {
+	tests := []struct {
+		name     string
+		itemName string
+		key      string
+		expected string
+	}{
+		{
+			name:     "UNQUOTED_PARAMS",
+			itemName: "CPU $2 time",
+			key:      "system.cpu.util[,user,avg1]",
+			expected: "CPU user time",
+		},
+		{
+			name:     "QUOTED_PARAMS_WITH_COMMAS",
+			itemName: "CPU $1 $2 $3",
+			key:      "system.cpu.util[\"type=user,value=avg\",time,\"user\"]",
+			expected: "CPU type=user,value=avg time user",
+		},
+		{
+			name:     "MULTIPLE_ARRAY_PARAMS",
+			itemName: "CPU $2 - $3 time",
+			key:      "system.cpu.util[,[user,system],avg1]",
+			expected: "CPU user,system - avg1 time",
+		},
+		{
+			name:     "MULTIPLE_ARRAY_PARAMS",
+			itemName: "CPU - $2 - $3 - $4",
+			key:      "system.cpu.util[,[],[\"user,system\",iowait],avg1]",
+			expected: "CPU -  - \"user,system\",iowait - avg1",
+		},
+		{
+			name:     "UNICODE_PARAMS",
+			itemName: "CPU $1 $2 $3",
+			key:      "system.cpu.util[\"type=\b5Ὂg̀9! ℃ᾭG,value=avg\",time,\"user\"]",
+			expected: "CPU type=\b5Ὂg̀9! ℃ᾭG,value=avg time user",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			item := &Item{
+				Name: tt.itemName,
+				Key:  tt.key,
+			}
+			expandedName := item.ExpandItemName()
+			assert.Equal(t, tt.expected, expandedName)
+		})
+	}
+}