locust-cloud 1.5.6__py3-none-any.whl → 1.5.8__py3-none-any.whl

locust_cloud/__init__.py

@@ -21,6 +21,7 @@ PG_PASSWORD = os.environ.get("PG_PASSWORD")
 PG_DATABASE = os.environ.get("PG_DATABASE")
 PG_PORT = os.environ.get("PG_PORT", 5432)
 GRAPH_VIEWER = os.environ.get("GRAPH_VIEWER")
+MAX_USER_COUNT = os.environ.get("MAX_USER_COUNT")
 logger = logging.getLogger(__name__)
 
 
@@ -78,9 +79,6 @@ def on_locust_init(environment: locust.env.Environment, **_args):
     if not (PG_HOST and PG_USER and PG_PASSWORD and PG_DATABASE and PG_PORT):
         return
 
-    if GRAPH_VIEWER:
-        environment.web_ui.template_args["isGraphViewer"] = True
-
     try:
         pool = create_connection_pool(
             pg_user=PG_USER,
@@ -99,5 +97,10 @@ def on_locust_init(environment: locust.env.Environment, **_args):
         Exporter(environment, pool)
 
     if environment.web_ui:
+        environment.web_ui.template_args["maxUserCount"] = MAX_USER_COUNT
+
+        if GRAPH_VIEWER:
+            environment.web_ui.template_args["isGraphViewer"] = True
+
         register_auth(environment)
         register_query(environment, pool)

locust_cloud/timescale/queries.py

@@ -140,11 +140,11 @@ ORDER BY 1
 perc99_response_times = """
 SELECT time_bucket(%(resolution)s * interval '1 second', bucket) AS time,
   name,
-  perc99
+  MAX(perc99) as perc99
 FROM requests_summary
 WHERE bucket BETWEEN %(start)s AND %(end)s
 AND run_id = %(testrun)s
-GROUP BY 1, name, perc99
+GROUP BY 1, name
 ORDER BY 1
 """
 
@@ -152,11 +152,12 @@ ORDER BY 1
 response_length = """
 SELECT
     time_bucket(%(resolution)s * interval '1 second', bucket) as time,
-    response_length as "responseLength",
+    AVG(response_length) as "responseLength",
     name
 FROM requests_summary
 WHERE bucket BETWEEN %(start)s AND %(end)s
 AND run_id = %(testrun)s
+GROUP BY 1, name
 ORDER BY 1
 """