CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(inputs.chrony): Support local (reference) sources (#15551)

This commit is contained in:
Frank Villaro-Dixon 2024-06-25 15:41:36 +02:00 committed by GitHub
parent 5903ed6a47
commit 5a46c0aeaf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
plugins/inputs/chrony/chrony.go
View File

@ -4,6 +4,7 @@ package chrony
import ( import (
"bytes" "bytes"
_ "embed" _ "embed"
"encoding/binary"
"errors" "errors"
"fmt" "fmt"
"net" "net"
@ -291,6 +292,24 @@ func (c *Chrony) gatherServerStats(acc telegraf.Accumulator) error {
return nil return nil
} }
func (c *Chrony) getSourceName(ip net.IP) (string, error) {
sourceNameReq := fbchrony.NewNTPSourceNamePacket(ip)
sourceNameRaw, err := c.client.Communicate(sourceNameReq)
if err != nil {
return "", fmt.Errorf("querying name of source %q failed: %w", ip, err)
}
sourceName, ok := sourceNameRaw.(*fbchrony.ReplyNTPSourceName)
if !ok {
return "", fmt.Errorf("got unexpected response type %T while waiting for source name", sourceNameRaw)
}
// Cut the string at null termination
if termidx := bytes.Index(sourceName.Name[:], []byte{0}); termidx >= 0 {
return string(sourceName.Name[:termidx]), nil
}
return string(sourceName.Name[:]), nil
}
func (c *Chrony) gatherSources(acc telegraf.Accumulator) error { func (c *Chrony) gatherSources(acc telegraf.Accumulator) error {
sourcesReq := fbchrony.NewSourcesPacket() sourcesReq := fbchrony.NewSourcesPacket()
sourcesRaw, err := c.client.Communicate(sourcesReq) sourcesRaw, err := c.client.Communicate(sourcesReq)
@ -316,22 +335,19 @@ func (c *Chrony) gatherSources(acc telegraf.Accumulator) error {
} }
// Trying to resolve the source name // Trying to resolve the source name
sourceNameReq := fbchrony.NewNTPSourceNamePacket(sourceData.IPAddr)
sourceNameRaw, err := c.client.Communicate(sourceNameReq)
if err != nil {
return fmt.Errorf("querying name of source %d failed: %w", idx, err)
}
sourceName, ok := sourceNameRaw.(*fbchrony.ReplyNTPSourceName)
if !ok {
return fmt.Errorf("got unexpected response type %T while waiting for source name", sourceNameRaw)
}
// Cut the string at null termination
var peer string var peer string
if termidx := bytes.Index(sourceName.Name[:], []byte{0}); termidx >= 0 {
peer = string(sourceName.Name[:termidx]) if sourceData.Mode == fbchrony.SourceModeRef && sourceData.IPAddr.To4() != nil {
// References of local sources (PPS, etc..) are encoded in the bits of the IPv4 address,
// instead of the RefId. Extract the correct name for those sources.
ipU32 := binary.BigEndian.Uint32(sourceData.IPAddr.To4())
peer = fbchrony.RefidToString(ipU32)
} else { } else {
peer = string(sourceName.Name[:]) peer, err = c.getSourceName(sourceData.IPAddr)
if err != nil {
return err
}
} }
if peer == "" { if peer == "" {
@ -388,22 +404,18 @@ func (c *Chrony) gatherSourceStats(acc telegraf.Accumulator) error {
} }
// Trying to resolve the source name // Trying to resolve the source name
sourceNameReq := fbchrony.NewNTPSourceNamePacket(sourceStats.IPAddr)
sourceNameRaw, err := c.client.Communicate(sourceNameReq)
if err != nil {
return fmt.Errorf("querying name of source %d failed: %w", idx, err)
}
sourceName, ok := sourceNameRaw.(*fbchrony.ReplyNTPSourceName)
if !ok {
return fmt.Errorf("got unexpected response type %T while waiting for source name", sourceNameRaw)
}
// Cut the string at null termination
var peer string var peer string
if termidx := bytes.Index(sourceName.Name[:], []byte{0}); termidx >= 0 {
peer = string(sourceName.Name[:termidx]) if sourceStats.IPAddr.String() == "::" {
// `::` IPs mean a local source directly connected to the server.
// For example a PPS source or a local GPS receiver.
// Then the name of the source is encoded in its RefID
peer = fbchrony.RefidToString(sourceStats.RefID)
} else { } else {
peer = string(sourceName.Name[:]) peer, err = c.getSourceName(sourceStats.IPAddr)
if err != nil {
return err
}
} }
if peer == "" { if peer == "" {