Use new syntax for triggers (required since Zabbix v5.4)

claranet · Oct 4, 2022 · 7842dd8 · 7842dd8
1 parent 40d2e7c
commit 7842dd8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/base_test.go b/base_test.go
@@ -63,15 +63,19 @@ func testGetAPI(t *testing.T) *zapi.API {
 	return _api
 }
 
-func skipTestIfVersionGreaterThanOrEqual(t *testing.T, comparedVersion, msg string) {
+func isVersionGreaterThanOrEqual(t *testing.T, comparedVersion string) (bool, string) {
 	api := testGetAPI(t)
 	serverVersion, err := api.Version()
 	if err != nil {
 		t.Fatal(err)
 	}
 	sVersion, _ := version.NewVersion(serverVersion)
 	cVersion, _ := version.NewVersion(comparedVersion)
-	if sVersion.GreaterThanOrEqual(cVersion) {
+	return sVersion.GreaterThanOrEqual(cVersion), serverVersion
+}
+
+func skipTestIfVersionGreaterThanOrEqual(t *testing.T, comparedVersion, msg string) {
+	if compGreaterThanOrEqual, serverVersion := isVersionGreaterThanOrEqual(t, comparedVersion); compGreaterThanOrEqual {
 		t.Skipf("Zabbix version %s is greater than or equal to %s which %s, skipping test.", serverVersion, comparedVersion, msg)
 	}
 }

diff --git a/trigger_test.go b/trigger_test.go
@@ -8,7 +8,13 @@ import (
 )
 
 func testCreateTrigger(item *zapi.Item, host *zapi.Host, t *testing.T) *zapi.Trigger {
-	expression := fmt.Sprintf("{%s:%s.last()}=0", host.Host, item.Key)
+	var expression string
+	if compGreaterThanOrEqual, _ := isVersionGreaterThanOrEqual(t, "5.4"); compGreaterThanOrEqual {
+		expression = fmt.Sprintf("last(/%s/%s)=0", host.Host, item.Key)
+	} else {
+		expression = fmt.Sprintf("{%s:%s.last()}=0", host.Host, item.Key)
+	}
+
 	triggers := zapi.Triggers{{
 		Description: "trigger description",
 		Expression:  expression,