Add optional query statistics
Off by default (stats in jarl.yaml). When enabled, Jarl adds a loopback statistics channel and a response log to named's configuration (merged into existing logging/statistics-channels statements) and switches response logging with rndc responselog, because the responselog option only counts when named starts. jarld polls named's counters every minute and tails the response log (resuming after restarts and across rotation). It stores aggregates, never individual queries, in a separate SQLite database: per-minute, hourly and daily counters (queries, result codes, record types, views, zones, cache hits, upstream latency, DNSSEC) and hourly/daily top lists (names, clients, NXDOMAIN and SERVFAIL names, refused clients), each with its own retention. Clients can be anonymized or excluded. - Web UI: Statistics page with KPI tiles, queries and failed answers over time, a weekday x hour heatmap, top lists and breakdowns; SVG charts with hover/keyboard readouts, a table view and light/dark palettes validated for colour-vision deficiency. - CLI: jarl stats status|summary|top|timeline|heatmap|breakdown. - API: /api/v1/stats/*, behind a new "stats" permission resource. - jarld brings named's configuration up to date with jarl.yaml at startup (engine.SyncConfig), never overwriting hand-edited files. - resync now refuses to overwrite drifted files without force, as documented. - tmpfiles.d creates /var/log/named (allowed by named's AppArmor profile on Debian 13 and Ubuntu). - The e2e harness runs named with -f like the Debian unit. - docs/stats.md, plus API, CLI, configuration, permissions and README updates. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
0795a1001e
commit
3b7bee67f8
44 files changed
+4163
-42
No files matched your search
+1
-1
@@ -172,7 +172,7 @@ Exit codes: 0 ok, 1 error, 3 not authenticated or not allowed, 4 not found,
|
||||
root.AddCommand(c)
|
||||
}
|
||||
}
|
||||
add("dns", zoneCmd(), recordCmd(), viewCmd(), aclCmd(), tsigCmd(), optionCmd(), settingsCmd(), acmeCmd(), searchCmd())
|
||||
add("dns", zoneCmd(), recordCmd(), viewCmd(), aclCmd(), tsigCmd(), optionCmd(), settingsCmd(), acmeCmd(), searchCmd(), statsCmd())
|
||||
add("changes", applyCmd(), changesetCmd(), historyCmd())
|
||||
add("admin", statusCmd(), whoamiCmd(), userCmd(), tokenCmd(), auditCmd(), checkCmd(), resyncCmd(), configCmd())
|
||||
return root
|
||||
|
||||
@@ -6,6 +6,7 @@ import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"go.yaml.in/yaml/v3"
|
||||
@@ -116,6 +117,10 @@ func TestListQueries(t *testing.T) {
|
||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
got = r.URL.Path + "?" + r.URL.RawQuery
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
if strings.Contains(r.URL.Path, "/stats/") && !strings.HasSuffix(r.URL.Path, "/top") && !strings.HasSuffix(r.URL.Path, "/breakdown") {
|
||||
w.Write([]byte("{}"))
|
||||
return
|
||||
}
|
||||
w.Write([]byte("[]"))
|
||||
}))
|
||||
defer srv.Close()
|
||||
@@ -129,6 +134,12 @@ func TestListQueries(t *testing.T) {
|
||||
{[]string{"zone", "list", "--view", "internal"}, "/api/v1/zones?view=internal"},
|
||||
{[]string{"changeset", "list"}, "/api/v1/changesets?status=open"},
|
||||
{[]string{"option", "list", "--all"}, "/api/v1/options?"},
|
||||
{[]string{"stats", "summary"}, "/api/v1/stats/summary?since=24h&top=10"},
|
||||
{[]string{"stats", "heatmap"}, "/api/v1/stats/heatmap?key=queries&since=28d"},
|
||||
{[]string{"stats", "breakdown", "rcode"}, "/api/v1/stats/breakdown?group=rcode&since=24h"},
|
||||
{[]string{"stats", "top", "clients", "--since", "7d"}, "/api/v1/stats/top?kind=client&limit=20&since=7d"},
|
||||
{[]string{"stats", "top", "nxdomain"}, "/api/v1/stats/top?kind=nxdomain&limit=20&since=24h"},
|
||||
{[]string{"stats", "timeline", "--key", "queries", "--key", "rcode:*"}, "/api/v1/stats/timeline?key=queries&key=rcode%3A%2A&since=24h&step=auto"},
|
||||
} {
|
||||
got = ""
|
||||
root := rootCmd()
|
||||
|
||||
@@ -0,0 +1,378 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"math"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"jarl/internal/stats"
|
||||
)
|
||||
|
||||
func statsCmd() *cobra.Command {
|
||||
cmd := &cobra.Command{
|
||||
Use: "stats",
|
||||
Short: "Query statistics: volume over time, top names and clients, result codes",
|
||||
Long: `Query statistics collected from named (see docs/stats.md). They must be
|
||||
enabled in /etc/jarl/jarl.yaml (stats.enabled: true).
|
||||
|
||||
Ranges are given with --since: 90m, 24h, 7d, 2w. Use -o json or -o yaml to
|
||||
export the data.`,
|
||||
}
|
||||
// Each command has its own --since variable: their defaults differ, and
|
||||
// a shared variable would take the last default for all of them.
|
||||
var summarySince, topSince, timelineSince, heatmapSince, breakdownSince string
|
||||
sinceFlag := func(c *cobra.Command, v *string, def, help string) {
|
||||
c.Flags().StringVar(v, "since", def, help)
|
||||
}
|
||||
const sinceHelp = "time range: 90m, 24h, 7d, 2w"
|
||||
|
||||
status := &cobra.Command{
|
||||
Use: "status",
|
||||
Short: "Show whether statistics are collected and any problems",
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
c, err := newClient()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var st stats.Status
|
||||
if err := c.Get(ctx(), "/stats/status", nil, &st); err != nil {
|
||||
return err
|
||||
}
|
||||
return output(st, func(w io.Writer) {
|
||||
if !st.Enabled {
|
||||
fmt.Fprintln(w, "Statistics:\tdisabled (set stats.enabled: true in /etc/jarl/jarl.yaml and restart jarl)")
|
||||
return
|
||||
}
|
||||
mode := "counters and response log"
|
||||
if !st.QueryLog {
|
||||
mode = "counters only"
|
||||
}
|
||||
fmt.Fprintf(w, "Statistics:\tenabled (%s)\n", mode)
|
||||
fmt.Fprintf(w, "Statistics channel:\t%s, last read %s\n", st.StatisticsChannel, fmtTime(st.LastPoll))
|
||||
if st.QueryLog {
|
||||
fmt.Fprintf(w, "Response log:\t%s, %d lines read, last %s\n", st.LogFile, st.LinesRead, fmtTime(st.LastLine))
|
||||
}
|
||||
fmt.Fprintf(w, "Data since:\t%s\n", fmtTime(st.FirstData))
|
||||
fmt.Fprintf(w, "Retention:\tminutes %s, hours %s, days %s\n", st.Retention.Minute, st.Retention.Hour, st.Retention.Day)
|
||||
for _, warn := range st.Warnings {
|
||||
fmt.Fprintf(w, "Warning:\t%s\n", warn)
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
|
||||
var topN int
|
||||
summary := &cobra.Command{
|
||||
Use: "summary",
|
||||
Short: "Totals, result codes, record types and the top names and clients",
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
c, err := newClient()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var s stats.Summary
|
||||
if err := c.Get(ctx(), "/stats/summary", q("since", summarySince, "top", strconv.Itoa(topN)), &s); err != nil {
|
||||
return err
|
||||
}
|
||||
return output(s, func(w io.Writer) {
|
||||
fmt.Fprintf(w, "Range:\t%s to %s\n", s.From.Local().Format("2006-01-02 15:04"), s.To.Local().Format("2006-01-02 15:04"))
|
||||
fmt.Fprintf(w, "Queries:\t%d (%.2f per second on average)\n", s.Queries, s.AvgQPS)
|
||||
if s.Peak != nil {
|
||||
fmt.Fprintf(w, "Busiest %s:\t%s with %d queries\n", s.Peak.Per, s.Peak.Time.Local().Format("2006-01-02 15:04"), s.Peak.Queries)
|
||||
}
|
||||
if s.CacheHitRatio != nil {
|
||||
fmt.Fprintf(w, "Cache hit ratio:\t%.1f%%\n", *s.CacheHitRatio*100)
|
||||
}
|
||||
if s.NXDomainRatio != nil {
|
||||
fmt.Fprintf(w, "NXDOMAIN:\t%.1f%% of queries\n", *s.NXDomainRatio*100)
|
||||
}
|
||||
fmt.Fprintf(w, "Result codes:\t%s\n", entryLine(s.RCodes, s.Queries, 6))
|
||||
fmt.Fprintf(w, "Record types:\t%s\n", entryLine(s.QTypes, s.Queries, 8))
|
||||
if len(s.Answers) > 0 {
|
||||
fmt.Fprintf(w, "Answers:\t%s\n", entryLine(s.Answers, s.Queries, 2))
|
||||
}
|
||||
if len(s.Views) > 0 {
|
||||
fmt.Fprintf(w, "Views:\t%s\n", entryLine(s.Views, 0, 10))
|
||||
}
|
||||
if len(s.Zones) > 0 {
|
||||
fmt.Fprintf(w, "Zones:\t%s\n", strings.ReplaceAll(entryLine(s.Zones, 0, 10), stats.OtherZone+" ", "other "))
|
||||
}
|
||||
for _, k := range []string{stats.KindName, stats.KindClient, stats.KindNXDomain} {
|
||||
es := s.Tops[k]
|
||||
if len(es) == 0 {
|
||||
continue
|
||||
}
|
||||
fmt.Fprintf(w, "\n%s\t\n", map[string]string{stats.KindName: "Top names", stats.KindClient: "Top clients", stats.KindNXDomain: "Top NXDOMAIN names"}[k])
|
||||
for _, e := range es {
|
||||
fmt.Fprintf(w, " %s\t%d\n", e.Key, e.Count)
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
sinceFlag(summary, &summarySince, "24h", sinceHelp)
|
||||
summary.Flags().IntVar(&topN, "top", 10, "entries per top list")
|
||||
|
||||
var limit int
|
||||
top := &cobra.Command{
|
||||
Use: "top [names|clients|nxdomain|servfail|refused]",
|
||||
Short: "The most queried names, busiest clients, names with errors, refused clients",
|
||||
Example: ` jarl stats top names --since 7d
|
||||
jarl stats top clients --limit 50
|
||||
jarl stats top nxdomain # misconfigured hosts and typos
|
||||
jarl stats top refused # who is asking for what they may not have`,
|
||||
Args: cobra.MaximumNArgs(1),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
kind := stats.KindName
|
||||
if len(args) == 1 {
|
||||
kind = strings.TrimSuffix(strings.ToLower(args[0]), "s")
|
||||
if kind == "nxdomain" || kind == "servfail" {
|
||||
kind = strings.ToLower(args[0])
|
||||
}
|
||||
}
|
||||
c, err := newClient()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var es []stats.Entry
|
||||
if err := c.Get(ctx(), "/stats/top", q("kind", kind, "since", topSince, "limit", strconv.Itoa(limit)), &es); err != nil {
|
||||
return err
|
||||
}
|
||||
return output(es, func(w io.Writer) {
|
||||
var total int64
|
||||
for _, e := range es {
|
||||
total += e.Count
|
||||
}
|
||||
head := map[string]string{stats.KindClient: "CLIENT", stats.KindRefused: "CLIENT"}[kind]
|
||||
if head == "" {
|
||||
head = "NAME"
|
||||
}
|
||||
fmt.Fprintf(w, "#\t%s\tQUERIES\t\n", head)
|
||||
for i, e := range es {
|
||||
fmt.Fprintf(w, "%d\t%s\t%d\t%s\n", i+1, e.Key, e.Count, bar(e.Count, es[0].Count, 20))
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
sinceFlag(top, &topSince, "24h", sinceHelp)
|
||||
top.Flags().IntVar(&limit, "limit", 20, "how many")
|
||||
|
||||
var step string
|
||||
var keys []string
|
||||
var table bool
|
||||
timeline := &cobra.Command{
|
||||
Use: "timeline",
|
||||
Short: "Counters over time (queries by default)",
|
||||
Example: ` jarl stats timeline --since 6h
|
||||
jarl stats timeline --since 7d --key rcode:NXDOMAIN
|
||||
jarl stats timeline --since 24h --key 'qtype:*' -o json`,
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
c, err := newClient()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
qv := q("since", timelineSince, "step", step)
|
||||
for _, k := range keys {
|
||||
qv.Add("key", k)
|
||||
}
|
||||
var tl stats.Timeline
|
||||
if err := c.Get(ctx(), "/stats/timeline", qv, &tl); err != nil {
|
||||
return err
|
||||
}
|
||||
return output(tl, func(w io.Writer) {
|
||||
for _, s := range tl.Series {
|
||||
var total, peak int64
|
||||
for _, v := range s.Values {
|
||||
total += v
|
||||
peak = max(peak, v)
|
||||
}
|
||||
fmt.Fprintf(w, "%s\ttotal %d, peak %d per %s\n", s.Key, total, peak, tl.Step)
|
||||
fmt.Fprintf(w, "\t%s\n", sparkline(s.Values))
|
||||
}
|
||||
if len(tl.Times) > 0 {
|
||||
fmt.Fprintf(w, "\t%s ... %s\n", time.Unix(tl.Times[0], 0).Local().Format("Jan 2 15:04"), time.Unix(tl.Times[len(tl.Times)-1], 0).Local().Format("Jan 2 15:04"))
|
||||
}
|
||||
if !table {
|
||||
return
|
||||
}
|
||||
fmt.Fprint(w, "\nTIME")
|
||||
for _, s := range tl.Series {
|
||||
fmt.Fprintf(w, "\t%s", strings.ToUpper(s.Key))
|
||||
}
|
||||
fmt.Fprintln(w)
|
||||
for i, t := range tl.Times {
|
||||
fmt.Fprint(w, time.Unix(t, 0).Local().Format("2006-01-02 15:04"))
|
||||
for _, s := range tl.Series {
|
||||
fmt.Fprintf(w, "\t%d", s.Values[i])
|
||||
}
|
||||
fmt.Fprintln(w)
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
sinceFlag(timeline, &timelineSince, "24h", sinceHelp)
|
||||
timeline.Flags().StringVar(&step, "step", "auto", "bucket size: auto, 1m, 5m, 15m, 1h, 6h, 1d")
|
||||
timeline.Flags().BoolVar(&table, "table", false, "also print every bucket (use -o json to export)")
|
||||
timeline.Flags().StringArrayVar(&keys, "key", nil, `counter (repeatable), e.g. queries, rcode:NXDOMAIN, 'qtype:*' (default queries)`)
|
||||
|
||||
var hmKey string
|
||||
heatmap := &cobra.Command{
|
||||
Use: "heatmap",
|
||||
Short: "Average queries per hour by weekday and hour of day",
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
c, err := newClient()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var hm stats.Heatmap
|
||||
if err := c.Get(ctx(), "/stats/heatmap", q("since", heatmapSince, "key", hmKey), &hm); err != nil {
|
||||
return err
|
||||
}
|
||||
return output(hm, func(w io.Writer) {
|
||||
peak := 0.0
|
||||
for d := range 7 {
|
||||
for h := range 24 {
|
||||
peak = math.Max(peak, hm.Avg[d][h])
|
||||
}
|
||||
}
|
||||
fmt.Fprintf(w, "Average %s per hour since %s (darker = busier, · = no data)\n\n", hm.Key, hm.From.Local().Format("2006-01-02"))
|
||||
fmt.Fprint(w, " ")
|
||||
for h := 0; h < 24; h += 3 {
|
||||
fmt.Fprintf(w, "%-6s", fmt.Sprintf("%02d", h))
|
||||
}
|
||||
fmt.Fprintln(w)
|
||||
shades := []string{"░░", "▒▒", "▓▓", "██"}
|
||||
for d, day := range []string{"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"} {
|
||||
fmt.Fprintf(w, "%s ", day)
|
||||
for h := range 24 {
|
||||
v := hm.Avg[d][h]
|
||||
switch {
|
||||
case v < 0:
|
||||
fmt.Fprint(w, "· ")
|
||||
case peak <= 0:
|
||||
fmt.Fprint(w, shades[0])
|
||||
default:
|
||||
fmt.Fprint(w, shades[min(int(v/peak*float64(len(shades))), len(shades)-1)])
|
||||
}
|
||||
}
|
||||
fmt.Fprintln(w)
|
||||
}
|
||||
fmt.Fprintf(w, "\nBusiest slot: %.0f %s per hour on average\n", peak, hm.Key)
|
||||
})
|
||||
},
|
||||
}
|
||||
sinceFlag(heatmap, &heatmapSince, "28d", "time range (at most the hourly retention)")
|
||||
heatmap.Flags().StringVar(&hmKey, "key", "queries", "counter to average")
|
||||
|
||||
breakdown := &cobra.Command{
|
||||
Use: "breakdown GROUP",
|
||||
Short: "Totals by " + strings.Join(stats.Groups, ", "),
|
||||
Example: ` jarl stats breakdown qtype
|
||||
jarl stats breakdown zone --since 7d
|
||||
jarl stats breakdown rtt # upstream response times of recursion`,
|
||||
Args: cobra.ExactArgs(1),
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
c, err := newClient()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
var es []stats.Entry
|
||||
if err := c.Get(ctx(), "/stats/breakdown", q("group", args[0], "since", breakdownSince), &es); err != nil {
|
||||
return err
|
||||
}
|
||||
return output(es, func(w io.Writer) {
|
||||
var total int64
|
||||
for _, e := range es {
|
||||
total += e.Count
|
||||
}
|
||||
fmt.Fprintf(w, "%s\tCOUNT\tSHARE\t\n", strings.ToUpper(args[0]))
|
||||
for _, e := range es {
|
||||
key := e.Key
|
||||
if args[0] == "zone" && key == stats.OtherZone {
|
||||
key = "(not a local zone)"
|
||||
}
|
||||
fmt.Fprintf(w, "%s\t%d\t%.1f%%\t%s\n", key, e.Count, pct(e.Count, total), bar(e.Count, es[0].Count, 20))
|
||||
}
|
||||
})
|
||||
},
|
||||
}
|
||||
sinceFlag(breakdown, &breakdownSince, "24h", sinceHelp)
|
||||
|
||||
cmd.AddCommand(status, summary, top, timeline, heatmap, breakdown)
|
||||
return cmd
|
||||
}
|
||||
|
||||
func pct(n, total int64) float64 {
|
||||
if total == 0 {
|
||||
return 0
|
||||
}
|
||||
return float64(n) / float64(total) * 100
|
||||
}
|
||||
|
||||
// entryLine formats the first n entries as "A 61% · AAAA 30% · ...".
|
||||
func entryLine(es []stats.Entry, total int64, n int) string {
|
||||
if total == 0 {
|
||||
for _, e := range es {
|
||||
total += e.Count
|
||||
}
|
||||
}
|
||||
var parts []string
|
||||
for i, e := range es {
|
||||
if i == n {
|
||||
parts = append(parts, fmt.Sprintf("+%d more", len(es)-n))
|
||||
break
|
||||
}
|
||||
parts = append(parts, fmt.Sprintf("%s %.1f%%", e.Key, pct(e.Count, total)))
|
||||
}
|
||||
if len(parts) == 0 {
|
||||
return "-"
|
||||
}
|
||||
return strings.Join(parts, " · ")
|
||||
}
|
||||
|
||||
func bar(v, peak int64, width int) string {
|
||||
if peak <= 0 {
|
||||
return ""
|
||||
}
|
||||
n := int(math.Round(float64(v) / float64(peak) * float64(width)))
|
||||
return strings.Repeat("■", max(n, 1))
|
||||
}
|
||||
|
||||
// sparkline draws values with block characters, at most 120 wide.
|
||||
func sparkline(vals []int64) string {
|
||||
if len(vals) == 0 {
|
||||
return ""
|
||||
}
|
||||
if len(vals) > 120 {
|
||||
// Combine neighbouring buckets.
|
||||
per := (len(vals) + 119) / 120
|
||||
var merged []int64
|
||||
for i := 0; i < len(vals); i += per {
|
||||
var s int64
|
||||
for _, v := range vals[i:min(i+per, len(vals))] {
|
||||
s += v
|
||||
}
|
||||
merged = append(merged, s)
|
||||
}
|
||||
vals = merged
|
||||
}
|
||||
blocks := []rune("▁▂▃▄▅▆▇█")
|
||||
var peak int64
|
||||
for _, v := range vals {
|
||||
peak = max(peak, v)
|
||||
}
|
||||
var sb strings.Builder
|
||||
for _, v := range vals {
|
||||
if peak == 0 {
|
||||
sb.WriteRune(blocks[0])
|
||||
continue
|
||||
}
|
||||
sb.WriteRune(blocks[min(int(float64(v)/float64(peak)*float64(len(blocks)-1)+0.5), len(blocks)-1)])
|
||||
}
|
||||
return sb.String()
|
||||
}
|
||||
+1
-1
@@ -302,7 +302,7 @@ func renderCmd() *cobra.Command {
|
||||
return err
|
||||
}
|
||||
paths := render.Paths{ConfigDir: filepath.Join(out, "config"), ZoneDir: filepath.Join(out, "zones"), CacheDir: filepath.Join(out, "cache")}
|
||||
o := render.Render(st, paths)
|
||||
o := render.Render(st, paths, renderExtras(a.cfg))
|
||||
for _, f := range o.Files {
|
||||
if err := os.MkdirAll(filepath.Dir(f.Path), 0o750); err != nil {
|
||||
return err
|
||||
|
||||
+109
-2
@@ -11,6 +11,7 @@ import (
|
||||
"io"
|
||||
"log/slog"
|
||||
"net"
|
||||
"net/netip"
|
||||
"os"
|
||||
"os/signal"
|
||||
"path/filepath"
|
||||
@@ -28,6 +29,7 @@ import (
|
||||
"jarl/internal/model"
|
||||
"jarl/internal/render"
|
||||
"jarl/internal/server"
|
||||
"jarl/internal/stats"
|
||||
"jarl/internal/store"
|
||||
"jarl/internal/version"
|
||||
"jarl/internal/web"
|
||||
@@ -118,10 +120,72 @@ func openApp(allowMissingConfig bool) (*app, error) {
|
||||
FileGroup: cfg.BIND.FileGroup,
|
||||
ReloadTimeout: time.Duration(cfg.BIND.ReloadTimeout),
|
||||
NoReload: cfg.BIND.NoReload,
|
||||
Extras: renderExtras(cfg),
|
||||
}, log)
|
||||
return &app{cfg: cfg, log: log, store: st, eng: eng, owner: owner}, nil
|
||||
}
|
||||
|
||||
// openStats opens the statistics database (next to, not inside, Jarl's
|
||||
// configuration database).
|
||||
func openStats(a *app) (*stats.Store, error) {
|
||||
path := a.cfg.Stats.Database
|
||||
if err := os.MkdirAll(filepath.Dir(path), 0o750); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
ss, err := stats.OpenStore(path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return ss, nil
|
||||
}
|
||||
|
||||
func statsOptions(cfg *config.Config) stats.Options {
|
||||
sc := cfg.Stats
|
||||
o := stats.Options{QueryLog: sc.QueryLog, LogFile: sc.LogFile, StatisticsChannel: sc.StatisticsChannel, TopN: sc.TopN,
|
||||
RetainMinute: time.Duration(sc.Retention.Minute), RetainHour: time.Duration(sc.Retention.Hour), RetainDay: time.Duration(sc.Retention.Day),
|
||||
Anonymize: sc.AnonymizeClients}
|
||||
for _, p := range sc.ExcludeClients {
|
||||
if pf, err := config.ParsePrefix(p); err == nil {
|
||||
o.Exclude = append(o.Exclude, pf.Masked())
|
||||
}
|
||||
}
|
||||
return o
|
||||
}
|
||||
|
||||
// zoneIndex lists the zones named answers authoritatively, per view, so
|
||||
// statistics can be broken down by zone.
|
||||
func zoneIndex(a *app) stats.ZoneIndex {
|
||||
return func() map[string][]string {
|
||||
st, err := a.store.LoadState(context.Background())
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
out := map[string][]string{}
|
||||
for _, z := range st.Zones {
|
||||
if z.Type != model.ZonePrimary && z.Type != model.ZoneSecondary && z.Type != model.ZoneMirror {
|
||||
continue
|
||||
}
|
||||
v := st.ViewName(z)
|
||||
out[v] = append(out[v], strings.TrimSuffix(z.Name, "."))
|
||||
}
|
||||
return out
|
||||
}
|
||||
}
|
||||
|
||||
// renderExtras turns jarl.yaml settings that change named's configuration
|
||||
// into render extras.
|
||||
func renderExtras(cfg *config.Config) render.Extras {
|
||||
var x render.Extras
|
||||
if cfg.Stats.Enabled {
|
||||
h := &render.StatsHooks{Channel: netip.MustParseAddrPort(cfg.Stats.StatisticsChannel)}
|
||||
if cfg.Stats.QueryLog {
|
||||
h.LogFile, h.LogVersions, h.LogSize = cfg.Stats.LogFile, cfg.Stats.LogVersions, cfg.Stats.LogSize
|
||||
}
|
||||
x.Stats = h
|
||||
}
|
||||
return x
|
||||
}
|
||||
|
||||
func (a *app) close() {
|
||||
a.store.Close()
|
||||
// Commands run as root must not leave root-owned files where the
|
||||
@@ -172,14 +236,57 @@ func serveCmd() *cobra.Command {
|
||||
if users, err := a.store.ListUsers(ctx); err == nil && len(users) == 0 {
|
||||
a.log.Warn("there are no users yet; create an administrator with 'jarld init' or 'jarld user add --admin NAME'")
|
||||
}
|
||||
if ok, err := a.eng.Adopted(); err == nil && !ok {
|
||||
adopted, aerr := a.eng.Adopted()
|
||||
if aerr == nil && !adopted {
|
||||
a.log.Warn("named does not load Jarl's configuration yet; changes are written but named is not reloaded until 'jarld adopt' runs", "main_config", a.cfg.BIND.MainConfig)
|
||||
}
|
||||
if adopted {
|
||||
// Settings in jarl.yaml (such as stats) can change named's
|
||||
// configuration; bring it up to date.
|
||||
if wrote, res, err := a.eng.SyncConfig(ctx); err != nil {
|
||||
a.log.Warn("could not update named's configuration for the settings in jarl.yaml; fix the problem and restart jarl, or run 'jarl resync'", "err", err)
|
||||
} else if wrote {
|
||||
a.log.Info("updated named's configuration for the settings in jarl.yaml", "files", res.Files)
|
||||
}
|
||||
// Response logging is switched at runtime (the option only
|
||||
// counts when named starts). Turn it off again when
|
||||
// statistics no longer use it, unless the configuration
|
||||
// asks for it.
|
||||
if !a.cfg.Stats.Enabled || !a.cfg.Stats.QueryLog {
|
||||
if st, err := a.store.LoadState(ctx); err == nil && st.FindOption(model.ScopeOptions, 0, "responselog") == nil {
|
||||
if changed, err := a.eng.SetResponseLogging(ctx, false); err == nil && changed {
|
||||
a.log.Info("turned off named's response logging, which query statistics no longer use")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
var collector *stats.Collector
|
||||
collectorDone := make(chan struct{})
|
||||
if a.cfg.Stats.Enabled {
|
||||
ss, err := openStats(a)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer ss.Close()
|
||||
opts := statsOptions(a.cfg)
|
||||
if adopted {
|
||||
opts.EnsureLogging = func(ctx context.Context) (bool, error) { return a.eng.SetResponseLogging(ctx, true) }
|
||||
}
|
||||
collector = stats.NewCollector(ss, opts, zoneIndex(a), a.log)
|
||||
cctx, cancel := context.WithCancel(ctx)
|
||||
go func() {
|
||||
collector.Run(cctx)
|
||||
close(collectorDone)
|
||||
}()
|
||||
// Stop the collector (it writes what it has) before the
|
||||
// database closes, however serving ends.
|
||||
defer func() { cancel(); <-collectorDone }()
|
||||
}
|
||||
srv := server.New(server.Config{
|
||||
Listen: a.cfg.Listen, TLSCertFile: a.cfg.TLS.CertFile, TLSKeyFile: a.cfg.TLS.KeyFile,
|
||||
TrustedProxies: a.cfg.Proxies(), SessionLifetime: time.Duration(a.cfg.Session.Lifetime),
|
||||
SessionIdle: time.Duration(a.cfg.Session.IdleTimeout), CookieSecure: a.cfg.Session.CookieSecure,
|
||||
Version: version.Version,
|
||||
Version: version.Version, Stats: collector,
|
||||
}, a.eng, a.log, web.FS())
|
||||
hup := make(chan os.Signal, 1)
|
||||
signal.Notify(hup, syscall.SIGHUP)
|
||||
|
||||
Reference in new issue
Block a user