include initiator user id in metric for ks auth req

Author: auhlig

watcher/common.py

@@ -222,8 +222,11 @@ def string_to_bool(possible_bool_string):
     """
     if isinstance(possible_bool_string, bool):
         return possible_bool_string
-    if isinstance(possible_bool_string, six.text_type):
-        return str(possible_bool_string).lower() == 'true'
+    if isinstance(possible_bool_string, (str, six.text_type)):
+        return str(possible_bool_string) \
+            .replace("'", "", -1) \
+            .replace('"', '', -1) \
+            .lower() == 'true'
     return False
 
 
@@ -234,7 +237,7 @@ def load_json_dict(json_body):
     :param json_body: the json body of a request might be string, unicode or dict
     :return: the json body as a dictionary
     """
-    if isinstance(json_body, six.text_type):
+    if isinstance(json_body, (str, six.text_type)):
         json_body = json.loads(json_body)
     if isinstance(json_body, dict):
         return json_body

watcher/tests/test_common.py

@@ -117,6 +117,52 @@ def test_is_content_json(self):
                 "should be '{0}' but got '{1}'".format(expected, actual)
             )
 
+    def test_string_to_bool(self):
+        stimuli = [
+            {
+                'input': u'True',
+                'expected': True
+            },
+            {
+                'input': u'False',
+                'expected': False
+            },
+            {
+                'input': 'True',
+                'expected': True
+            },
+            {
+                'input': "True",
+                'expected': True
+            },
+            {
+                'input': 'False',
+                'expected': False
+            },
+            {
+                'input': True,
+                'expected': True
+            },
+            {
+                'input': False,
+                'expected': False
+            },
+            {
+                'input': "foobar",
+                'expected': False
+            }
+        ]
+
+        for s in stimuli:
+            input = s.get('input')
+            expected = s.get('expected')
+            actual = common.string_to_bool(input)
+
+            self.assertEqual(
+                actual,
+                expected,
+                "bool of '{0}' should be '{1}' but got '{2}'".format(repr(input), expected, actual)
+            )
 
 
 if __name__ == '__main__':

watcher/watcher.py

@@ -49,9 +49,26 @@ def __init__(self, app, config, logger=logging.getLogger(__name__)):
         self.cadf_service_name = self.wsgi_config.get('cadf_service_name', None)
         self.service_type = self.wsgi_config.get('service_type', taxonomy.UNKNOWN)
         # get the project uid from the request path or from the token (default)
-        self.is_project_id_from_path = common.string_to_bool(self.wsgi_config.get('target_project_id_from_path', 'False'))
+        self.is_project_id_from_path = common.string_to_bool(
+            self.wsgi_config.get('target_project_id_from_path', 'False')
+        )
+        # get the project id from the service catalog (see documentation on keystone auth_token middleware)
         self.is_project_id_from_service_catalog = common.string_to_bool(
-            self.wsgi_config.get('target_project_id_from_service_catalog', 'False'))
+            self.wsgi_config.get('target_project_id_from_service_catalog', 'False')
+        )
+
+        # whether to include the target project id in the metrics
+        self.is_include_target_project_id_in_metric = common.string_to_bool(
+            self.wsgi_config.get('include_target_project_id_in_metric', 'True')
+        )
+        # whether to include the target domain id in the metrics
+        self.is_include_target_domain_id_in_metric = common.string_to_bool(
+            self.wsgi_config.get('include_target_domain_id_in_metric', 'True')
+        )
+        # whether to include the initiator user id for authentication request in the metrics
+        self.is_include_authentication_initiator_user_id_in_metric = common.string_to_bool(
+            self.wsgi_config.get('include_authentication_initiator_user_id_in_metric', 'True')
+        )
 
         config_file_path = config.get('config_file', None)
         if config_file_path:
@@ -163,10 +180,21 @@ def __call__(self, environ, start_response):
             "action:{0}".format(cadf_action),
             "initiator_project_id:{0}".format(initiator_project_id),
             "initiator_domain_id:{0}".format(initiator_domain_id),
-            "target_project_id:{0}".format(target_project_id),
             "target_type_uri:{0}".format(target_type_uri),
         ]
 
+        # include the target project id in metric
+        if self.is_include_target_project_id_in_metric:
+            labels.append(
+                "target_project_id:{0}".format(target_project_id)
+            )
+
+        # if authentication request: include initiator user id
+        if cadf_action == taxonomy.ACTION_AUTHENTICATE and self.is_include_authentication_initiator_user_id_in_metric:
+            labels.append(
+                "initiator_user_id:{0}".format(initiator_user_id)
+            )
+
         # if swift request: determine target.container_id based on request path
         if common.is_swift_request(req.path) or self.service_type == 'object-store':
             _, target_container_id = self.get_target_account_container_id_from_request(req)
@@ -330,7 +358,7 @@ def get_project_domain_and_user_id_from_keystone_authentication_request(self, re
         """
         project_id = domain_id = user_id = taxonomy.UNKNOWN
         try:
-            if not req.json_body:
+            if not req.json:
                 return
 
             json_body_dict = common.load_json_dict(req.json)