From 822804ede016eb38d9bcb37e75437fbc44554e39 Mon Sep 17 00:00:00 2001
From: Hector <hector@hjs.dev>
Date: Mon, 31 Jan 2022 22:20:45 +0000
Subject: [PATCH 1/3] fix: use correct flag in dockerfile
Update the Dockerfile entrypoint script to use the correct version flag
syntax. The flag now requires two dashes instead of one.
---
docker/run.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docker/run.sh b/docker/run.sh
index 36ade9e..aca013b 100644
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -1,7 +1,7 @@
#/bin/sh
# Print version to logs for debugging purposes
-/app/fail2ban-prometheus-exporter -version
+/app/fail2ban-prometheus-exporter --version
socket_path=/var/run/fail2ban/fail2ban.sock
textfile_dir=/app/textfile/
From 1321aa92aa442d761eaf16fd54af1e4df67dd557 Mon Sep 17 00:00:00 2001
From: Hector <hector@hjs.dev>
Date: Mon, 31 Jan 2022 22:31:04 +0000
Subject: [PATCH 2/3] fix order of variable assignment
---
src/cfg/cfg.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/cfg/cfg.go b/src/cfg/cfg.go
index c71b360..76ad918 100644
--- a/src/cfg/cfg.go
+++ b/src/cfg/cfg.go
@@ -81,6 +81,8 @@ func readParamsFromCli(settings *AppSettings) {
Envar(basicAuthPassEnvName).
String()
+ kingpin.Parse()
+
settings.VersionMode = *versionMode
settings.MetricsPort = *port
settings.MetricsAddress = *address
@@ -88,8 +90,6 @@ func readParamsFromCli(settings *AppSettings) {
settings.FileCollectorEnabled = *fileCollectorEnabled
settings.FileCollectorPath = *fileCollectorPath
settings.setBasicAuthValues(*rawBasicAuthUsername, *rawBasicAuthPassword)
-
- kingpin.Parse()
}
func (settings *AppSettings) setBasicAuthValues(rawUsername, rawPassword string) {
From 86d36221c23cb77f2c6171643de674c8f7d710ee Mon Sep 17 00:00:00 2001
From: Hector <hector@hjs.dev>
Date: Mon, 31 Jan 2022 22:37:38 +0000
Subject: [PATCH 3/3] fix docker run file to use correct flags
---
docker/run.sh | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/docker/run.sh b/docker/run.sh
index aca013b..4fe96f0 100644
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -7,14 +7,15 @@ socket_path=/var/run/fail2ban/fail2ban.sock
textfile_dir=/app/textfile/
textfile_enabled=false
-# Enable textfile metrics if the folder exists (i.e. was mounted by docker)
-if [ -d $textfile_dir ]; then
- textfile_enabled=true
-fi
-
# Start the exporter (use exec to support graceful shutdown)
# Inspired by: https://akomljen.com/stopping-docker-containers-gracefully/
-exec /app/fail2ban-prometheus-exporter \
- --socket "$socket_path" \
- --collector.textfile=$textfile_enabled \
- --collector.textfile.directory="$textfile_dir"
+# Enable textfile metrics if the folder exists (i.e. was mounted by docker)
+if [ -d $textfile_dir ]; then
+ exec /app/fail2ban-prometheus-exporter \
+ --socket "$socket_path" \
+ --collector.textfile \
+ --collector.textfile.directory "$textfile_dir"
+else
+ exec /app/fail2ban-prometheus-exporter \
+ --socket "$socket_path"
+fi