feat: export bad ip count per jail

Update exported metrics to spit the number of bad IPs per jail using metric
value labels. This includes a change to the database code to use a
different query that groups the count by the `jail` column.
This commit is contained in:
Hector
2021-02-06 12:12:01 +00:00
parent 0b40e5de82
commit 4b965017d2
2 changed files with 41 additions and 22 deletions

View File

@ -3,10 +3,9 @@ package db
import (
"database/sql"
"log"
"strconv"
)
const queryCountTotalBadIps = "SELECT COUNT(1) FROM bips"
const queryBadIpsPerJail = "SELECT jail, COUNT(1) FROM bips GROUP BY jail"
type Fail2BanDB struct {
DatabasePath string
@ -24,22 +23,37 @@ func MustConnectToDb(databasePath string) *Fail2BanDB {
}
}
func (db *Fail2BanDB) CountTotalBadIps() (int, error) {
stmt, err := db.sqliteDB.Prepare(queryCountTotalBadIps)
func (db *Fail2BanDB) CountBadIpsPerJail() (map[string]int, error) {
stmt, err := db.sqliteDB.Prepare(queryBadIpsPerJail)
defer db.mustCloseStatement(stmt)
if err != nil {
return -1, err
return nil, err
}
result := ""
err = stmt.QueryRow().Scan(&result)
jailNameToCountMap := map[string]int{}
rows, err := stmt.Query()
if err != nil {
return -1, err
return nil, err
}
if rows == nil {
return jailNameToCountMap, nil
}
return strconv.Atoi(result)
for rows.Next() {
if rows.Err() != nil {
return nil, err
}
jailName := ""
count := 0
err = rows.Scan(&jailName, &count)
if err != nil {
return nil, err
}
jailNameToCountMap[jailName] = count
}
return jailNameToCountMap, nil
}
func (db *Fail2BanDB) mustCloseStatement(stmt *sql.Stmt) {