From e511c0c61cba0cb5eddd74e3d62765fe5c453aaf Mon Sep 17 00:00:00 2001 From: qiangyanwen <508737091@qq.com> Date: Sun, 29 May 2022 18:33:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/sys_monitor_api.py | 16 +++- logs/automation_info.log | 164 +++++++++++++++++++++++++++++++++++++++ utils/mem.py | 20 +++-- 3 files changed, 192 insertions(+), 8 deletions(-) diff --git a/api/sys_monitor_api.py b/api/sys_monitor_api.py index d8678e9..678985e 100644 --- a/api/sys_monitor_api.py +++ b/api/sys_monitor_api.py @@ -5,17 +5,27 @@ # @File :sys_monitor_api.py from fastapi import APIRouter, Body, Depends, Query -from utils.mem import get_disk_info,get_sys_info +from utils.mem import get_disk_info, get_sys_info, get_cpu_info, ge_mem_info from utils.response import success_200 router = APIRouter(prefix="/api", tags=["系统模块"]) @router.get("/sys/disk", summary="获取磁盘信息", name="获取磁盘信息") -def get_disk(): +async def get_disk(): return success_200(data=get_disk_info(), message="查询磁盘信息成功") @router.get("/sys/info", summary="获取系统信息", name="获取系统信息") -def get_sys(): +async def get_sys(): return success_200(data=get_sys_info(), message="查询系统信息成功") + + +@router.get("/sys/cpu", summary="获取cpu信息", name="获取cpu信息") +def get_cpu(): + return success_200(data=get_cpu_info(), message="查询cpu信息成功") + + +@router.get("/sys/memory", summary="获取内存信息", name="获取内存信息") +def get_mem(): + return success_200(data=ge_mem_info(), message="查询内存信息成功") diff --git a/logs/automation_info.log b/logs/automation_info.log index aa07f83..281c683 100644 --- a/logs/automation_info.log +++ b/logs/automation_info.log @@ -1209,3 +1209,167 @@ 2022-05-29 15:38:05 | MainThread:8665282048 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 2022-05-29 15:38:05 | MainThread:8665282048 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs 2022-05-29 15:38:05 | MainThread:8665282048 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:22:20 | MainThread:8598574592 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 18:22:20 | MainThread:8598574592 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:22:20 | MainThread:8598574592 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:24:55 | MainThread:8597386752 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 18:24:55 | MainThread:8597386752 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:24:56 | MainThread:8597386752 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:26:45 | MainThread:8669566464 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 18:26:45 | MainThread:8669566464 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:26:46 | MainThread:8669566464 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:27:17 | MainThread:8591693312 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 18:27:17 | MainThread:8591693312 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 18:27:48 | MainThread:8626894336 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 18:27:48 | MainThread:8626894336 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 18:28:24 | MainThread:8664888832 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 18:28:24 | MainThread:8664888832 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:28:25 | MainThread:8664888832 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:30:48 | MainThread:8602080768 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 18:30:48 | MainThread:8602080768 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:30:48 | MainThread:8602080768 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:31:38 | MainThread:8603231744 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 18:31:38 | MainThread:8603231744 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:31:38 | MainThread:8603231744 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:31:53 | MainThread:8638457344 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 18:31:53 | MainThread:8638457344 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:31:53 | MainThread:8638457344 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:32:18 | MainThread:8604694016 | :__init__:16 - INFO - start the automation service development environment +2022-05-29 18:32:18 | MainThread:8604694016 | :__init__:22 - INFO - loading environment configuration file +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:15 - INFO - loading application configuration +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:16 - INFO - create FastApi app object +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:25 - INFO - Adding a New route success +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:26 - INFO - Start registering middleware +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:36 - INFO - Application started successfully:CORSMiddleware +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:37 - INFO - Server address http://192.168.1.107:8000 +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:38 - INFO - Api doc address http://192.168.1.107:8000/docs +2022-05-29 18:32:19 | MainThread:8604694016 | create_app:app:39 - INFO - Api redoc address http://192.168.1.107:8000/redoc diff --git a/utils/mem.py b/utils/mem.py index 00fc100..dcb7930 100644 --- a/utils/mem.py +++ b/utils/mem.py @@ -31,11 +31,13 @@ def get_cpu_info(): 获取cpu信息 """ # 查看cpu物理个数的信息 - print(u"物理CPU个数: %s" % psutil.cpu_count(logical=False)) + # print(u"物理CPU个数: %s" % psutil.cpu_count(logical=False)) + cpu_count = psutil.cpu_count(logical=False) # cpu的使用率 cpu = (str(psutil.cpu_percent(1))) + '%' cp = "cup使用率: %s" % cpu - return cp + cpu_info={"cpu_count":cpu_count,"cpu_usage":cpu} + return cpu_info def bytes2human(n): @@ -65,9 +67,17 @@ def ge_mem_info(): free_memory = bytes2human(virtual_memory.free) aval_memory = bytes2human(virtual_memory.available) memory_percent = virtual_memory.percent - memory_info = "总共内存：%s, 可用内存：%s, 内存使用：%s，使用率%0.1f%%，剩余内存：%s" % ( - virtual_memory_count, aval_memory, used_memory, memory_percent, free_memory) - return memory_info + # memory_info = "总共内存：%s, 可用内存：%s, 内存使用：%s，使用率%0.1f%%，剩余内存：%s" % ( + # virtual_memory_count, aval_memory, used_memory, memory_percent, free_memory) + mem_info={ + "total_memory": virtual_memory_count, + "aval_memory":aval_memory, + "memory_usage":used_memory, + "memory_percent":memory_percent, + "free_memory":free_memory + + } + return mem_info def get_disk_info():