0d64736e86
## Sumary When dealing with multiple hosts, it can be hard for customers filter through and figure out which host to query metric data from. This PR aims to make this easier by adding support for host tags so that there is another layer of filtering / grouping applied for hosts. ## Detailed explanation - Adds new UI components to allow adding one or more host tag filter, and a switch to choose between `AND/OR` and `OR` operators when using more than one filter following Zabbix's UI: https://github.com/user-attachments/assets/c971f5eb-7e93-4238-bd6b-902cc657c014 https://github.com/user-attachments/assets/5f8996de-684e-4ffa-b98e-8e205c4fc1df - Modifies the existing `getHosts` function to make a call to the backend with a few additional parameters to `extend` (essentially extract) the host tags for a given selected group. No backend changes were required for this. ## Why To make it easier for customers to query metric data when dealing with multiple hosts. ## How to test - Go to explore or a dashboard and create a Zabbix query where the query type is `Metrics` - The easiest way to test is by selecting `/.*/` for Groups, checking the returned `Hosts` they should all be there - Add a host tag filter and change the keys and operators as well as switching from `AND/OR` to `OR` you should see how the values returned for `Host` changes ## Future work Adding variable support for host tags once this is completed. Fixes: https://github.com/orgs/grafana/projects/457/views/40?pane=issue&itemId=3609900134&issue=grafana%7Coss-big-tent-squad%7C126 and https://github.com/grafana/grafana-zabbix/issues/927 --------- Co-authored-by: ismail simsek <ismailsimsek09@gmail.com>
114 lines
2.8 KiB
Go
114 lines
2.8 KiB
Go
package zabbix
|
|
|
|
import (
|
|
"encoding/json"
|
|
"time"
|
|
)
|
|
|
|
type ZabbixDatasourceSettingsDTO struct {
|
|
Trends bool `json:"trends"`
|
|
TrendsFrom string `json:"trendsFrom"`
|
|
TrendsRange string `json:"trendsRange"`
|
|
CacheTTL string `json:"cacheTTL"`
|
|
Timeout string `json:"timeout"`
|
|
|
|
DisableReadOnlyUsersAck bool `json:"disableReadOnlyUsersAck"`
|
|
}
|
|
|
|
type ZabbixDatasourceSettings struct {
|
|
Trends bool
|
|
TrendsFrom time.Duration
|
|
TrendsRange time.Duration
|
|
CacheTTL time.Duration
|
|
Timeout time.Duration
|
|
|
|
DisableReadOnlyUsersAck bool `json:"disableReadOnlyUsersAck"`
|
|
}
|
|
|
|
type ZabbixAPIParams = map[string]interface{}
|
|
|
|
type ZabbixAPIRequest struct {
|
|
Method string `json:"method"`
|
|
Params ZabbixAPIParams `json:"params,omitempty"`
|
|
}
|
|
|
|
func (r *ZabbixAPIRequest) String() string {
|
|
jsonRequest, _ := json.Marshal(r.Params)
|
|
return r.Method + string(jsonRequest)
|
|
}
|
|
|
|
type Items []Item
|
|
|
|
type Item struct {
|
|
ID string `json:"itemid,omitempty"`
|
|
Key string `json:"key_,omitempty"`
|
|
Name string `json:"name,omitempty"`
|
|
ValueType int `json:"value_type,omitempty,string"`
|
|
HostID string `json:"hostid,omitempty"`
|
|
Hosts []ItemHost `json:"hosts,omitempty"`
|
|
Status string `json:"status,omitempty"`
|
|
State string `json:"state,omitempty"`
|
|
Delay string `json:"delay,omitempty"`
|
|
Units string `json:"units,omitempty"`
|
|
ValueMapID string `json:"valuemapid,omitempty"`
|
|
Tags []Tag `json:"tags,omitempty"`
|
|
}
|
|
|
|
type ItemHost struct {
|
|
ID string `json:"hostid,omitempty"`
|
|
Name string `json:"name,omitempty"`
|
|
}
|
|
|
|
type Tag struct {
|
|
Tag string `json:"tag,omitempty"`
|
|
Value string `json:"value,omitempty"`
|
|
}
|
|
|
|
type Trend []TrendPoint
|
|
|
|
type TrendPoint struct {
|
|
ItemID string `json:"itemid,omitempty"`
|
|
Clock int64 `json:"clock,omitempty,string"`
|
|
Num string `json:"num,omitempty"`
|
|
ValueMin string `json:"value_min,omitempty"`
|
|
ValueAvg string `json:"value_avg,omitempty"`
|
|
ValueMax string `json:"value_max,omitempty"`
|
|
}
|
|
|
|
type History []HistoryPoint
|
|
|
|
type HistoryPoint struct {
|
|
ItemID string `json:"itemid,omitempty"`
|
|
Clock int64 `json:"clock,omitempty,string"`
|
|
Value float64 `json:"value,omitempty,string"`
|
|
NS int64 `json:"ns,omitempty,string"`
|
|
}
|
|
|
|
type Group struct {
|
|
Name string `json:"name"`
|
|
ID string `json:"groupid"`
|
|
}
|
|
|
|
type Host struct {
|
|
Name string `json:"name"`
|
|
Host string `json:"host"`
|
|
ID string `json:"hostid"`
|
|
Tags []Tag `json:"tags,omitempty"`
|
|
}
|
|
|
|
type Application struct {
|
|
Name string `json:"name"`
|
|
ID string `json:"applicationid"`
|
|
}
|
|
|
|
type ValueMap struct {
|
|
ID string `json:"valuemapid"`
|
|
Name string `json:"name"`
|
|
Mappings []ValueMapping `json:"mappings"`
|
|
}
|
|
|
|
type ValueMapping struct {
|
|
Value string `json:"value"`
|
|
NewValue string `json:"newvalue"`
|
|
}
|