Starting skeleton for getting log stats

This commit is contained in:
Eldwan Brianne 2020-11-03 16:22:25 +01:00
parent 66fe812e97
commit e770c7fc00
2 changed files with 128 additions and 77 deletions

View File

@ -14,6 +14,7 @@ import (
var (
statsURLPattern = "%s://%s:%d/control/stats"
logstatsURLPattern = "%s://%s:%d/control/querylog"
)
// Client struct is a AdGuard client to request an instance of a AdGuard ad blocker.
@ -47,14 +48,20 @@ func NewClient(protocol, hostname string, port uint16, b64password string, inter
// and then pass them as Prometheus metrics.
func (c *Client) Scrape() {
for range time.Tick(c.interval) {
stats := c.getStatistics()
//Get the general stats
stats := c.getStatistics()
c.setMetrics(stats)
//Get the log stats
logstats := c.getLogStatistics()
c.setLogMetrics(logstats)
log.Printf("New tick of statistics: %s", stats.ToString())
}
}
// Function to set the general stats
func (c *Client) setMetrics(stats *Stats) {
metrics.AvgProcessingTime.WithLabelValues(c.hostname).Set(float64(stats.AvgProcessingTime))
metrics.DnsQueries.WithLabelValues(c.hostname).Set(float64(stats.DnsQueries))
@ -82,6 +89,7 @@ func (c *Client) setMetrics(stats *Stats) {
}
}
// Function to get the general stats
func (c *Client) getStatistics() *Stats {
var stats Stats
@ -121,3 +129,41 @@ func (c *Client) isUsingPassword() bool {
func (c *Client) authenticateRequest(req *http.Request) {
req.Header.Add("Authorization", "Basic "+c.b64password)
}
// Function to get the log metrics
func (c *Client) setLogMetrics(logstats *LogStats) {
}
// Function to get the log stats
func (c *Client) getLogStatistics() *LogStats {
var logstats LogStats
logstatsURL := fmt.Sprintf(logstatsURLPattern, c.protocol, c.hostname, c.port)
req, err := http.NewRequest("GET", statsURL, nil)
if err != nil {
log.Fatal("An error has occurred when creating HTTP statistics request ", err)
}
if c.isUsingPassword() {
c.authenticateRequest(req)
}
resp, err := c.httpClient.Do(req)
if err != nil {
log.Printf("An error has occurred during login to Adguard: %v", err)
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Println("Unable to read Adguard statistics HTTP response", err)
}
// err = json.Unmarshal(body, &logstats)
// if err != nil {
// log.Println("Unable to unmarshal Adguard log statistics to log statistics struct model", err)
// }
return &logstats
}

View File

@ -15,6 +15,11 @@ type Stats struct {
TopClients []map[string]int `json:"top_clients"`
}
// LogStats struct for the Adguard log statistics JSON API corresponding model.
type LogStats struct {
}
// ToString method returns a string of the current statistics struct.
func (s *Stats) ToString() string {
return fmt.Sprintf("%d ads blocked / %d total DNS queries", s.BlockedFiltering, s.DnsQueries)