p17860254
/
categraf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix switch_legacy mappings logic

This commit is contained in:
Ulric Qin 2022-07-28 18:45:17 +08:00
parent fa0c38da61
commit 675c0bb475
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inputs/switch_legacy/switch_legacy.go
View File

@ -36,6 +36,14 @@ func init() {
func (s *Switch) Drop() {}
func (s *Switch) Gather(slist *types.SampleList) {}
func (s *Switch) MappingIP(ip string) string {
val, has := s.Mappings[ip]
if has {
return val
}
return ip
}
func (s *Switch) GetInstances() []inputs.Instance {
ret := make([]inputs.Instance, len(s.Instances))
for i := 0; i < len(s.Instances); i++ {
@ -230,7 +238,7 @@ func (ins *Instance) gatherMemMetrics(ips []string, slist *types.SampleList) {
if utilPercent < 0 {
continue
}
slist.PushFront(types.NewSample(inputName, "mem_util", utilPercent, map[string]string{ins.parent.SwitchIdLabel: ip}))
slist.PushFront(types.NewSample(inputName, "mem_util", utilPercent, map[string]string{ins.parent.SwitchIdLabel: ins.parent.MappingIP(ip)}))
}
}
@ -275,7 +283,7 @@ func (ins *Instance) gatherCpuMetrics(ips []string, slist *types.SampleList) {
continue
}
slist.PushFront(types.NewSample(inputName, "cpu_util", utilPercent, map[string]string{ins.parent.SwitchIdLabel: ip}))
slist.PushFront(types.NewSample(inputName, "cpu_util", utilPercent, map[string]string{ins.parent.SwitchIdLabel: ins.parent.MappingIP(ip)}))
}
}
@ -343,7 +351,7 @@ func (ins *Instance) gatherFlowMetrics(ips []string, slist *types.SampleList) {
}
tags := map[string]string{
ins.parent.SwitchIdLabel: ip,
ins.parent.SwitchIdLabel: ins.parent.MappingIP(ip),
"ifname": ifStat.IfName,
}
@ -614,7 +622,7 @@ func (ins *Instance) gatherPing(ips []string, slist *types.SampleList) []string
}
if ins.GatherPingMetrics {
slist.PushFront(types.NewSample(inputName, "ping_up", val, map[string]string{ins.parent.SwitchIdLabel: ip}))
slist.PushFront(types.NewSample(inputName, "ping_up", val, map[string]string{ins.parent.SwitchIdLabel: ins.parent.MappingIP(ip)}))
}
}