mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-28 09:58:52 +03:00
143616ca6e
Merge in DNS/adguard-home from 4299-querylog-stats-api to master Updates #1717. Updates #4299. Squashed commit of the following: commit 5b706b7997a536bc4fd2c532fb89ca5ab3536848 Merge: 48b62b0f306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 22 13:53:09 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 48b62b0f1882f1ad120c6cdd90cd7dd8cb8a7738 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Wed Mar 22 12:25:04 2023 +0200 client: fix styles, add titles and descrs commit 97e31cff70d05b51bd0e5ea2d20e8e7a251a7e41 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 18:38:12 2023 +0200 client: add ignored domains for querylog commit 24d75c4376382205ae6b8f731b1cd23d517772c9 Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Tue Mar 21 18:21:13 2023 +0200 client: add ignore domains for stats commit eefc3891d01f90af79fdac9ba8eea06d4d54a0bc Merge: 978675ea1daabb97
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 10:53:35 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 978675ea2c07bf248b4c8f26ebdf78cf59a12ef5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 21 10:53:11 2023 +0300 openapi: fix chlog commit 2ed33007aade115d38b0ca582206cc10678b084c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:49:07 2023 +0300 home: fix tests commit 6af11520c164553ee9fce8f214ea169672188d7e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:40:16 2023 +0300 home: fix typo commit 56acdfde5b1ee8d16b232c1293b91affbe319ad1 Merge: 319da34d48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 20 17:32:58 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 319da34de41ec84310b23bba2ad79c8a3a4c14ff Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 3 17:34:38 2023 +0300 querylog: fix docs commit d5a8f24d5b336e7bdbbca18069f6ede8c96bcc2c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Mar 3 11:42:00 2023 +0300 stats: fix docs commit e0cbfc1c4078180a05835ce7587e9f45484adc81 Merge: 4743c810012e5beb
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 18:45:17 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 4743c81038052b9e0ca29ae5f1565021d36ca1ef Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 18:14:16 2023 +0300 all: imp code; fix time conversion commit 34310cffd7e331d098c535590245387051674fa8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:34:11 2023 +0300 chlog: restore order commit cadd864a66655242948f1cb16e6d4945c0235d7e Merge: 2f3e25bebb226434
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:26:06 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit 2f3e25bee56d2c6ddcf4aa2fc6a1dc51ed9b06e1 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 1 12:25:14 2023 +0300 all: fix fmt commit d54022baa6c8a3d0d3c308a9b6b1a6a9dc6ac7b6 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Feb 28 16:16:40 2023 +0300 all: imp code; fix chlog commit df22de91f59a51194c55e7bcbe5bc3fcc60cb8e3 Merge: e1ea4797a772212d
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:24:09 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit e1ea4797af974c36f06683ffc6eaaae917921a43 Merge: d7db0a5abb80a7c2
Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:23:20 2023 +0300 Merge branch 'master' into 4299-querylog-stats-api commit d7db0a5af1e1f49f6174c1c42e6d9306f2381d16 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 27 17:12:20 2023 +0300 all: imp docs ... and 15 more commits
213 lines
6.1 KiB
Go
213 lines
6.1 KiB
Go
// HTTP request handlers for accessing statistics data and configuration settings
|
|
|
|
package stats
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghalg"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghhttp"
|
|
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
|
|
"github.com/AdguardTeam/golibs/log"
|
|
"github.com/AdguardTeam/golibs/timeutil"
|
|
"golang.org/x/exp/slices"
|
|
)
|
|
|
|
// topAddrs is an alias for the types of the TopFoo fields of statsResponse.
|
|
// The key is either a client's address or a requested address.
|
|
type topAddrs = map[string]uint64
|
|
|
|
// StatsResp is a response to the GET /control/stats.
|
|
type StatsResp struct {
|
|
TimeUnits string `json:"time_units"`
|
|
|
|
TopQueried []topAddrs `json:"top_queried_domains"`
|
|
TopClients []topAddrs `json:"top_clients"`
|
|
TopBlocked []topAddrs `json:"top_blocked_domains"`
|
|
|
|
DNSQueries []uint64 `json:"dns_queries"`
|
|
|
|
BlockedFiltering []uint64 `json:"blocked_filtering"`
|
|
ReplacedSafebrowsing []uint64 `json:"replaced_safebrowsing"`
|
|
ReplacedParental []uint64 `json:"replaced_parental"`
|
|
|
|
NumDNSQueries uint64 `json:"num_dns_queries"`
|
|
NumBlockedFiltering uint64 `json:"num_blocked_filtering"`
|
|
NumReplacedSafebrowsing uint64 `json:"num_replaced_safebrowsing"`
|
|
NumReplacedSafesearch uint64 `json:"num_replaced_safesearch"`
|
|
NumReplacedParental uint64 `json:"num_replaced_parental"`
|
|
|
|
AvgProcessingTime float64 `json:"avg_processing_time"`
|
|
}
|
|
|
|
// handleStats handles requests to the GET /control/stats endpoint.
|
|
func (s *StatsCtx) handleStats(w http.ResponseWriter, r *http.Request) {
|
|
s.lock.Lock()
|
|
defer s.lock.Unlock()
|
|
|
|
start := time.Now()
|
|
resp, ok := s.getData(uint32(s.limit.Hours()))
|
|
log.Debug("stats: prepared data in %v", time.Since(start))
|
|
|
|
if !ok {
|
|
// Don't bring the message to the lower case since it's a part of UI
|
|
// text for the moment.
|
|
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't get statistics data")
|
|
|
|
return
|
|
}
|
|
|
|
_ = aghhttp.WriteJSONResponse(w, r, resp)
|
|
}
|
|
|
|
// configResp is the response to the GET /control/stats_info.
|
|
type configResp struct {
|
|
IntervalDays uint32 `json:"interval"`
|
|
}
|
|
|
|
// getConfigResp is the response to the GET /control/stats_info.
|
|
type getConfigResp struct {
|
|
// Ignored is the list of host names, which should not be counted.
|
|
Ignored []string `json:"ignored"`
|
|
|
|
// Interval is the statistics rotation interval in milliseconds.
|
|
Interval float64 `json:"interval"`
|
|
|
|
// Enabled shows if statistics are enabled. It is an aghalg.NullBool to be
|
|
// able to tell when it's set without using pointers.
|
|
Enabled aghalg.NullBool `json:"enabled"`
|
|
}
|
|
|
|
// handleStatsInfo handles requests to the GET /control/stats_info endpoint.
|
|
//
|
|
// Deprecated: Remove it when migration to the new API is over.
|
|
func (s *StatsCtx) handleStatsInfo(w http.ResponseWriter, r *http.Request) {
|
|
s.lock.Lock()
|
|
defer s.lock.Unlock()
|
|
|
|
days := uint32(s.limit / timeutil.Day)
|
|
ok := checkInterval(days)
|
|
if !ok || (s.enabled && days == 0) {
|
|
// NOTE: If interval is custom we set it to 90 days for compatibility
|
|
// with old API.
|
|
days = 90
|
|
}
|
|
|
|
resp := configResp{IntervalDays: days}
|
|
if !s.enabled {
|
|
resp.IntervalDays = 0
|
|
}
|
|
_ = aghhttp.WriteJSONResponse(w, r, resp)
|
|
}
|
|
|
|
// handleGetStatsConfig handles requests to the GET /control/stats/config
|
|
// endpoint.
|
|
func (s *StatsCtx) handleGetStatsConfig(w http.ResponseWriter, r *http.Request) {
|
|
s.lock.Lock()
|
|
defer s.lock.Unlock()
|
|
|
|
ignored := s.ignored.Values()
|
|
slices.Sort(ignored)
|
|
|
|
resp := getConfigResp{
|
|
Ignored: ignored,
|
|
Interval: float64(s.limit.Milliseconds()),
|
|
Enabled: aghalg.BoolToNullBool(s.enabled),
|
|
}
|
|
_ = aghhttp.WriteJSONResponse(w, r, resp)
|
|
}
|
|
|
|
// handleStatsConfig handles requests to the POST /control/stats_config
|
|
// endpoint.
|
|
//
|
|
// Deprecated: Remove it when migration to the new API is over.
|
|
func (s *StatsCtx) handleStatsConfig(w http.ResponseWriter, r *http.Request) {
|
|
reqData := configResp{}
|
|
err := json.NewDecoder(r.Body).Decode(&reqData)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "json decode: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
if !checkInterval(reqData.IntervalDays) {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "Unsupported interval")
|
|
|
|
return
|
|
}
|
|
|
|
defer s.configModified()
|
|
|
|
s.lock.Lock()
|
|
defer s.lock.Unlock()
|
|
|
|
limit := time.Duration(reqData.IntervalDays) * timeutil.Day
|
|
s.setLimit(limit)
|
|
}
|
|
|
|
// handlePutStatsConfig handles requests to the PUT /control/stats/config/update
|
|
// endpoint.
|
|
func (s *StatsCtx) handlePutStatsConfig(w http.ResponseWriter, r *http.Request) {
|
|
reqData := getConfigResp{}
|
|
err := json.NewDecoder(r.Body).Decode(&reqData)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusBadRequest, "json decode: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
set, err := aghnet.NewDomainNameSet(reqData.Ignored)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusUnprocessableEntity, "ignored: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
ivl := time.Duration(reqData.Interval) * time.Millisecond
|
|
err = validateIvl(ivl)
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusUnprocessableEntity, "unsupported interval: %s", err)
|
|
|
|
return
|
|
}
|
|
|
|
if reqData.Enabled == aghalg.NBNull {
|
|
aghhttp.Error(r, w, http.StatusUnprocessableEntity, "enabled is null")
|
|
|
|
return
|
|
}
|
|
|
|
defer s.configModified()
|
|
|
|
s.lock.Lock()
|
|
defer s.lock.Unlock()
|
|
|
|
s.ignored = set
|
|
s.limit = ivl
|
|
s.enabled = reqData.Enabled == aghalg.NBTrue
|
|
}
|
|
|
|
// handleStatsReset handles requests to the POST /control/stats_reset endpoint.
|
|
func (s *StatsCtx) handleStatsReset(w http.ResponseWriter, r *http.Request) {
|
|
err := s.clear()
|
|
if err != nil {
|
|
aghhttp.Error(r, w, http.StatusInternalServerError, "stats: %s", err)
|
|
}
|
|
}
|
|
|
|
// initWeb registers the handlers for web endpoints of statistics module.
|
|
func (s *StatsCtx) initWeb() {
|
|
if s.httpRegister == nil {
|
|
return
|
|
}
|
|
|
|
s.httpRegister(http.MethodGet, "/control/stats", s.handleStats)
|
|
s.httpRegister(http.MethodPost, "/control/stats_reset", s.handleStatsReset)
|
|
s.httpRegister(http.MethodPost, "/control/stats_config", s.handleStatsConfig)
|
|
s.httpRegister(http.MethodGet, "/control/stats_info", s.handleStatsInfo)
|
|
|
|
s.httpRegister(http.MethodGet, "/control/stats/config", s.handleGetStatsConfig)
|
|
s.httpRegister(http.MethodPut, "/control/stats/config/update", s.handlePutStatsConfig)
|
|
}
|