Skip to content

Commit

Permalink
Wire up setting to enable/disable logtail
Browse files Browse the repository at this point in the history
  • Loading branch information
kradalby committed May 30, 2022
1 parent 405de9e commit a0c465c
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 0 deletions.
6 changes: 6 additions & 0 deletions app.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ type Config struct {

OIDC OIDCConfig

LogTail LogTailConfig

CLI CLIConfig
}

Expand All @@ -138,6 +140,10 @@ type DERPConfig struct {
UpdateFrequency time.Duration
}

type LogTailConfig struct {
Enabled bool
}

type CLIConfig struct {
Address string
APIKey string
Expand Down
13 changes: 13 additions & 0 deletions cmd/headscale/cli/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ func LoadConfig(path string) error {
viper.SetDefault("oidc.scope", []string{oidc.ScopeOpenID, "profile", "email"})
viper.SetDefault("oidc.strip_email_domain", true)

viper.SetDefault("logtail.enabled", false)

if err := viper.ReadInConfig(); err != nil {
return fmt.Errorf("fatal error reading config file: %w", err)
}
Expand Down Expand Up @@ -167,6 +169,14 @@ func GetDERPConfig() headscale.DERPConfig {
}
}

func GetLogConfig() headscale.LogTailConfig {
enabled := viper.GetBool("logtail.enabled")

return headscale.LogTailConfig{
Enabled: enabled,
}
}

func GetDNSConfig() (*tailcfg.DNSConfig, string) {
if viper.IsSet("dns_config") {
dnsConfig := &tailcfg.DNSConfig{}
Expand Down Expand Up @@ -270,6 +280,7 @@ func absPath(path string) string {
func getHeadscaleConfig() headscale.Config {
dnsConfig, baseDomain := GetDNSConfig()
derpConfig := GetDERPConfig()
logConfig := GetLogConfig()

configuredPrefixes := viper.GetStringSlice("ip_prefixes")
parsedPrefixes := make([]netaddr.IPPrefix, 0, len(configuredPrefixes)+1)
Expand Down Expand Up @@ -378,6 +389,8 @@ func getHeadscaleConfig() headscale.Config {
StripEmaildomain: viper.GetBool("oidc.strip_email_domain"),
},

LogTail: logConfig,

CLI: headscale.CLIConfig{
Address: viper.GetString("cli.address"),
APIKey: viper.GetString("cli.api_key"),
Expand Down
9 changes: 9 additions & 0 deletions config-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -235,3 +235,12 @@ unix_socket_permission: "0770"
# namespace: `first-name.last-name.example.com`
#
# strip_email_domain: true

# Logtail configuration
# Logtail is Tailscales logging and auditing infrastructure, it allows the control panel
# to instruct tailscale nodes to log their activity to a remote server.
logtail:
# Enable logtail for this headscales clients.
# As there is currently no support for overriding the log server in headscale, this is
# disabled by default. Enabling this will make your clients send logs to Tailscale Inc.
enabled: false

0 comments on commit a0c465c

Please sign in to comment.