Skip to content

support host macros #20

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

Closed
wants to merge 2 commits into from
Closed

support host macros #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b849a0
feat(hosts): support host macros
Apr 5, 2023
2a46457
gofumpt
Apr 5, 2023
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
1 change: 1 addition & 0 deletions host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ type Host struct {

// Fields below used only when creating hosts
GroupIds HostGroupIDs `json:"groups,omitempty"`
UserMacros Macros `json:"macros,omitempty"`
Interfaces HostInterfaces `json:"interfaces,omitempty"`
TemplateIDs TemplateIDs `json:"templates,omitempty"`
}
Expand Down
4 changes: 2 additions & 2 deletions item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const (
ExternalCheck ItemType = 10
// DatabaseMonitor type
DatabaseMonitor ItemType = 11
//IPMIAgent type
// IPMIAgent type
IPMIAgent ItemType = 12
// SSHAgent type
SSHAgent ItemType = 13
Expand All @@ -58,7 +58,7 @@ const (
SNMPTrap ItemType = 17
// DependentItem type (new in 3.4)
DependentItem ItemType = 18
//HTTPAgent type (new in 4.0)
// HTTPAgent type (new in 4.0)
HTTPAgent ItemType = 19
)

Expand Down
2 changes: 1 addition & 1 deletion lld_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ type LLDRule struct {
AuthType string `json:"authtype,omitempty"`
DelayFlex string `json:"delay_flex,omitempty"`
Description string `json:"description,omitempty"`
Error string `json:"error,omitempty"` //Readonly
Error string `json:"error,omitempty"` // Readonly
IpmiSensor string `json:"ipmi_sensor,omitempty"`
LifeTime string `json:"lifetime,omitempty"`
Params string `json:"params,omitempty"`
Expand Down
4 changes: 2 additions & 2 deletions macro.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package zabbix
// https://www.zabbix.com/documentation/3.2/manual/api/reference/usermacro/object
type Macro struct {
MacroID string `json:"hostmacroids,omitempty"`
HostID string `json:"hostid"`
HostID string `json:"hostid,omitemptry"`
MacroName string `json:"macro"`
Value string `json:"value"`
}
Expand Down Expand Up @@ -63,7 +63,7 @@ func (api *API) MacrosUpdate(macros Macros) (err error) {

// MacrosDeleteByIDs Wrapper for usermacro.delete
// Cleans MacroId in all macro elements if call succeed.
//https://www.zabbix.com/documentation/3.2/manual/api/reference/usermacro/delete
// https://www.zabbix.com/documentation/3.2/manual/api/reference/usermacro/delete
func (api *API) MacrosDeleteByIDs(ids []string) (err error) {
response, err := api.CallWithError("usermacro.delete", ids)

Expand Down
4 changes: 2 additions & 2 deletions trigger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ type Trigger struct {
Description string `json:"description"`
Expression string `json:"expression"`
Comments string `json:"comments"`
//TemplateId string `json:"templateid"`
//Value ValueType `json:""`
// TemplateId string `json:"templateid"`
// Value ValueType `json:""`

Priority SeverityType `json:"priority,string"`
Status StatusType `json:"status,string"`
Expand Down