feat: calculate admins traffic usage #935
Conversation
desc: show admin traffic usage in admin panel not system traffic usage
desc: show admin traffic usage in admin panel not system traffic usage
This reverts commit ea29eb0.
|
i had same idea for this part |
yes node usages still showing whole system traffic , i'll fix it |
Non sudo admins can't see node usage |
app/views/node.py
Outdated
| usages = crud.get_nodes_usage(db, start_date, end_date) | ||
| if not admin.is_sudo: | ||
| # get non sudo admin usage | ||
| dbadmin: Union[Admin, None] = crud.get_admin(db, admin.username) |
There was a problem hiding this comment.
/api/nodes/usage should remain same as before
we already have admin object and we don't need to get it again
also sudo admin should be able to see other admins usages
for this , is better to have separated function
There was a problem hiding this comment.
we should have different API endpoint for non sudo admin node usage ?
There was a problem hiding this comment.
different api to see admin usage by sudo admin
app/jobs/record_usages.py
Outdated
| @@ -161,6 +219,7 @@ def record_user_usages(): | |||
|
|
|||
| for node_id, params in api_params.items(): | |||
| record_user_stats(params, node_id, usage_coefficient[node_id]) | |||
| record_admin_stats(params, node_id, usage_coefficient[node_id]) | |||
There was a problem hiding this comment.
separate record_admin_stats and record_user_stats , they both use DISABLE_RECORDING_NODE_USAGE variable
There was a problem hiding this comment.
i think its a general variable it is also used in record_node_usages()
There was a problem hiding this comment.
yeap it is and it's better to become separated for each one
app/jobs/record_usages.py
Outdated
| @@ -76,6 +76,64 @@ def record_user_stats(params: list, node_id: Union[int, None], | |||
| NodeUserUsage.created_at == created_at)) | |||
| safe_execute(db, stmt, params) | |||
|
|
|||
| def record_admin_stats(params: list, node_id: Union[int, None], | |||
| consumption_factor: int = 1): | |||
There was a problem hiding this comment.
it's usage_coefficient not consumption_factor
|
In my opinion, the table user_usage_logs with the new columns used_traffic_on_delete and admin_id can be used for More details on this issue: |
|
یه حرکتی بزنید |
بررسی کردم ایشو رو بنظر اوکیه احتمالا برای محاسبه مصرف نود ادمین هم بشه کار مشابه روی جدول node_user_uasage انجام داد و اینکه تست کردید جواب نمیداد چون مرج نشده pr |
|
ممنون امید جان، ۱.فیلد های admin_id و used_traffic_on_delete و deleted_user_id رو به تیبل node_user_usages اضافه کنیم ۲.فیلد admin_id به تیبل node_user_usages اضافه بشه و یه تیبل جدید node_user_usage_logs اضافه بشه که وقتی کاربر پاک شد اطلاعات node_user_usages مربوط به کاربر در یک ریکورد اونجا ذخیره بشه که میتونه دارای node_id و used_traffic و user_id و deleted_at و admin_id باشه ۳.فیلد admin_id به تیبل node_user_usages اضافه بشه و cascade رو از ریلیشن تیبل node_user_usages با تیبل users برداشته بشه یعنی cascade رو از اینجا پاک کنیم Line 41 in 16ed7ec و موقع گرفتن اطلاعات مربوط به مصرف کاربران ادمین از نود اگر ادمین غیر sudo هست میتوان بر اساس ایدی ادمین غیر sudo اطلاعات لازم رو دریافت کرد و نمایش داد. اگر کمکی از دست من برمیاد بگین |
|
یه حرکتی بزنید |
|
درسته |
ممنون امید جان، بازم شما یه حرکتی زدی تشکر میکنم. |
|
نه |
|
ممنون امید جان، پس چرا مرج نمیشه؟ |
desc: show admin traffic usage in admin panel not system traffic usage for non sudoers admins