diff --git a/client/src/components/Dashboard/BlockedDomains.js b/client/src/components/Dashboard/BlockedDomains.js
index 4ede73c2..382a23b8 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 => (
- <Card title="Top blocked domains" subtitle="in the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
+ <Card title="Top blocked domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable
data={map(props.topBlockedDomains, (value, prop) => (
{ ip: prop, domain: value }
diff --git a/client/src/components/Dashboard/Clients.js b/client/src/components/Dashboard/Clients.js
index 220a0f67..ab36fa90 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 => (
- <Card title="Top clients" subtitle="in the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
+ <Card title="Top clients" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable
data={map(props.topClients, (value, prop) => (
{ ip: prop, count: value }
diff --git a/client/src/components/Dashboard/Counters.js b/client/src/components/Dashboard/Counters.js
index 6292e11f..1b7ec92f 100644
--- a/client/src/components/Dashboard/Counters.js
+++ b/client/src/components/Dashboard/Counters.js
@@ -7,13 +7,13 @@ import Tooltip from '../ui/Tooltip';
const tooltipType = 'tooltip-custom--narrow';
const Counters = props => (
- <Card title="General statistics" subtitle="in the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
+ <Card title="General statistics" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<table className="table card-table">
<tbody>
<tr>
<td>
DNS Queries
- <Tooltip text="A number of DNS quieries processed in the last 24 hours" type={tooltipType} />
+ <Tooltip text="A number of DNS quieries processed for the last 24 hours" type={tooltipType} />
</td>
<td className="text-right">
<span className="text-muted">
@@ -23,8 +23,8 @@ const Counters = props => (
</tr>
<tr>
<td>
- Blocked by filters
- <Tooltip text="A number of DNS requests blocked by filters" type={tooltipType} />
+ Blocked by <a href="#filters">Filters</a>
+ <Tooltip text="A number of DNS requests blocked by adblock filters and hosts blocklists" type={tooltipType} />
</td>
<td className="text-right">
<span className="text-muted">
@@ -35,7 +35,7 @@ const Counters = props => (
<tr>
<td>
Blocked malware/phishing
- <Tooltip text="A number of DNS requests blocked" type={tooltipType} />
+ <Tooltip text="A number of DNS requests blocked by the AdGuard browsing security module" type={tooltipType} />
</td>
<td className="text-right">
<span className="text-muted">
diff --git a/client/src/components/Dashboard/QueriedDomains.js b/client/src/components/Dashboard/QueriedDomains.js
index f927e11a..e8d2fcff 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 => (
- <Card title="Top queried domains" subtitle="in the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
+ <Card title="Top queried domains" subtitle="for the last 24 hours" bodyType="card-table" refresh={props.refreshButton}>
<ReactTable
data={map(props.topQueriedDomains, (value, prop) => (
{ ip: prop, count: value }
diff --git a/client/src/components/Dashboard/Statistics.js b/client/src/components/Dashboard/Statistics.js
index de98e19c..e36c5c5a 100644
--- a/client/src/components/Dashboard/Statistics.js
+++ b/client/src/components/Dashboard/Statistics.js
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
import Card from '../ui/Card';
const Statistics = props => (
- <Card title="Statistics" subtitle="Last 24 hours" bodyType="card-graph" refresh={props.refreshButton}>
+ <Card title="Statistics" subtitle="for the last 24 hours" bodyType="card-graph" refresh={props.refreshButton}>
{props.history ?
<ResponsiveLine
data={props.history}
diff --git a/client/src/components/Filters/index.js b/client/src/components/Filters/index.js
index ea4c814a..043f0c5c 100644
--- a/client/src/components/Filters/index.js
+++ b/client/src/components/Filters/index.js
@@ -73,7 +73,7 @@ class Filters extends Component {
<div className="row">
<div className="col-md-12">
<Card
- title="Blocking filters and hosts files"
+ title="Filters and hosts blocklists"
subtitle="AdGuard DNS understands basic adblock rules and hosts files syntax."
>
<ReactTable
@@ -104,7 +104,7 @@ class Filters extends Component {
addFilter={this.props.addFilter}
isFilterAdded={this.props.filtering.isFilterAdded}
title="New filter subscription"
- inputDescription="Enter valid URL or file path of the filter into field above. You will be subscribed to that filter."
+ inputDescription="Enter a valid URL to a filter subscription or a hosts file."
/>
</div>
);
diff --git a/client/src/components/Settings/Upstream.js b/client/src/components/Settings/Upstream.js
index 2b13d0b9..80d32311 100644
--- a/client/src/components/Settings/Upstream.js
+++ b/client/src/components/Settings/Upstream.js
@@ -27,7 +27,7 @@ export default class Upstream extends Component {
return (
<Card
title="Upstream DNS servers"
- subtitle="If you keep this field empty, AdGuard will use <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> as an upstream."
+ subtitle="If you keep this field empty, AdGuard will use <a href='https://1.1.1.1/' target='_blank'>Cloudflare DNS</a> as an upstream. Use tls:// prefix for DNS over TLS servers."
bodyType="card-body box-body--settings"
>
<div className="row">
diff --git a/client/src/components/Settings/index.js b/client/src/components/Settings/index.js
index c68f5668..799a7834 100644
--- a/client/src/components/Settings/index.js
+++ b/client/src/components/Settings/index.js
@@ -17,7 +17,7 @@ export default class Settings extends Component {
safebrowsing: {
enabled: false,
title: 'Use AdGuard browsing security web service',
- subtitle: 'AdGuard DNS will check if domain is blacklisted by the browsing security web service (sb.adtidy.org). It will use privacy-safe lookup API to do the check.',
+ subtitle: 'AdGuard DNS will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.',
},
parental: {
enabled: false,
@@ -27,7 +27,7 @@ export default class Settings extends Component {
safesearch: {
enabled: false,
title: 'Enforce safe search',
- subtitle: 'AdGuard DNS can enforce safe search in the major search engines: Google, Bing, Yandex.',
+ subtitle: 'AdGuard DNS can enforce safe search in the following search engines: Google, Bing, Yandex.',
},
};
diff --git a/coredns_plugin/querylog_top.go b/coredns_plugin/querylog_top.go
index 6ff531f2..d6bb7a6b 100644
--- a/coredns_plugin/querylog_top.go
+++ b/coredns_plugin/querylog_top.go
@@ -19,12 +19,6 @@ import (
"github.com/miekg/dns"
)
-// top domains/clients/blocked stats in the last 24 hours
-
-// on start we read the saved stats from the last 24 hours and add them to the stats
-
-// stats are counted using hourly LRU, rotating hourly and keeping last 24 hours
-
type hourTop struct {
domains gcache.Cache
blocked gcache.Cache