From 623c1d564b88293ed1712d185b529f16c9c1bfb5 Mon Sep 17 00:00:00 2001 From: Sean Fellows Date: Wed, 7 Feb 2018 12:19:55 -0800 Subject: [PATCH 1/2] Create audit failure metrics unconditionally --- vault/audit.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vault/audit.go b/vault/audit.go index b446d21b35e0..faa921e130cf 100644 --- a/vault/audit.go +++ b/vault/audit.go @@ -525,10 +525,11 @@ func (a *AuditBroker) LogRequest(ctx context.Context, auth *logical.Auth, req *l } ret = retErr.ErrorOrNil() - + failure := 0.0 if ret != nil { - metrics.IncrCounter([]string{"audit", "log_request_failure"}, 1.0) + failure = 1.0 } + metrics.IncrCounter([]string{"audit", "log_request_failure"}, failure) }() // All logged requests must have an identifier @@ -588,9 +589,11 @@ func (a *AuditBroker) LogResponse(ctx context.Context, auth *logical.Auth, req * ret = retErr.ErrorOrNil() + failure := 0.0 if ret != nil { - metrics.IncrCounter([]string{"audit", "log_response_failure"}, 1.0) + failure = 1.0 } + metrics.IncrCounter([]string{"audit", "log_response_failure"}, failure) }() headers := req.Headers From 1cb5727bb7457779c18101c82b3a11b60fc8d09f Mon Sep 17 00:00:00 2001 From: Sean Fellows Date: Wed, 7 Feb 2018 12:36:26 -0800 Subject: [PATCH 2/2] s/64/32 --- vault/audit.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vault/audit.go b/vault/audit.go index faa921e130cf..ad9fbf2c7290 100644 --- a/vault/audit.go +++ b/vault/audit.go @@ -525,7 +525,7 @@ func (a *AuditBroker) LogRequest(ctx context.Context, auth *logical.Auth, req *l } ret = retErr.ErrorOrNil() - failure := 0.0 + failure := float32(0.0) if ret != nil { failure = 1.0 } @@ -589,7 +589,7 @@ func (a *AuditBroker) LogResponse(ctx context.Context, auth *logical.Auth, req * ret = retErr.ErrorOrNil() - failure := 0.0 + failure := float32(0.0) if ret != nil { failure = 1.0 }