diff --git a/config/filter.d/grafana.conf b/config/filter.d/grafana.conf
index 78ded075..e7f0f420 100644
--- a/config/filter.d/grafana.conf
+++ b/config/filter.d/grafana.conf
@@ -6,4 +6,4 @@
 datepattern = ^t=%%Y-%%m-%%dT%%H:%%M:%%S%%z
 
 [Definition]
-failregex = ^.*msg="Invalid username or password".* remote_addr=<ADDR>$
+failregex = ^(?: lvl=err?or)? msg="Invalid username or password"(?: uname=(?:"<F-ALT_USER>[^"]+</F-ALT_USER>"|<F-USER>\S+</F-USER>)| error="<F-ERROR>[^"]+</F-ERROR>"| \S+=(?:\S*|"[^"]+"))* remote_addr=<ADDR>$