Skip to content

Commit

Permalink
fix(inputs.chrony): use DGRAM for the unix socket
Browse files Browse the repository at this point in the history
We must use the DGRAM type when connecting to the chrony socket. On top
of that, the socket must be duplicated in order to allow concurrent
calls to it.

Fixes #15549

Signed-off-by: Frank Villaro-Dixon <frank@villaro-dixon.eu>
  • Loading branch information
Frankkkkk committed Jun 25, 2024
1 parent 78cbf53 commit 2fcfc3e
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 4 deletions.
9 changes: 9 additions & 0 deletions plugins/inputs/chrony/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ See the [CONFIGURATION.md][CONFIGURATION.md] for more details.
# metrics = ["tracking"]
```

## Rights

To use the unix socket, telegraf must be able to talk to it. Please ensure that
the telegraf user is a member of the `chrony` group or telegraf won't be able to
use the socket!

The unix socket is needed in order to use the `serverstats` metrics. All other
metrics can be gathered using the udp connection.

## Metrics

- chrony
Expand Down
32 changes: 28 additions & 4 deletions plugins/inputs/chrony/chrony.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ import (
"fmt"
"net"
"net/url"
"os"
"path"
"strconv"
"syscall"
"time"

fbchrony "github.com/facebook/time/ntp/chrony"
"github.com/google/uuid"

"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/config"
Expand All @@ -38,6 +41,27 @@ func (*Chrony) SampleConfig() string {
return sampleConfig
}

// dialUnix opens an unixgram connection with chrony
func dialUnix(address string) (*net.UnixConn, error) {
dir := path.Dir(address)
local := path.Join(dir, fmt.Sprintf("chrony-telegraf-%s.sock", uuid.New().String()))
// XXX TODO: remove the file at the end
conn, err := net.DialUnix("unixgram",
&net.UnixAddr{Name: local, Net: "unixgram"},
&net.UnixAddr{Name: address, Net: "unixgram"},
)

if err != nil {
return nil, err
}

if err := os.Chmod(local, 0666); err != nil {
return nil, err
}

return conn, nil
}

func (c *Chrony) Init() error {
// Use the configured server, if none set, we try to guess it in Start()
if c.Server != "" {
Expand All @@ -47,7 +71,7 @@ func (c *Chrony) Init() error {
return fmt.Errorf("parsing server address failed: %w", err)
}
switch u.Scheme {
case "unix":
case "unixgram":
// Keep the server unmodified
case "udp":
// Check if we do have a port and add the default port if we don't
Expand Down Expand Up @@ -89,8 +113,8 @@ func (c *Chrony) Start(_ telegraf.Accumulator) error {
return fmt.Errorf("parsing server address failed: %w", err)
}
switch u.Scheme {
case "unix":
conn, err := net.DialTimeout("unix", u.Path, time.Duration(c.Timeout))
case "unixgram":
conn, err := dialUnix(u.Path)
if err != nil {
return fmt.Errorf("dialing %q failed: %w", c.Server, err)
}
Expand All @@ -106,7 +130,7 @@ func (c *Chrony) Start(_ telegraf.Accumulator) error {
}
} else {
// If no server is given, reproduce chronyc's behavior
if conn, err := net.DialTimeout("unix", "/run/chrony/chronyd.sock", time.Duration(c.Timeout)); err == nil {
if conn, err := dialUnix("/run/chrony/chronyd.sock"); err == nil {
c.Server = "unix:///run/chrony/chronyd.sock"
c.conn = conn
} else if conn, err := net.DialTimeout("udp", "127.0.0.1:323", time.Duration(c.Timeout)); err == nil {
Expand Down

0 comments on commit 2fcfc3e

Please sign in to comment.