diff --git a/client/src/components/Dashboard/BlockedDomains.js b/client/src/components/Dashboard/BlockedDomains.js index c6b039cc..4ede73c2 100644 --- a/client/src/components/Dashboard/BlockedDomains.js +++ b/client/src/components/Dashboard/BlockedDomains.js @@ -6,7 +6,7 @@ import map from 'lodash/map'; import Card from '../ui/Card'; const Clients = props => ( - + ( { ip: prop, domain: value } diff --git a/client/src/components/Dashboard/Clients.js b/client/src/components/Dashboard/Clients.js index 60419e42..220a0f67 100644 --- a/client/src/components/Dashboard/Clients.js +++ b/client/src/components/Dashboard/Clients.js @@ -6,7 +6,7 @@ import map from 'lodash/map'; import Card from '../ui/Card'; const Clients = props => ( - + ( { ip: prop, count: value } diff --git a/client/src/components/Dashboard/Counters.js b/client/src/components/Dashboard/Counters.js index 094b78ed..44a9d188 100644 --- a/client/src/components/Dashboard/Counters.js +++ b/client/src/components/Dashboard/Counters.js @@ -5,13 +5,13 @@ import Card from '../ui/Card'; import Tooltip from '../ui/Tooltip'; const Counters = props => ( - +
DNS Queries - + diff --git a/client/src/components/Dashboard/QueriedDomains.js b/client/src/components/Dashboard/QueriedDomains.js index a758d21b..f927e11a 100644 --- a/client/src/components/Dashboard/QueriedDomains.js +++ b/client/src/components/Dashboard/QueriedDomains.js @@ -6,7 +6,7 @@ import map from 'lodash/map'; import Card from '../ui/Card'; const QueriedDomains = props => ( - + ( { ip: prop, count: value } diff --git a/control.go b/control.go index cb6b1b6d..eae9975a 100644 --- a/control.go +++ b/control.go @@ -217,7 +217,7 @@ func handleStatus(w http.ResponseWriter, r *http.Request) { // stats // ----- func handleStats(w http.ResponseWriter, r *http.Request) { - histrical := generateMapFromStats(&statistics.perMinute, 0, 2) + histrical := generateMapFromStats(&statistics.perHour, 0, 24) // sum them up summed := map[string]interface{}{} for key, values := range histrical { @@ -231,7 +231,7 @@ func handleStats(w http.ResponseWriter, r *http.Request) { } summed[key] = summedValue } - summed["stats_period"] = "3 minutes" + summed["stats_period"] = "24 hours" json, err := json.Marshal(summed) if err != nil { @@ -439,7 +439,7 @@ func handleStatsTop(w http.ResponseWriter, r *http.Request) { blocked := map[string]int{} clients := map[string]int{} now := time.Now() - timeWindow := time.Minute * 3 + timeWindow := time.Hour * 24 notBefore := now.Add(timeWindow * -1) for _, value := range values { @@ -494,7 +494,8 @@ func handleStatsTop(w http.ResponseWriter, r *http.Request) { } gen(&json, "top_queried_domains", domains, true) gen(&json, "top_blocked_domains", blocked, true) - gen(&json, "top_clients", clients, false) + gen(&json, "top_clients", clients, true) + json.WriteString(" \"stats_period\": \"24 hours\"\n") json.WriteString("}\n") w.Header().Set("Content-Type", "application/json")