Skip to content
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.

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

fix(inputs.chrony): Use DGRAM for the unix socket #15552

Merged
merged 3 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
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
powersj marked this conversation as resolved.
Show resolved Hide resolved

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.
srebhan marked this conversation as resolved.
Show resolved Hide resolved

## 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
srebhan marked this conversation as resolved.
Show resolved Hide resolved
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
}
srebhan marked this conversation as resolved.
Show resolved Hide resolved

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
Loading