소스 검색

HUE-9194 [useradmin] Set active_users_per_instance callback correctly

Romain 5 년 전
부모
커밋
cb224696c0
3개의 변경된 파일12개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      apps/useradmin/src/useradmin/metrics.py
  2. 4 3
      apps/useradmin/src/useradmin/tests.py
  3. 7 1
      desktop/core/src/desktop/lib/metrics/views.py

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

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

+ 4 - 3
apps/useradmin/src/useradmin/tests.py

@@ -333,10 +333,11 @@ class TestUserAdminMetrics(BaseUserAdminTests):
       assert_equal(2, active_users_per_instance())
 
       c = Client()
-      response = c.get('/desktop/metrics/', dict(format='json'))
+      response = c.get('/desktop/metrics/', {'format': 'json'})
+
       metric = json.loads(response.content)['metric']
-      assert_equal(3, metric['users.active'])
-      assert_equal(2, metric['users.active.instance'])
+      assert_equal(3, metric['users.active']['value'])
+      assert_equal(2, metric['users.active.instance']['value'])
 
 
 class TestUserAdmin(BaseUserAdminTests):

+ 7 - 1
desktop/core/src/desktop/lib/metrics/views.py

@@ -44,4 +44,10 @@ def index(request):
   if request.is_ajax() or request.GET.get("format") == "json":
     return JsonResponse(rep, json_dumps_params={'indent': indent})
   else:
-    return render("metrics.mako", request, {'metrics': json.dumps(rep['metric']), 'is_embeddable': request.GET.get('is_embeddable', False)})
+    return render(
+        "metrics.mako",
+        request, {
+          'metrics': json.dumps(rep['metric']),
+          'is_embeddable': request.GET.get('is_embeddable', False)
+        }
+    )