From 4596e6c0f13412fd6e979ce03979eb4eee8899c8 Mon Sep 17 00:00:00 2001
From: Sean Eagan <sean.eagan@att.com>
Date: Wed, 21 Aug 2019 11:25:20 -0500
Subject: [PATCH] Don't log metrics HTTP data

The metrics endpoint can be scraped frequently and produces a large
response body, hence this turns off logging of this data to prevent
the drowning out of other more salient logging.

Change-Id: I399480726ae39963b010bf5b054ce26d73fb28c5
---
 armada/api/__init__.py   | 1 +
 armada/api/middleware.py | 4 ++--
 armada/api/server.py     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/armada/api/__init__.py b/armada/api/__init__.py
index 527f8949..f7afe9c9 100644
--- a/armada/api/__init__.py
+++ b/armada/api/__init__.py
@@ -27,6 +27,7 @@ from armada.handlers.tiller import Tiller
 CONF = cfg.CONF
 
 HEALTH_PATH = 'health'
+METRICS_PATH = 'metrics'
 
 
 class BaseResource(object):
diff --git a/armada/api/middleware.py b/armada/api/middleware.py
index 499d9d77..bfdf03f3 100644
--- a/armada/api/middleware.py
+++ b/armada/api/middleware.py
@@ -18,7 +18,7 @@ from uuid import UUID
 from oslo_config import cfg
 from oslo_log import log as logging
 
-from armada.api import HEALTH_PATH
+from armada.api import HEALTH_PATH, METRICS_PATH
 
 CONF = cfg.CONF
 
@@ -107,7 +107,7 @@ class LoggingMiddleware(object):
     hdr_exclude = re.compile('x-.*', re.IGNORECASE)
 
     # don't log anything for health checks
-    path_exclude = re.compile('.*/{}$'.format(HEALTH_PATH))
+    path_exclude = re.compile('.*/({}|{})$'.format(HEALTH_PATH, METRICS_PATH))
 
     def exclude_path(self, req):
         return LoggingMiddleware.path_exclude.match(req.path)
diff --git a/armada/api/server.py b/armada/api/server.py
index ccc48149..34f80228 100644
--- a/armada/api/server.py
+++ b/armada/api/server.py
@@ -18,7 +18,7 @@ from oslo_policy import policy
 from oslo_log import log as logging
 
 from armada import conf
-from armada.api import ArmadaRequest, HEALTH_PATH
+from armada.api import ArmadaRequest, HEALTH_PATH, METRICS_PATH
 from armada.api.controller.armada import Apply
 from armada.api.middleware import AuthMiddleware
 from armada.api.middleware import ContextMiddleware
@@ -69,7 +69,7 @@ def create(enable_middleware=CONF.middleware):
         ('tests', TestReleasesManifestController()),
         ('test/{release}', TestReleasesReleaseNameController()),
         ('validatedesign', Validate()),
-        ('metrics', Metrics()),
+        (METRICS_PATH, Metrics()),
     ]
 
     for route, service in url_routes_v1: