Skip to content

Zabbix7 API renamed host property proxy_hostid to proxyid #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yeswexav wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Zabbix7 API renamed host property proxy_hostid to proxyid #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,12 @@ type Host struct {
TemplateIDsClear TemplateIDs `json:"templates_clear,omitempty"`
// templates are read back from this one
ParentTemplateIDs TemplateIDs `json:"parentTemplates,omitempty"`
ProxyID string `json:"proxy_hostid,omitempty"`

// proxyid : there was a breaking change in version 7.0 (property proxy_hostid renamed to hostid)
ProxyID string `json:"-"`
RawProxyIDLegacy string `json:"proxy_hostid,omitempty"`
RawProxyIDv7 string `json:"proxyid,omitempty"`

Tags Tags `json:"tags,omitempty"`
}

Expand Down Expand Up @@ -107,12 +112,19 @@ func (api *API) HostsGet(params Params) (res Hosts, err error) {
res[i].InventoryMode = *h.RawInventoryMode
}

// fix breaking API change in version 7.0
if api.Config.Version >= 70000 {
res[i].ProxyID = string(h.RawProxyIDv7)
} else {
res[i].ProxyID = string(h.RawProxyIDLegacy)
}

// fix up host inventory if present
if len(h.RawInventory) != 0 {
// if its an empty array
asStr := string(h.RawInventory)
if asStr == "[]" || asStr == "{}" {
continue
continue // this will force to the next iteration of the for loop
}

// lets unbox
Expand All @@ -123,7 +135,7 @@ func (api *API) HostsGet(params Params) (res Hosts, err error) {
}
res[i].Inventory = inv
}

// warning : any code below will not be excuted if raw inventory is empty
}

return
Expand Down Expand Up @@ -176,7 +188,7 @@ func (api *API) HostGetByHost(host string) (res *Host, err error) {
}

// handle manual marshal
func prepHosts(hosts Hosts) {
func (api *API) prepHosts(hosts Hosts) {
for i := 0; i < len(hosts); i++ {
h := hosts[i]
for j := 0; j < len(h.Interfaces); j++ {
Expand All @@ -195,13 +207,20 @@ func prepHosts(hosts Hosts) {
}
invMode := h.InventoryMode
h.RawInventoryMode = &invMode

// fix breaking API change in version 7.0
if api.Config.Version >= 70000 {
hosts[i].RawProxyIDv7 = h.ProxyID
} else {
hosts[i].RawProxyIDLegacy = h.ProxyID
}
}
}

// HostsCreate Wrapper for host.create
// https://www.zabbix.com/documentation/3.2/manual/api/reference/host/create
func (api *API) HostsCreate(hosts Hosts) (err error) {
prepHosts(hosts)
api.prepHosts(hosts)
response, err := api.CallWithError("host.create", hosts)
if err != nil {
return
Expand All @@ -218,7 +237,7 @@ func (api *API) HostsCreate(hosts Hosts) (err error) {
// HostsUpdate Wrapper for host.update
// https://www.zabbix.com/documentation/3.2/manual/api/reference/host/update
func (api *API) HostsUpdate(hosts Hosts) (err error) {
prepHosts(hosts)
api.prepHosts(hosts)
_, err = api.CallWithError("host.update", hosts)
return
}
Expand Down