Merge branch 'zabbix-7.2' into develop

Author: fabiang

.envrc

@@ -1,3 +1,3 @@
-export ZBX_VERSION="6.4"
+export ZBX_VERSION="7.2"
 export ZBX_VERSION_SUFFIX="-latest"
 export ZBX_DEBUG=1

.github/workflows/ci.yml

@@ -53,6 +53,9 @@ jobs:
           - version: "7.0"
             suffix: "-latest"
             postgress_version: "16-alpine"
+          - version: "7.2"
+            suffix: "-latest"
+            postgress_version: "16-alpine"
 
     name: "Zabbix ${{ matrix.zabbix.version }} Integration Tests"
 

client_builder_test.go

@@ -2,7 +2,7 @@ package zabbix_test
 
 import (
 	"fmt"
-	"io/ioutil"
+	"os"
 	"testing"
 
 	"github.com/fabiang/go-zabbix"
@@ -22,7 +22,7 @@ func init() {
 }
 
 func prepareTemporaryDir(t *testing.T) (dir string, success bool) {
-	tempDir, err := ioutil.TempDir("", "zabbix-session-test")
+	tempDir, err := os.MkdirTemp("", "zabbix-session-test")
 
 	if err != nil {
 		t.Fatalf("cannot create a temporary dir for session cache: %v", err)

event.go

@@ -200,10 +200,14 @@ type EventGetParams struct {
 
 	// SelectAlerts causes Alerts generated by each Event to be attached in the
 	// search results.
+	//
+	// Deprecated: Depcreated since Zabbix 6.4 and removed in Zabbix 7.2
 	SelectAlerts SelectQuery `json:"select_alerts,omitempty"`
 
 	// SelectAcknowledgements causes Acknowledgments for each Event to be
 	// attached in the search results in reverse chronological order.
+	//
+	// Deprecated: Depcreated since Zabbix 6.4 and removed in Zabbix 7.2
 	SelectAcknowledgements SelectQuery `json:"select_acknowledges,omitempty"`
 }
 

file_cache.go

@@ -3,7 +3,6 @@ package zabbix
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"time"
 )
@@ -12,14 +11,15 @@ import (
 cachedSessionData represents a model of cached session.
 
 Example:
-{
-	"createdAt": 1530056885,
-	"session": {
-		"url": "...",
-		"token": "...",
-		"apiVersion": "..."
+
+	{
+		"createdAt": 1530056885,
+		"session": {
+			"url": "...",
+			"token": "...",
+			"apiVersion": "..."
+		}
 	}
-}
 */
 type cachedSessionContainer struct {
 	CreatedAt int64 `json:"createdAt"`
@@ -63,12 +63,12 @@ func (c *SessionFileCache) SaveSession(session *Session) error {
 		return err
 	}
 
-	return ioutil.WriteFile(c.filePath, []byte(serialized), os.FileMode(c.filePermissions))
+	return os.WriteFile(c.filePath, []byte(serialized), os.FileMode(c.filePermissions))
 }
 
 // GetSession returns cached Zabbix session
 func (c *SessionFileCache) GetSession() (*Session, error) {
-	contents, err := ioutil.ReadFile(c.filePath)
+	contents, err := os.ReadFile(c.filePath)
 
 	if err != nil {
 		return nil, err

host.go

@@ -159,6 +159,8 @@ type HostGetParams struct {
 
 	// SelectGroups causes the Host Groups that each Host belongs to to be
 	// attached in the search results.
+	//
+	// Deprecated: Depcreated since Zabbix 6.4 and removed in Zabbix 7.2
 	SelectGroups SelectQuery `json:"selectGroups,omitempty"`
 
 	// SelectApplications causes the Applications from each Host to be attached
@@ -217,7 +219,7 @@ func (c *Session) CountHosts(params HostGetParams) (int, error) {
 	params.GetParameters.CountOutput = true
 
 	req := NewRequest("host.get", &params)
-	resp, err := c.Do(req)
+	resp, err := c.Do(req, false)
 	if err != nil {
 		return 0, err
 	}

host_interface.go

@@ -104,6 +104,6 @@ func (c *Session) UpdateHostInterface(inter HostInterface) ([]string, error) {
 
 func (c *Session) DeleteHostInterface(inter HostInterface) (err error) {
 	req := NewRequest("hostinterface.delete", []string{inter.InterfaceID})
-	_, err = c.Do(req)
+	_, err = c.Do(req, false)
 	return
 }

hostgroup.go

@@ -40,9 +40,13 @@ type HostgroupGetParams struct {
 	MaintenanceIDs []string `json:"maintenanceids,omitempty"`
 
 	// Return only host groups that contain monitored hosts
+	//
+	// Deprecated: Depcreated since Zabbix 6.4 and removed in Zabbix 7.2
 	MonitoredHosts int `json:"monitored_hosts,omitempty"`
 
 	// Return only host groups that contain hosts
+	//
+	// Deprecated: Depcreated since Zabbix 6.4 and removed in Zabbix 7.2
 	RealHosts int `json:"real_hosts,omitempty"`
 
 	// Return only host groups that contain templates

maintenance.go

@@ -49,15 +49,20 @@ type MaintenanceGetParams struct {
 	SelectHosts SelectQuery `json:"selectHosts,omitempty"`
 
 	// Return host groups assigned to the maintenance in the groups property.
+	// Deprecated: Depcreated since Zabbix 6.4 and removed in Zabbix 7.2
 	SelectGroups SelectQuery `json:"selectGroups,omitempty"`
 
 	// Return only maintenances with the given IDs.
 	Maintenanceids []string `json:"maintenanceids,omitempty"`
 
 	// Return only maintenances that are assigned to the given hosts.
+	//
+	// Deprecated: Depcreated since Zabbix 6.4 and removed in Zabbix 7.2
 	Hostids []string `json:"hostids,omitempty"`
 
 	// Return only maintenances that are assigned to the given host groups.
+	//
+	// Deprecated: Depcreated since Zabbix 6.4 and removed in Zabbix 7.2
 	Groupids []string `json:"groupids,omitempty"`
 }
 

session.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	"github.com/fabiang/go-zabbix/types"
@@ -14,10 +14,12 @@ import (
 var (
 	ErrNotFound      = &NotFoundError{"No results were found matching the given search parameters"}
 	zabbixVersion600 *types.ZBXVersion
+	zabbixVersion640 *types.ZBXVersion
 )
 
 func init() {
 	zabbixVersion600, _ = types.NewZBXVersion("6.0.0")
+	zabbixVersion640, _ = types.NewZBXVersion("6.4.0")
 }
 
 // A Session is an authenticated Zabbix JSON-RPC API client. It must be
@@ -70,7 +72,7 @@ func (c *Session) login(username, password string) error {
 		params["username"] = username
 	}
 
-	res, err := c.Do(NewRequest("user.login", params))
+	res, err := c.Do(NewRequest("user.login", params), true)
 	if err != nil {
 		return fmt.Errorf("Error logging in to Zabbix API: %v", err)
 	}
@@ -87,7 +89,7 @@ func (c *Session) login(username, password string) error {
 func (c *Session) GetVersion() (*types.ZBXVersion, error) {
 	if c.APIVersion == nil {
 		// get Zabbix API version
-		res, err := c.Do(NewRequest("apiinfo.version", nil))
+		res, err := c.Do(NewRequest("apiinfo.version", nil), true)
 		if err != nil {
 			return nil, err
 		}
@@ -116,9 +118,21 @@ func (c *Session) AuthToken() string {
 // When err is nil, resp always contains a non-nil resp.Body.
 //
 // Generally Get or a wrapper function will be used instead of Do.
-func (c *Session) Do(req *Request) (resp *Response, err error) {
-	// configure request
-	req.AuthToken = c.Token
+func (c *Session) Do(req *Request, noAuthRequired bool) (resp *Response, err error) {
+	if noAuthRequired == false {
+		// get Zabbix API version
+		ver, err := c.GetVersion()
+		if err != nil {
+			return nil, fmt.Errorf("Failed to retrieve Zabbix API version: %v", err)
+		}
+
+		// Zabbix 6.4 uses `Authorization` header, therefore "auth" parameter
+		// has been deprecated and was removed in 7.2
+		// See: https://www.zabbix.com/documentation/7.2/en/manual/api/changes
+		if ver.Compare(zabbixVersion640) < 0 {
+			req.AuthToken = c.Token
+		}
+	}
 
 	// encode request as json
 	b, err := json.Marshal(req)
@@ -135,6 +149,9 @@ func (c *Session) Do(req *Request) (resp *Response, err error) {
 	}
 	r.ContentLength = int64(len(b))
 	r.Header.Add("Content-Type", "application/json-rpc")
+	if noAuthRequired == false {
+		r.Header.Add("Authorization", fmt.Sprintf("Bearer %s", c.Token))
+	}
 
 	// send request
 	client := c.client
@@ -149,7 +166,7 @@ func (c *Session) Do(req *Request) (resp *Response, err error) {
 	defer res.Body.Close()
 
 	// read response body
-	b, err = ioutil.ReadAll(res.Body)
+	b, err = io.ReadAll(res.Body)
 	if err != nil {
 		return nil, fmt.Errorf("Error reading response: %v", err)
 	}
@@ -181,7 +198,7 @@ func (c *Session) Do(req *Request) (resp *Response, err error) {
 // An error is return if a transport, marshalling or API error happened.
 func (c *Session) Get(method string, params interface{}, v interface{}) error {
 	req := NewRequest(method, params)
-	resp, err := c.Do(req)
+	resp, err := c.Do(req, false)
 	if err != nil {
 		return err
 	}