Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix querying and authentication for Zabbix v7.0+ (#1931)

Browse Source 
* Fix querying for Zabbix v7.2+

* Update check from 7.2 to 7.0

* Fix also select acknowledges key

* Remove unsused methods

* release commit 4.6.0

---------

Co-authored-by: yesoreyeram <153843+yesoreyeram@users.noreply.github.com>
This commit is contained in:
Ivana Huckova
2024-12-17 02:02:43 +01:00
committed by GitHub
parent 0225320a62
commit dbcc008489
15 changed files with 1226 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/zabbixapi/zabbix_api_test.go
View File

@@ -7,9 +7,12 @@ import (
"github.com/stretchr/testify/assert"
)
var version = 65
func TestZabbixAPIUnauthenticatedQuery(t *testing.T) {
zabbixApi, _ := MockZabbixAPI(`{"result":"sampleResult"}`, 200)
resp, err := zabbixApi.RequestUnauthenticated(context.Background(), "test.get", map[string]interface{}{})
resp, err := zabbixApi.RequestUnauthenticated(context.Background(), "test.get", map[string]interface{}{}, version)
assert.Equal(t, "sampleResult", resp.MustString())
assert.Nil(t, err)
@@ -17,7 +20,7 @@ func TestZabbixAPIUnauthenticatedQuery(t *testing.T) {
func TestLogin(t *testing.T) {
zabbixApi, _ := MockZabbixAPI(`{"result":"secretauth"}`, 200)
err := zabbixApi.Authenticate(context.Background(), "user", "password")
err := zabbixApi.Authenticate(context.Background(), "user", "password", version)
assert.Nil(t, err)
assert.Equal(t, "secretauth", zabbixApi.auth)
@@ -31,6 +34,7 @@ func TestZabbixAPI(t *testing.T) {
mockApiResponseCode int
expectedResult string
expectedError error
version int
}{
{
name: "Simple request",
@@ -54,7 +58,7 @@ func TestZabbixAPI(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
zabbixApi, _ := MockZabbixAPI(tt.mockApiResponse, tt.mockApiResponseCode)
zabbixApi.auth = tt.auth
resp, err := zabbixApi.Request(context.Background(), "test.get", map[string]interface{}{})
resp, err := zabbixApi.Request(context.Background(), "test.get", map[string]interface{}{}, version)
if tt.expectedError != nil {
assert.Equal(t, err, tt.expectedError)