瀏覽代碼

HUE-9210 [useradmin] Display number of local active users in Cloudera Manager

Ying Chen 5 年之前
父節點
當前提交
4233118951
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 3 3
      apps/useradmin/src/useradmin/metrics.py
  2. 2 2
      apps/useradmin/src/useradmin/tests.py

+ 3 - 3
apps/useradmin/src/useradmin/metrics.py

@@ -38,10 +38,10 @@ def active_users():
   return count
   return count
 
 
 global_registry().gauge_callback(
 global_registry().gauge_callback(
-    name='users.active',
+    name='users.active.total',
     callback=active_users,
     callback=active_users,
     label='Active Users',
     label='Active Users',
-    description='Number of users that were active in the last hour',
+    description='Number of users that were active in the last hour in all instances',
     numerator='users',
     numerator='users',
 )
 )
 
 
@@ -58,7 +58,7 @@ def active_users_per_instance():
   return count
   return count
 
 
 global_registry().gauge_callback(
 global_registry().gauge_callback(
-    name='users.active.instance',
+    name='users.active',
     callback=active_users_per_instance,
     callback=active_users_per_instance,
     label='Active Users per Instance',
     label='Active Users per Instance',
     description='Number of users that were active in the last hour on specific instance',
     description='Number of users that were active in the last hour on specific instance',

+ 2 - 2
apps/useradmin/src/useradmin/tests.py

@@ -361,8 +361,8 @@ class TestUserAdminMetrics(BaseUserAdminTests):
       response = c.get('/desktop/metrics/', {'format': 'json'})
       response = c.get('/desktop/metrics/', {'format': 'json'})
 
 
       metric = json.loads(response.content)['metric']
       metric = json.loads(response.content)['metric']
-      assert_equal(3, metric['users.active']['value'])
-      assert_equal(2, metric['users.active.instance']['value'])
+      assert_equal(3, metric['users.active.total']['value'])
+      assert_equal(2, metric['users.active']['value'])
 
 
 
 
   @override_settings(AUTHENTICATION_BACKENDS=['desktop.auth.backend.AllowFirstUserDjangoBackend'])
   @override_settings(AUTHENTICATION_BACKENDS=['desktop.auth.backend.AllowFirstUserDjangoBackend'])