diff --git a/CHANGELOG.md b/CHANGELOG.md index ee204b0..81d616c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ All notable changes to Jarl are documented here. The format follows ### Upgrading from 0.4 +- The database gets three new versions (internet exposure, certificates, + linked zones), applied when jarld starts; a 0.4 jarld can't open it + afterwards, so take a backup first (`sudo jarld backup`). Backups made + by 0.4 restore into this version. Tested: 0.4.0 packages with views, + zones, records, blocking and statistics, upgraded in place and + restored from a 0.4.0 backup. + +- Statistics per view start with this version: earlier figures are for + all views together. + - New exposure warnings (docs/exposure.md) appear for views reachable from the internet, e.g. "no rate-limit" or "version visible" on an external view: fix them from the Exposure page, or acknowledge them. A change diff --git a/README.md b/README.md index 436f8a0..3d9b624 100644 --- a/README.md +++ b/README.md @@ -200,8 +200,8 @@ review step. ## Status -Version 0.4.0 is the current release, and 0.4.1 is in testing -(0.4.1-rc.6): it adds Prometheus metrics, address ranges in ACLs and +Version 0.4.0 is the current release, and 0.5.0 is in testing +(0.5.0-rc.1): it adds Prometheus metrics, address ranges in ACLs and other address match lists, safer changeset handling, internet exposure checks with response rate limiting, TLS certificates Jarl obtains and renews itself, linked zones for split DNS, DNS over TLS and HTTPS, and statistics diff --git a/VERSION b/VERSION index 67e381b..ebce39f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.1-rc.6 +0.5.0-rc.1 diff --git a/cmd/jarl/stats.go b/cmd/jarl/stats.go index 226d180..e7941a0 100644 --- a/cmd/jarl/stats.go +++ b/cmd/jarl/stats.go @@ -108,7 +108,11 @@ Use -o json or -o yaml to export the data.`, 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) + what := "queries" + if len(s.FilterViews) > 0 { + what = "answers" + } + fmt.Fprintf(w, "Busiest %s:\t%s with %d %s\n", s.Peak.Per, s.Peak.Time.Local().Format("2006-01-02 15:04"), s.Peak.Queries, what) } if s.CacheHitRatio != nil { fmt.Fprintf(w, "Cache hit ratio:\t%.1f%%\n", *s.CacheHitRatio*100)