From 8d3572c0f6c9a5dcebb25af9892a081acdf4e27a Mon Sep 17 00:00:00 2001 From: wangqing Date: Fri, 28 Jan 2022 16:50:26 +0800 Subject: [PATCH 1/9] add Makefile and modify conf Signed-off-by: wangqing --- Makefile | 40 +++++++++++++++ sysom_api/requirements.txt | 70 -------------------------- sysom_api/service_scripts/sysom-python | 11 ++++ sysom_api/setup.cfg | 4 ++ sysom_api/setup.py | 17 +++++++ tools/deploy/sysom.conf | 12 ++++- tools/deploy/sysom.ini | 54 ++++++++++++++++---- 7 files changed, 126 insertions(+), 82 deletions(-) create mode 100644 Makefile delete mode 100644 sysom_api/requirements.txt create mode 100755 sysom_api/service_scripts/sysom-python create mode 100644 sysom_api/setup.cfg create mode 100644 sysom_api/setup.py diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..dc585544 --- /dev/null +++ b/Makefile @@ -0,0 +1,40 @@ +PYTHON ?= python3.7 +PYTHON_VERSION = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_version; print(get_python_version())") + +VENV_BASE ?= /var/lib/sysom/venv + +# Python packages to install only from source (not from binary wheels) +# Comma separated list +# These should be upgraded in the sysom and Ansible venv before attempting +# to install the actual requirements +VENV_BOOTSTRAP ?= pip==21.3.1 setuptools==60.5.0 wheel==0.37.1 + +NAME ?= sysom + + +virtualenv: virtualenv_sysom + +# flit is needed for offline install of certain packages, specifically ptyprocess +# it is needed for setup, but not always recognized as a setup dependency +# similar to pip, setuptools, and wheel, these are all needed here as a bootstrapping issues +virtualenv_sysom: + if [ "$(VENV_BASE)" ]; then \ + if [ ! -d "$(VENV_BASE)" ]; then \ + mkdir $(VENV_BASE); \ + fi; \ + if [ ! -d "$(VENV_BASE)/sysom" ]; then \ + $(PYTHON) -m venv $(VENV_BASE)/sysom; \ + $(VENV_BASE)/sysom/bin/pip install $(PIP_OPTIONS) $(VENV_BOOTSTRAP); \ + fi; \ + fi + +# Install third-party requirements needed for sysom's environment. +# this does not use system site packages intentionally +requirements_sysom: virtualenv_sysom + if [[ "$(PIP_OPTIONS)" == *"--no-index"* ]]; then \ + $(VENV_BASE)/sysom/bin/pip install $(PIP_OPTIONS) -r sysom_api/requirements/requirements.txt ; \ + fi + +requirements_dev: + $(VENV_BASE)/sysom/bin/pip install -r sysom_api/requirements/requirements_dev.txt + diff --git a/sysom_api/requirements.txt b/sysom_api/requirements.txt deleted file mode 100644 index ff229a81..00000000 --- a/sysom_api/requirements.txt +++ /dev/null @@ -1,70 +0,0 @@ -aioredis==1.3.1 -APScheduler==3.8.1 -asgiref==3.4.1 -async-timeout==3.0.1 -attrs==21.2.0 -autobahn==21.3.1 -Automat==20.2.0 -autopep8==1.6.0 -bcrypt==3.2.0 -cairocffi==1.3.0 -CairoSVG==2.5.2 -certifi==2021.10.8 -cffi==1.15.0 -channels==3.0.4 -channels-redis==3.3.1 -charset-normalizer==2.0.7 -constantly==15.1.0 -coreapi==2.3.3 -coreschema==0.0.4 -cryptography==35.0.0 -cssselect2==0.4.1 -daphne==3.0.2 -defusedxml==0.7.1 -Django==3.2.8 -django-cors-headers==3.10.0 -django-filter==21.1 -django-redis==5.0.0 -djangorestframework==3.12.2 -djangorestframework-jwt==1.11.0 -drf-yasg==1.20.0 -hiredis==2.0.0 -hyperlink==21.0.0 -idna==3.3 -incremental==21.3.0 -inflection==0.5.1 -install==1.3.4 -itypes==1.2.0 -Jinja2==3.0.2 -MarkupSafe==2.0.1 -msgpack==1.0.2 -packaging==21.0 -paramiko==2.8.0 -Pillow==8.4.0 -pyasn1==0.4.8 -pyasn1-modules==0.2.8 -pycodestyle==2.8.0 -pycparser==2.20 -PyJWT==1.7.1 -PyMySQL==1.0.2 -PyNaCl==1.4.0 -pyOpenSSL==21.0.0 -pyparsing==3.0.3 -pytz==2021.3 -redis==3.5.3 -requests==2.26.0 -ruamel.yaml==0.17.16 -ruamel.yaml.clib==0.2.6 -service-identity==21.1.0 -six==1.16.0 -sqlparse==0.4.2 -tinycss2==1.1.0 -toml==0.10.2 -Twisted==21.7.0 -txaio==21.2.1 -typing-extensions==3.10.0.2 -uritemplate==4.1.1 -urllib3==1.26.7 -uWSGI==2.0.19.1 -webencodings==0.5.1 -zope.interface==5.4.0 diff --git a/sysom_api/service_scripts/sysom-python b/sysom_api/service_scripts/sysom-python new file mode 100755 index 00000000..8907fcd0 --- /dev/null +++ b/sysom_api/service_scripts/sysom-python @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# Enable sysom virtualenv +for venv_path in /var/lib/sysom/venv/sysom; do + if [ -f $venv_path/bin/activate ]; then + . $venv_path/bin/activate + fi +done + +# Run the requested Python command, using the interpreter from the path +exec python3 "$@" diff --git a/sysom_api/setup.cfg b/sysom_api/setup.cfg new file mode 100644 index 00000000..8bfd5a12 --- /dev/null +++ b/sysom_api/setup.cfg @@ -0,0 +1,4 @@ +[egg_info] +tag_build = +tag_date = 0 + diff --git a/sysom_api/setup.py b/sysom_api/setup.py new file mode 100644 index 00000000..efdbd6e7 --- /dev/null +++ b/sysom_api/setup.py @@ -0,0 +1,17 @@ +#!/usr/bin/python3 +""" +Description: setup up the sysom_api +""" + +from setuptools import setup, find_packages + +setup( + name='syspm_api', + version='1.0.0', + packages=find_packages(), + author='sysom team', + data_files=[ + ('/usr/bin', ['service_scripts/sysom-python']), + ], + zip_safe=False +) diff --git a/tools/deploy/sysom.conf b/tools/deploy/sysom.conf index ffb731d3..53cce725 100644 --- a/tools/deploy/sysom.conf +++ b/tools/deploy/sysom.conf @@ -1,7 +1,15 @@ +upstream uwsgi { + server unix:/var/run/sysom/uwsgi.sock; +} + +upstream daphne { + server unix:/var/run/sysom/daphne.sock; +} + server { listen 80; server_name _; - root /home/sysom/target/sysom_web; + root /var/lib/sysom/sysom_web; index index.html; client_max_body_size 20m; @@ -29,7 +37,7 @@ server { } location /download/ { - alias /home/sysom/target/sysom_web/download/; + alias /var/lib/sysom/sysom_web/download/; autoindex on; autoindex_exact_size off; autoindex_localtime on; diff --git a/tools/deploy/sysom.ini b/tools/deploy/sysom.ini index 58e6d5cd..7769f5c2 100644 --- a/tools/deploy/sysom.ini +++ b/tools/deploy/sysom.ini @@ -1,12 +1,46 @@ -[fcgi-program:sysom] +[unix_http_server] +chown = sysom:sysom + +[supervisord] +umask = 022 +minfds = 4096 + +[program:sysom-uwsgi] +command = bash -c '/var/lib/sysom/venv/sysom/bin/uwsgi --socket /var/run/sysom/uwsgi.sock --module=sysom.wsgi:application --stats /var/lib/sysom/uwsgi.stats --chmod-socket=660 --vacuum --master --no-orphans --buffer-size=32768 --workers=16 --worker-reload-mercy=30 --harakiri=120 --max-worker-lifetime=3600 --max-requests=100000 --reload-on-rss=1024 --cheaper=4 --cheaper-algo=busyness --cheaper-initial=4 --cheaper-step=2' +directory = /var/lib/sysom +user = sysom +autostart = true +autorestart = true +stopwaitsecs = 15 +stopsignal = INT +stopasgroup = true +redirect_stderr = true +stdout_logfile = /var/log/supervisor/sysom-uwsgi.log +stdout_logfile_maxbytes = 10MB +stdout_logfile_backups = 10 + +[program:sysom-daphne] socket=tcp://localhost:7001 -directory=/home/sysom/target/sysom_api -command=/home/sysom/virtualenv/bin/daphne -u /run/daphne/daphne%(process_num)d.sock --fd 0 --access-log - --proxy-headers sysom.asgi:application -numprocs=4 -process_name=asgi%(process_num)d -autostart=true -autorestart=true -redirect_stderr=true +command = /var/lib/sysom/venv/sysom/bin/daphne -u /var/run/sysom/daphne.sock sysom.asgi:application +directory = /var/lib/sysom +user = sysom +autostart = true +autorestart = true +stopwaitsecs = 5 +redirect_stderr = true +stdout_logfile = /var/log/supervisor/sysom-daphne.log +stdout_logfile_maxbytes = 10MB +stdout_logfile_backups = 10 + +[program:sysom-rsyslogd] +command = rsyslogd -n -i /var/run/sysom-rsyslog/rsyslog.pid -f /var/lib/sysom/rsyslog/rsyslog.conf +user = sysom +autostart = true +autorestart = true +stopwaitsecs = 5 +stopsignal=TERM stopasgroup=true -stdout_logfile=/home/sysom/logs/supervisor.log -environment=PATH="/home/sysom/virtualenv/bin" +killasgroup=true +redirect_stderr=true +stdout_logfile=/var/log/supervisor/sysom-rsyslog.log +stdout_logfile_maxbytes=0 -- Gitee From fe59bb1b2ccd506e4477728788c5f9124df04c91 Mon Sep 17 00:00:00 2001 From: wangqing Date: Fri, 28 Jan 2022 17:15:04 +0800 Subject: [PATCH 2/9] add sysom_api/requirements/ Signed-off-by: wangqing --- sysom_api/requirements/requirements.txt | 70 +++++++++++++++++++++ sysom_api/requirements/requirements_dev.txt | 70 +++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 sysom_api/requirements/requirements.txt create mode 100644 sysom_api/requirements/requirements_dev.txt diff --git a/sysom_api/requirements/requirements.txt b/sysom_api/requirements/requirements.txt new file mode 100644 index 00000000..a6758a8d --- /dev/null +++ b/sysom_api/requirements/requirements.txt @@ -0,0 +1,70 @@ +APScheduler==3.8.1 +aioredis==1.3.1 +asgiref==3.4.1 +async-timeout==3.0.1 +attrs==21.2.0 +autobahn==21.2.1 +Automat==20.2.0 +autopep8==1.6.0 +cffi==1.15.0 +cairocffi==1.2.0 +bcrypt==3.2.0 +CairoSVG==2.5.2 +certifi==2021.10.8 +channels==3.0.4 +channels-redis==3.3.1 +charset-normalizer==2.0.7 +constantly==15.1.0 +coreapi==2.3.3 +coreschema==0.0.4 +cryptography<3.4.0 +cssselect2==0.4.1 +daphne==3.0.2 +defusedxml==0.7.1 +Django==3.2.8 +django-cors-headers==3.10.0 +django-filter==21.1 +django-redis==5.0.0 +djangorestframework==3.12.2 +djangorestframework-jwt==1.11.0 +drf-yasg==1.20.0 +hiredis==2.0.0 +hyperlink==21.0.0 +idna==3.3 +incremental==21.3.0 +inflection==0.5.1 +install==1.3.4 +itypes==1.2.0 +Jinja2==3.0.2 +MarkupSafe==2.0.1 +msgpack==1.0.2 +packaging==21.0 +paramiko==2.8.0 +Pillow==8.4.0 +pyasn1==0.4.8 +pyasn1-modules==0.2.8 +pycodestyle==2.8.0 +pycparser==2.20 +PyJWT==1.7.1 +PyMySQL==1.0.2 +PyNaCl==1.4.0 +pyOpenSSL==21.0.0 +pyparsing==3.0.3 +pytz==2021.3 +redis==3.5.3 +requests==2.26.0 +ruamel.yaml==0.17.16 +ruamel.yaml.clib==0.2.6 +service-identity==21.1.0 +six==1.16.0 +sqlparse==0.4.2 +tinycss2==1.1.0 +toml==0.10.2 +Twisted==21.7.0 +txaio==21.2.1 +typing-extensions==3.10.0.2 +uritemplate==4.1.1 +urllib3==1.26.7 +uWSGI==2.0.19.1 +webencodings==0.5.1 +zope.interface==5.4.0 diff --git a/sysom_api/requirements/requirements_dev.txt b/sysom_api/requirements/requirements_dev.txt new file mode 100644 index 00000000..ff229a81 --- /dev/null +++ b/sysom_api/requirements/requirements_dev.txt @@ -0,0 +1,70 @@ +aioredis==1.3.1 +APScheduler==3.8.1 +asgiref==3.4.1 +async-timeout==3.0.1 +attrs==21.2.0 +autobahn==21.3.1 +Automat==20.2.0 +autopep8==1.6.0 +bcrypt==3.2.0 +cairocffi==1.3.0 +CairoSVG==2.5.2 +certifi==2021.10.8 +cffi==1.15.0 +channels==3.0.4 +channels-redis==3.3.1 +charset-normalizer==2.0.7 +constantly==15.1.0 +coreapi==2.3.3 +coreschema==0.0.4 +cryptography==35.0.0 +cssselect2==0.4.1 +daphne==3.0.2 +defusedxml==0.7.1 +Django==3.2.8 +django-cors-headers==3.10.0 +django-filter==21.1 +django-redis==5.0.0 +djangorestframework==3.12.2 +djangorestframework-jwt==1.11.0 +drf-yasg==1.20.0 +hiredis==2.0.0 +hyperlink==21.0.0 +idna==3.3 +incremental==21.3.0 +inflection==0.5.1 +install==1.3.4 +itypes==1.2.0 +Jinja2==3.0.2 +MarkupSafe==2.0.1 +msgpack==1.0.2 +packaging==21.0 +paramiko==2.8.0 +Pillow==8.4.0 +pyasn1==0.4.8 +pyasn1-modules==0.2.8 +pycodestyle==2.8.0 +pycparser==2.20 +PyJWT==1.7.1 +PyMySQL==1.0.2 +PyNaCl==1.4.0 +pyOpenSSL==21.0.0 +pyparsing==3.0.3 +pytz==2021.3 +redis==3.5.3 +requests==2.26.0 +ruamel.yaml==0.17.16 +ruamel.yaml.clib==0.2.6 +service-identity==21.1.0 +six==1.16.0 +sqlparse==0.4.2 +tinycss2==1.1.0 +toml==0.10.2 +Twisted==21.7.0 +txaio==21.2.1 +typing-extensions==3.10.0.2 +uritemplate==4.1.1 +urllib3==1.26.7 +uWSGI==2.0.19.1 +webencodings==0.5.1 +zope.interface==5.4.0 -- Gitee From 7b75af459f16b61616693a391663445cd9eb84e2 Mon Sep 17 00:00:00 2001 From: wangqing Date: Sat, 29 Jan 2022 13:41:26 +0800 Subject: [PATCH 3/9] modify Makefile Signed-off-by: wangqing --- Makefile | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index dc585544..b9ac6eb2 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,74 @@ -PYTHON ?= python3.7 -PYTHON_VERSION = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_version; print(get_python_version())") +# python venv global variable +# start: -------------------------------------- -VENV_BASE ?= /var/lib/sysom/venv +PYTHON ?= python3.7 +PYTHON_VERSION = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_version; print(get_python_version())") + +VERSION := $(shell $(PYTHON) sysom_api/setup.py --version) +NAME ?= sysom + +SDIST_TAR_NAME = $(NAME)-$(VERSION) +SDIST_TAR_FILE ?= $(SDIST_TAR_NAME).tar.gz + +VENV_BASE ?= /var/lib/sysom/venv # Python packages to install only from source (not from binary wheels) # Comma separated list # These should be upgraded in the sysom and Ansible venv before attempting # to install the actual requirements -VENV_BOOTSTRAP ?= pip==21.3.1 setuptools==60.5.0 wheel==0.37.1 +VENV_BOOTSTRAP ?= pip==21.3.1 setuptools==60.5.0 wheel==0.37.1 + +# end: -------------------------------------- + +# sysom web global variable +# start: -------------------------------------- + +NODE_VERSION ?= v16.13.2 +THIRD_PARTY ?= 3rdparty +ifeq ($(shell uname -m), x86_64) + DISTRO = linux-x64 +else ifeq ($(shell uname -m), aarch64) + DISTRO = linux-arm64 +endif + +PATH := $(THIRD_PARTY)/node-$(NODE_VERSION)-$(DISTRO)/bin:$(PATH) +SHELL := env PATH=$(PATH) /bin/bash + +# end: -------------------------------------- + +clean-nodejs: + rm -rf $(THIRD_PARTY) + rm -f node-$(NODE_VERSION)-$(DISTRO).tar.xz -NAME ?= sysom +clean-web: + rm -rf sysom_web/node_modules +clean: clean-nodejs clean-web + +# sysom web +# start: -------------------------------------- + +install_nodejs: + @echo install nodejs + if [ "$(THIRD_PARTY)" ]; then \ + if [ ! -d "$(THIRD_PARTY)" ]; then \ + mkdir $(THIRD_PARTY); \ + fi; \ + wget https://npmmirror.com/mirrors/node/$(NODE_VERSION)/node-$(NODE_VERSION)-$(DISTRO).tar.xz ; \ + tar -xf node-$(NODE_VERSION)-$(DISTRO).tar.xz -C $(THIRD_PARTY) ; \ + fi + +build_web: install_nodejs + @echo build web + npm config set registry 'https://registry.npmmirror.com' ; + npm install --global yarn ; + yarn --cwd sysom_web install ; + yarn --cwd sysom_web build + +# end: -------------------------------------- + +# sysom web +# start: -------------------------------------- virtualenv: virtualenv_sysom @@ -38,3 +96,5 @@ requirements_sysom: virtualenv_sysom requirements_dev: $(VENV_BASE)/sysom/bin/pip install -r sysom_api/requirements/requirements_dev.txt +# end: -------------------------------------- + -- Gitee From 5e60aab680d465885347a9f6c3336469ee2a504f Mon Sep 17 00:00:00 2001 From: wangqing Date: Sat, 29 Jan 2022 16:11:40 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20PATH=20=E4=B8=BA?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangqing --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b9ac6eb2..a33b7ecb 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ else ifeq ($(shell uname -m), aarch64) DISTRO = linux-arm64 endif -PATH := $(THIRD_PARTY)/node-$(NODE_VERSION)-$(DISTRO)/bin:$(PATH) +PATH := $(shell realpath $(THIRD_PARTY))/node-$(NODE_VERSION)-$(DISTRO)/bin:$(PATH) SHELL := env PATH=$(PATH) /bin/bash # end: -------------------------------------- -- Gitee From 588d0ad378b72d1daca959688d7051a86a9e1959 Mon Sep 17 00:00:00 2001 From: wangqing Date: Tue, 8 Feb 2022 14:20:39 +0800 Subject: [PATCH 5/9] modify sysom conf Signed-off-by: wangqing --- tools/deploy/sysom.conf | 6 +----- tools/deploy/sysom.ini | 23 ++++++----------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/tools/deploy/sysom.conf b/tools/deploy/sysom.conf index 53cce725..5895d4be 100644 --- a/tools/deploy/sysom.conf +++ b/tools/deploy/sysom.conf @@ -1,7 +1,3 @@ -upstream uwsgi { - server unix:/var/run/sysom/uwsgi.sock; -} - upstream daphne { server unix:/var/run/sysom/daphne.sock; } @@ -9,7 +5,7 @@ upstream daphne { server { listen 80; server_name _; - root /var/lib/sysom/sysom_web; + root /var/lib/sysom/ui; index index.html; client_max_body_size 20m; diff --git a/tools/deploy/sysom.ini b/tools/deploy/sysom.ini index 7769f5c2..370b25d2 100644 --- a/tools/deploy/sysom.ini +++ b/tools/deploy/sysom.ini @@ -5,31 +5,20 @@ chown = sysom:sysom umask = 022 minfds = 4096 -[program:sysom-uwsgi] -command = bash -c '/var/lib/sysom/venv/sysom/bin/uwsgi --socket /var/run/sysom/uwsgi.sock --module=sysom.wsgi:application --stats /var/lib/sysom/uwsgi.stats --chmod-socket=660 --vacuum --master --no-orphans --buffer-size=32768 --workers=16 --worker-reload-mercy=30 --harakiri=120 --max-worker-lifetime=3600 --max-requests=100000 --reload-on-rss=1024 --cheaper=4 --cheaper-algo=busyness --cheaper-initial=4 --cheaper-step=2' -directory = /var/lib/sysom -user = sysom -autostart = true -autorestart = true -stopwaitsecs = 15 -stopsignal = INT -stopasgroup = true -redirect_stderr = true -stdout_logfile = /var/log/supervisor/sysom-uwsgi.log -stdout_logfile_maxbytes = 10MB -stdout_logfile_backups = 10 - -[program:sysom-daphne] +[fcgi-program:sysom-daphne] socket=tcp://localhost:7001 -command = /var/lib/sysom/venv/sysom/bin/daphne -u /var/run/sysom/daphne.sock sysom.asgi:application +# command = /var/lib/sysom/venv/sysom/bin/daphne -u /var/run/sysom/daphne.sock sysom.asgi:application +command=/var/lib/sysom/venv/sysom/bin/daphne -u /var/run/sysom/daphne%(process_num)d.sock --fd 0 --access-log - --proxy-headers sysom.asgi:application directory = /var/lib/sysom user = sysom +numprocs=1 +process_name=asgi%(process_num)d autostart = true autorestart = true stopwaitsecs = 5 redirect_stderr = true stdout_logfile = /var/log/supervisor/sysom-daphne.log -stdout_logfile_maxbytes = 10MB +stdout_logfile_maxbytes = 2MB stdout_logfile_backups = 10 [program:sysom-rsyslogd] -- Gitee From 952bc247310589b5d301beb2b1ca13952290aa0f Mon Sep 17 00:00:00 2001 From: wangqing Date: Wed, 9 Feb 2022 15:40:22 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangqing --- MANIFEST.in | 7 + Makefile | 36 ++-- VERSION | 1 + sysom_api/manage.py => manage.py | 0 package.sh | 23 --- .../requirements.txt | 0 .../requirements_dev.txt | 0 script/node/conf | 2 - script/node/init.sh | 20 -- script/node/monitor/init.sh | 1 - script/node/monitor/node_exporter_deploy.sh | 42 ----- script/node/pre_init.sh | 54 ------ script/node/vmcore/init.sh | 1 - script/node/vmcore/init_vmcore.sh | 35 ---- script/server/init.sh | 15 -- script/server/monitor/Readme.txt | 15 -- script/server/monitor/init.sh | 1 - script/server/monitor/local_copy_pkg.sh | 6 - script/server/monitor/monitor_server_clear.sh | 35 ---- .../server/monitor/monitor_server_deploy.sh | 169 ----------------- script/server/monitor/test.py | 17 -- script/server/vmcore/init.sh | 1 - script/server/vmcore/init_server.sh | 18 -- setup.py | 77 ++++++++ {sysom_api/sysom => sysom}/__init__.py | 0 {sysom_api => sysom}/apps/__init__.py | 0 .../apps/accounts/__init__.py | 0 {sysom_api => sysom}/apps/accounts/admin.py | 0 {sysom_api => sysom}/apps/accounts/apps.py | 0 .../apps/accounts/authentication.py | 0 {sysom_api => sysom}/apps/accounts/models.py | 0 .../apps/accounts/permissions.py | 0 {sysom_api => sysom}/apps/accounts/role.json | 0 .../apps/accounts/serializer.py | 0 {sysom_api => sysom}/apps/accounts/tests.py | 0 {sysom_api => sysom}/apps/accounts/urls.py | 0 {sysom_api => sysom}/apps/accounts/user.json | 0 {sysom_api => sysom}/apps/accounts/views.py | 0 {sysom_api => sysom}/apps/host/__init__.py | 0 {sysom_api => sysom}/apps/host/admin.py | 0 {sysom_api => sysom}/apps/host/apps.py | 0 {sysom_api => sysom}/apps/host/models.py | 0 {sysom_api => sysom}/apps/host/serializer.py | 0 {sysom_api => sysom}/apps/host/tests.py | 0 {sysom_api => sysom}/apps/host/urls.py | 0 {sysom_api => sysom}/apps/host/views.py | 0 {sysom_api => sysom}/apps/monitor/__init__.py | 0 {sysom_api => sysom}/apps/monitor/admin.py | 0 {sysom_api => sysom}/apps/monitor/apps.py | 0 {sysom_api => sysom}/apps/monitor/models.py | 0 {sysom_api => sysom}/apps/monitor/tests.py | 0 {sysom_api => sysom}/apps/monitor/urls.py | 0 {sysom_api => sysom}/apps/monitor/views.py | 0 {sysom_api => sysom}/apps/task/__init__.py | 0 {sysom_api => sysom}/apps/task/admin.py | 0 {sysom_api => sysom}/apps/task/apps.py | 0 {sysom_api => sysom}/apps/task/models.py | 0 {sysom_api => sysom}/apps/task/seriaizer.py | 0 {sysom_api => sysom}/apps/task/tests.py | 0 {sysom_api => sysom}/apps/task/urls.py | 0 {sysom_api => sysom}/apps/task/views.py | 0 {sysom_api => sysom}/apps/vmcore/__init__.py | 0 {sysom_api => sysom}/apps/vmcore/admin.py | 0 {sysom_api => sysom}/apps/vmcore/apps.py | 0 {sysom_api => sysom}/apps/vmcore/models.py | 0 .../apps/vmcore/serializer.py | 0 {sysom_api => sysom}/apps/vmcore/tests.py | 0 {sysom_api => sysom}/apps/vmcore/urls.py | 0 {sysom_api => sysom}/apps/vmcore/views.py | 0 {sysom_api => sysom}/apps/vmcore/vmcore.json | 0 {sysom_api/sysom => sysom}/asgi.py | 0 {sysom_api => sysom}/conf/__init__.py | 0 {sysom_api => sysom}/conf/common.py | 0 {sysom_api => sysom}/conf/develop.py | 0 {sysom_api => sysom}/conf/product.py | 0 {sysom_api => sysom}/conf/testing.py | 0 {sysom_api => sysom}/consumer/__init__.py | 0 {sysom_api => sysom}/consumer/consumers.py | 0 {sysom_api => sysom}/consumer/executors.py | 0 {sysom_api => sysom}/consumer/middleware.py | 0 {sysom_api => sysom}/consumer/routing.py | 0 {sysom_api => sysom}/lib/__init__.py | 0 {sysom_api => sysom}/lib/base_model.py | 0 {sysom_api => sysom}/lib/exception.py | 0 {sysom_api => sysom}/lib/paginations.py | 0 {sysom_api => sysom}/lib/response.py | 0 {sysom_api => sysom}/lib/ssh.py | 0 {sysom_api => sysom}/lib/utils.py | 0 {sysom_api/sysom => sysom}/settings.py | 0 {sysom_api/sysom => sysom}/urls.py | 0 {sysom_api/sysom => sysom}/wsgi.py | 0 sysom_api/dockerfile | 5 - sysom_api/service_scripts/pingtrace | 49 ----- sysom_api/service_scripts/pingtrace_post | 33 ---- sysom_api/service_scripts/test | 15 -- sysom_api/service_scripts/test.sh | 15 -- sysom_api/service_scripts/tpython | 19 -- sysom_api/setup.cfg | 4 - sysom_api/setup.py | 17 -- sysom_api/uwsgi.ini | 10 - sysom_web/public/CNAME | 1 - sysom_web/public/favicon.ico | Bin 4286 -> 0 bytes sysom_web/public/icons/icon-128x128.png | Bin 1329 -> 0 bytes sysom_web/public/icons/icon-192x192.png | Bin 1856 -> 0 bytes sysom_web/public/icons/icon-512x512.png | Bin 5082 -> 0 bytes sysom_web/public/logo.svg | 1 - sysom_web/public/pro_icon.svg | 5 - tools/deploy/deploy.sh | 178 ------------------ tools/deploy/nginx.conf | 68 ------- tools/deploy/pip.conf | 8 - tools/deploy/requirements.txt | 70 ------- tools/deploy/sysom-uwsgi.ini | 9 - tools/deploy/uwsgi.ini | 10 - .../grafana}/grafana_api_set.sh | 0 .../grafana}/netinfo_dashboard.json | 0 .../grafana}/netinfo_dashboard_new.json | 0 .../grafana}/sysom-dashboard.json | 0 .../sysom.conf => nginx/nginx-sysom.conf} | 2 +- .../prometheus}/prometheus_get_node.py | 0 .../scripts}/sysom-python | 0 tools/{deploy => supervisord}/sysom.ini | 0 .../server => tools}/vmcore/parse_panic.py | 0 .../node => tools}/vmcore/vmcore_collect.py | 0 .../server => tools}/vmcore/vmcore_const.py | 0 {sysom_web => ui}/README.md | 0 {sysom_web => ui}/config/config.dev.js | 0 {sysom_web => ui}/config/config.js | 0 {sysom_web => ui}/config/defaultSettings.js | 0 {sysom_web => ui}/config/oneapi.json | 0 {sysom_web => ui}/config/proxy.js | 0 {sysom_web => ui}/config/routes.js | 0 {sysom_web => ui}/jest.config.js | 0 {sysom_web => ui}/jsconfig.json | 0 {sysom_web => ui}/package.json | 0 {sysom_web/dist => ui/public}/CNAME | 0 {sysom_web/dist => ui/public}/favicon.ico | Bin .../dist => ui/public}/icons/icon-128x128.png | Bin .../dist => ui/public}/icons/icon-192x192.png | Bin .../dist => ui/public}/icons/icon-512x512.png | Bin {sysom_web/dist => ui/public}/logo.svg | 0 {sysom_web/dist => ui/public}/pro_icon.svg | 0 {sysom_web => ui}/src/access.js | 0 {sysom_web => ui}/src/app.jsx | 0 .../src/components/Footer/index.jsx | 0 .../src/components/HeaderDropdown/index.jsx | 0 .../src/components/HeaderDropdown/index.less | 0 .../src/components/HeaderSearch/index.jsx | 0 .../src/components/HeaderSearch/index.less | 0 .../src/components/NoticeIcon/NoticeIcon.jsx | 0 .../src/components/NoticeIcon/NoticeList.jsx | 0 .../src/components/NoticeIcon/NoticeList.less | 0 .../src/components/NoticeIcon/index.jsx | 0 .../src/components/NoticeIcon/index.less | 0 .../RightContent/AvatarDropdown.jsx | 0 .../src/components/RightContent/index.jsx | 0 .../src/components/RightContent/index.less | 0 .../src/components/WebConsole/index.jsx | 0 .../src/components/WebConsole/index.less | 0 {sysom_web => ui}/src/components/index.md | 0 {sysom_web => ui}/src/e2e/baseLayout.e2e.js | 0 {sysom_web => ui}/src/global.jsx | 0 {sysom_web => ui}/src/global.less | 0 {sysom_web => ui}/src/locales/bn-BD.js | 0 .../src/locales/bn-BD/component.js | 0 .../src/locales/bn-BD/globalHeader.js | 0 {sysom_web => ui}/src/locales/bn-BD/menu.js | 0 {sysom_web => ui}/src/locales/bn-BD/pages.js | 0 {sysom_web => ui}/src/locales/bn-BD/pwa.js | 0 .../src/locales/bn-BD/settingDrawer.js | 0 .../src/locales/bn-BD/settings.js | 0 {sysom_web => ui}/src/locales/en-US.js | 0 .../src/locales/en-US/component.js | 0 .../src/locales/en-US/globalHeader.js | 0 {sysom_web => ui}/src/locales/en-US/menu.js | 0 {sysom_web => ui}/src/locales/en-US/pages.js | 0 {sysom_web => ui}/src/locales/en-US/pwa.js | 0 .../src/locales/en-US/settingDrawer.js | 0 .../src/locales/en-US/settings.js | 0 {sysom_web => ui}/src/locales/fa-IR.js | 0 .../src/locales/fa-IR/component.js | 0 .../src/locales/fa-IR/globalHeader.js | 0 {sysom_web => ui}/src/locales/fa-IR/menu.js | 0 {sysom_web => ui}/src/locales/fa-IR/pages.js | 0 {sysom_web => ui}/src/locales/fa-IR/pwa.js | 0 .../src/locales/fa-IR/settingDrawer.js | 0 .../src/locales/fa-IR/settings.js | 0 {sysom_web => ui}/src/locales/id-ID.js | 0 .../src/locales/id-ID/component.js | 0 .../src/locales/id-ID/globalHeader.js | 0 {sysom_web => ui}/src/locales/id-ID/menu.js | 0 {sysom_web => ui}/src/locales/id-ID/pages.js | 0 {sysom_web => ui}/src/locales/id-ID/pwa.js | 0 .../src/locales/id-ID/settingDrawer.js | 0 .../src/locales/id-ID/settings.js | 0 {sysom_web => ui}/src/locales/ja-JP.js | 0 .../src/locales/ja-JP/component.js | 0 .../src/locales/ja-JP/globalHeader.js | 0 {sysom_web => ui}/src/locales/ja-JP/menu.js | 0 {sysom_web => ui}/src/locales/ja-JP/pages.js | 0 {sysom_web => ui}/src/locales/ja-JP/pwa.js | 0 .../src/locales/ja-JP/settingDrawer.js | 0 .../src/locales/ja-JP/settings.js | 0 {sysom_web => ui}/src/locales/pt-BR.js | 0 .../src/locales/pt-BR/component.js | 0 .../src/locales/pt-BR/globalHeader.js | 0 {sysom_web => ui}/src/locales/pt-BR/menu.js | 0 {sysom_web => ui}/src/locales/pt-BR/pages.js | 0 {sysom_web => ui}/src/locales/pt-BR/pwa.js | 0 .../src/locales/pt-BR/settingDrawer.js | 0 .../src/locales/pt-BR/settings.js | 0 {sysom_web => ui}/src/locales/zh-CN.js | 0 .../src/locales/zh-CN/component.js | 0 .../src/locales/zh-CN/globalHeader.js | 0 {sysom_web => ui}/src/locales/zh-CN/menu.js | 0 {sysom_web => ui}/src/locales/zh-CN/pages.js | 0 {sysom_web => ui}/src/locales/zh-CN/pwa.js | 0 .../src/locales/zh-CN/settingDrawer.js | 0 .../src/locales/zh-CN/settings.js | 0 {sysom_web => ui}/src/locales/zh-TW.js | 0 .../src/locales/zh-TW/component.js | 0 .../src/locales/zh-TW/globalHeader.js | 0 {sysom_web => ui}/src/locales/zh-TW/menu.js | 0 {sysom_web => ui}/src/locales/zh-TW/pwa.js | 0 .../src/locales/zh-TW/settingDrawer.js | 0 .../src/locales/zh-TW/settings.js | 0 {sysom_web => ui}/src/manifest.json | 0 {sysom_web => ui}/src/pages/404.jsx | 0 {sysom_web => ui}/src/pages/Admin.jsx | 0 .../src/pages/Monitor/SystemDashboard.jsx | 0 {sysom_web => ui}/src/pages/Welcome.jsx | 0 {sysom_web => ui}/src/pages/Welcome.less | 0 .../src/pages/diagnose/Io/IOResults.js | 0 .../src/pages/diagnose/Io/IOTableList.jsx | 0 .../src/pages/diagnose/Io/index.jsx | 0 .../src/pages/diagnose/Net/NetTableList.jsx | 0 .../src/pages/diagnose/Net/NetworkFlow.js | 0 .../src/pages/diagnose/Net/PacketLoss.js | 0 .../src/pages/diagnose/Net/index.jsx | 0 {sysom_web => ui}/src/pages/diagnose/_mock.js | 0 .../pages/diagnose/components/MetricShow.js | 0 .../src/pages/diagnose/diagnose.less | 0 .../src/pages/diagnose/service.js | 0 {sysom_web => ui}/src/pages/document.ejs | 0 .../src/pages/host/List/index.jsx | 0 .../src/pages/host/Terminal/index.jsx | 0 {sysom_web => ui}/src/pages/host/_mock.js | 0 .../src/pages/host/components/ClusterForm.jsx | 0 {sysom_web => ui}/src/pages/host/service.js | 0 .../src/pages/user/Login/_mock.js | 0 .../src/pages/user/Login/index.jsx | 0 .../src/pages/user/Login/index.less | 0 .../src/pages/user/Login/service.js | 0 .../src/pages/vmcore/Analyse/index.jsx | 0 .../src/pages/vmcore/Detail/index.jsx | 0 .../src/pages/vmcore/List/index.jsx | 0 .../src/pages/vmcore/Match/index.jsx | 0 {sysom_web => ui}/src/pages/vmcore/_mock.js | 0 .../pages/vmcore/components/VmcoreCard.jsx | 0 .../vmcore/components/VmcoreIssueForm.jsx | 0 .../vmcore/components/VmcoreTableList.jsx | 0 {sysom_web => ui}/src/pages/vmcore/service.js | 0 {sysom_web => ui}/src/service-worker.js | 0 {sysom_web => ui}/src/static/img/banner1.jpg | Bin {sysom_web => ui}/src/static/img/banner2.jpg | Bin {sysom_web => ui}/src/static/img/banner3.jpg | Bin .../tests/PuppeteerEnvironment.js | 0 {sysom_web => ui}/tests/beforeTest.js | 0 {sysom_web => ui}/tests/getBrowser.js | 0 {sysom_web => ui}/tests/run-tests.js | 0 {sysom_web => ui}/tests/setupTests.js | 0 {sysom_web => ui}/yarn.lock | 0 271 files changed, 106 insertions(+), 989 deletions(-) create mode 100644 MANIFEST.in create mode 100644 VERSION rename sysom_api/manage.py => manage.py (100%) delete mode 100644 package.sh rename {sysom_api/requirements => requirements}/requirements.txt (100%) rename {sysom_api/requirements => requirements}/requirements_dev.txt (100%) delete mode 100644 script/node/conf delete mode 100644 script/node/init.sh delete mode 120000 script/node/monitor/init.sh delete mode 100755 script/node/monitor/node_exporter_deploy.sh delete mode 100755 script/node/pre_init.sh delete mode 120000 script/node/vmcore/init.sh delete mode 100644 script/node/vmcore/init_vmcore.sh delete mode 100644 script/server/init.sh delete mode 100644 script/server/monitor/Readme.txt delete mode 120000 script/server/monitor/init.sh delete mode 100755 script/server/monitor/local_copy_pkg.sh delete mode 100755 script/server/monitor/monitor_server_clear.sh delete mode 100755 script/server/monitor/monitor_server_deploy.sh delete mode 100644 script/server/monitor/test.py delete mode 120000 script/server/vmcore/init.sh delete mode 100644 script/server/vmcore/init_server.sh create mode 100644 setup.py rename {sysom_api/sysom => sysom}/__init__.py (100%) rename {sysom_api => sysom}/apps/__init__.py (100%) rename {sysom_api => sysom}/apps/accounts/__init__.py (100%) rename {sysom_api => sysom}/apps/accounts/admin.py (100%) rename {sysom_api => sysom}/apps/accounts/apps.py (100%) rename {sysom_api => sysom}/apps/accounts/authentication.py (100%) rename {sysom_api => sysom}/apps/accounts/models.py (100%) rename {sysom_api => sysom}/apps/accounts/permissions.py (100%) rename {sysom_api => sysom}/apps/accounts/role.json (100%) rename {sysom_api => sysom}/apps/accounts/serializer.py (100%) rename {sysom_api => sysom}/apps/accounts/tests.py (100%) rename {sysom_api => sysom}/apps/accounts/urls.py (100%) rename {sysom_api => sysom}/apps/accounts/user.json (100%) rename {sysom_api => sysom}/apps/accounts/views.py (100%) rename {sysom_api => sysom}/apps/host/__init__.py (100%) rename {sysom_api => sysom}/apps/host/admin.py (100%) rename {sysom_api => sysom}/apps/host/apps.py (100%) rename {sysom_api => sysom}/apps/host/models.py (100%) rename {sysom_api => sysom}/apps/host/serializer.py (100%) rename {sysom_api => sysom}/apps/host/tests.py (100%) rename {sysom_api => sysom}/apps/host/urls.py (100%) rename {sysom_api => sysom}/apps/host/views.py (100%) rename {sysom_api => sysom}/apps/monitor/__init__.py (100%) rename {sysom_api => sysom}/apps/monitor/admin.py (100%) rename {sysom_api => sysom}/apps/monitor/apps.py (100%) rename {sysom_api => sysom}/apps/monitor/models.py (100%) rename {sysom_api => sysom}/apps/monitor/tests.py (100%) rename {sysom_api => sysom}/apps/monitor/urls.py (100%) rename {sysom_api => sysom}/apps/monitor/views.py (100%) rename {sysom_api => sysom}/apps/task/__init__.py (100%) rename {sysom_api => sysom}/apps/task/admin.py (100%) rename {sysom_api => sysom}/apps/task/apps.py (100%) rename {sysom_api => sysom}/apps/task/models.py (100%) rename {sysom_api => sysom}/apps/task/seriaizer.py (100%) rename {sysom_api => sysom}/apps/task/tests.py (100%) rename {sysom_api => sysom}/apps/task/urls.py (100%) rename {sysom_api => sysom}/apps/task/views.py (100%) rename {sysom_api => sysom}/apps/vmcore/__init__.py (100%) rename {sysom_api => sysom}/apps/vmcore/admin.py (100%) rename {sysom_api => sysom}/apps/vmcore/apps.py (100%) rename {sysom_api => sysom}/apps/vmcore/models.py (100%) rename {sysom_api => sysom}/apps/vmcore/serializer.py (100%) rename {sysom_api => sysom}/apps/vmcore/tests.py (100%) rename {sysom_api => sysom}/apps/vmcore/urls.py (100%) rename {sysom_api => sysom}/apps/vmcore/views.py (100%) rename {sysom_api => sysom}/apps/vmcore/vmcore.json (100%) rename {sysom_api/sysom => sysom}/asgi.py (100%) rename {sysom_api => sysom}/conf/__init__.py (100%) rename {sysom_api => sysom}/conf/common.py (100%) rename {sysom_api => sysom}/conf/develop.py (100%) rename {sysom_api => sysom}/conf/product.py (100%) rename {sysom_api => sysom}/conf/testing.py (100%) rename {sysom_api => sysom}/consumer/__init__.py (100%) rename {sysom_api => sysom}/consumer/consumers.py (100%) rename {sysom_api => sysom}/consumer/executors.py (100%) rename {sysom_api => sysom}/consumer/middleware.py (100%) rename {sysom_api => sysom}/consumer/routing.py (100%) rename {sysom_api => sysom}/lib/__init__.py (100%) rename {sysom_api => sysom}/lib/base_model.py (100%) rename {sysom_api => sysom}/lib/exception.py (100%) rename {sysom_api => sysom}/lib/paginations.py (100%) rename {sysom_api => sysom}/lib/response.py (100%) rename {sysom_api => sysom}/lib/ssh.py (100%) rename {sysom_api => sysom}/lib/utils.py (100%) rename {sysom_api/sysom => sysom}/settings.py (100%) rename {sysom_api/sysom => sysom}/urls.py (100%) rename {sysom_api/sysom => sysom}/wsgi.py (100%) delete mode 100644 sysom_api/dockerfile delete mode 100755 sysom_api/service_scripts/pingtrace delete mode 100644 sysom_api/service_scripts/pingtrace_post delete mode 100755 sysom_api/service_scripts/test delete mode 100644 sysom_api/service_scripts/test.sh delete mode 100755 sysom_api/service_scripts/tpython delete mode 100644 sysom_api/setup.cfg delete mode 100644 sysom_api/setup.py delete mode 100644 sysom_api/uwsgi.ini delete mode 100644 sysom_web/public/CNAME delete mode 100644 sysom_web/public/favicon.ico delete mode 100644 sysom_web/public/icons/icon-128x128.png delete mode 100644 sysom_web/public/icons/icon-192x192.png delete mode 100644 sysom_web/public/icons/icon-512x512.png delete mode 100644 sysom_web/public/logo.svg delete mode 100644 sysom_web/public/pro_icon.svg delete mode 100755 tools/deploy/deploy.sh delete mode 100644 tools/deploy/nginx.conf delete mode 100644 tools/deploy/pip.conf delete mode 100644 tools/deploy/requirements.txt delete mode 100644 tools/deploy/sysom-uwsgi.ini delete mode 100644 tools/deploy/uwsgi.ini rename {script/server/monitor => tools/grafana}/grafana_api_set.sh (100%) rename {script/server/monitor => tools/grafana}/netinfo_dashboard.json (100%) rename {script/server/monitor => tools/grafana}/netinfo_dashboard_new.json (100%) rename {script/server/monitor => tools/grafana}/sysom-dashboard.json (100%) rename tools/{deploy/sysom.conf => nginx/nginx-sysom.conf} (95%) rename {script/server/monitor => tools/prometheus}/prometheus_get_node.py (100%) rename {sysom_api/service_scripts => tools/scripts}/sysom-python (100%) rename tools/{deploy => supervisord}/sysom.ini (100%) rename {script/server => tools}/vmcore/parse_panic.py (100%) rename {script/node => tools}/vmcore/vmcore_collect.py (100%) rename {script/server => tools}/vmcore/vmcore_const.py (100%) rename {sysom_web => ui}/README.md (100%) rename {sysom_web => ui}/config/config.dev.js (100%) rename {sysom_web => ui}/config/config.js (100%) rename {sysom_web => ui}/config/defaultSettings.js (100%) rename {sysom_web => ui}/config/oneapi.json (100%) rename {sysom_web => ui}/config/proxy.js (100%) rename {sysom_web => ui}/config/routes.js (100%) rename {sysom_web => ui}/jest.config.js (100%) rename {sysom_web => ui}/jsconfig.json (100%) rename {sysom_web => ui}/package.json (100%) rename {sysom_web/dist => ui/public}/CNAME (100%) rename {sysom_web/dist => ui/public}/favicon.ico (100%) rename {sysom_web/dist => ui/public}/icons/icon-128x128.png (100%) rename {sysom_web/dist => ui/public}/icons/icon-192x192.png (100%) rename {sysom_web/dist => ui/public}/icons/icon-512x512.png (100%) rename {sysom_web/dist => ui/public}/logo.svg (100%) rename {sysom_web/dist => ui/public}/pro_icon.svg (100%) rename {sysom_web => ui}/src/access.js (100%) rename {sysom_web => ui}/src/app.jsx (100%) rename {sysom_web => ui}/src/components/Footer/index.jsx (100%) rename {sysom_web => ui}/src/components/HeaderDropdown/index.jsx (100%) rename {sysom_web => ui}/src/components/HeaderDropdown/index.less (100%) rename {sysom_web => ui}/src/components/HeaderSearch/index.jsx (100%) rename {sysom_web => ui}/src/components/HeaderSearch/index.less (100%) rename {sysom_web => ui}/src/components/NoticeIcon/NoticeIcon.jsx (100%) rename {sysom_web => ui}/src/components/NoticeIcon/NoticeList.jsx (100%) rename {sysom_web => ui}/src/components/NoticeIcon/NoticeList.less (100%) rename {sysom_web => ui}/src/components/NoticeIcon/index.jsx (100%) rename {sysom_web => ui}/src/components/NoticeIcon/index.less (100%) rename {sysom_web => ui}/src/components/RightContent/AvatarDropdown.jsx (100%) rename {sysom_web => ui}/src/components/RightContent/index.jsx (100%) rename {sysom_web => ui}/src/components/RightContent/index.less (100%) rename {sysom_web => ui}/src/components/WebConsole/index.jsx (100%) rename {sysom_web => ui}/src/components/WebConsole/index.less (100%) rename {sysom_web => ui}/src/components/index.md (100%) rename {sysom_web => ui}/src/e2e/baseLayout.e2e.js (100%) rename {sysom_web => ui}/src/global.jsx (100%) rename {sysom_web => ui}/src/global.less (100%) rename {sysom_web => ui}/src/locales/bn-BD.js (100%) rename {sysom_web => ui}/src/locales/bn-BD/component.js (100%) rename {sysom_web => ui}/src/locales/bn-BD/globalHeader.js (100%) rename {sysom_web => ui}/src/locales/bn-BD/menu.js (100%) rename {sysom_web => ui}/src/locales/bn-BD/pages.js (100%) rename {sysom_web => ui}/src/locales/bn-BD/pwa.js (100%) rename {sysom_web => ui}/src/locales/bn-BD/settingDrawer.js (100%) rename {sysom_web => ui}/src/locales/bn-BD/settings.js (100%) rename {sysom_web => ui}/src/locales/en-US.js (100%) rename {sysom_web => ui}/src/locales/en-US/component.js (100%) rename {sysom_web => ui}/src/locales/en-US/globalHeader.js (100%) rename {sysom_web => ui}/src/locales/en-US/menu.js (100%) rename {sysom_web => ui}/src/locales/en-US/pages.js (100%) rename {sysom_web => ui}/src/locales/en-US/pwa.js (100%) rename {sysom_web => ui}/src/locales/en-US/settingDrawer.js (100%) rename {sysom_web => ui}/src/locales/en-US/settings.js (100%) rename {sysom_web => ui}/src/locales/fa-IR.js (100%) rename {sysom_web => ui}/src/locales/fa-IR/component.js (100%) rename {sysom_web => ui}/src/locales/fa-IR/globalHeader.js (100%) rename {sysom_web => ui}/src/locales/fa-IR/menu.js (100%) rename {sysom_web => ui}/src/locales/fa-IR/pages.js (100%) rename {sysom_web => ui}/src/locales/fa-IR/pwa.js (100%) rename {sysom_web => ui}/src/locales/fa-IR/settingDrawer.js (100%) rename {sysom_web => ui}/src/locales/fa-IR/settings.js (100%) rename {sysom_web => ui}/src/locales/id-ID.js (100%) rename {sysom_web => ui}/src/locales/id-ID/component.js (100%) rename {sysom_web => ui}/src/locales/id-ID/globalHeader.js (100%) rename {sysom_web => ui}/src/locales/id-ID/menu.js (100%) rename {sysom_web => ui}/src/locales/id-ID/pages.js (100%) rename {sysom_web => ui}/src/locales/id-ID/pwa.js (100%) rename {sysom_web => ui}/src/locales/id-ID/settingDrawer.js (100%) rename {sysom_web => ui}/src/locales/id-ID/settings.js (100%) rename {sysom_web => ui}/src/locales/ja-JP.js (100%) rename {sysom_web => ui}/src/locales/ja-JP/component.js (100%) rename {sysom_web => ui}/src/locales/ja-JP/globalHeader.js (100%) rename {sysom_web => ui}/src/locales/ja-JP/menu.js (100%) rename {sysom_web => ui}/src/locales/ja-JP/pages.js (100%) rename {sysom_web => ui}/src/locales/ja-JP/pwa.js (100%) rename {sysom_web => ui}/src/locales/ja-JP/settingDrawer.js (100%) rename {sysom_web => ui}/src/locales/ja-JP/settings.js (100%) rename {sysom_web => ui}/src/locales/pt-BR.js (100%) rename {sysom_web => ui}/src/locales/pt-BR/component.js (100%) rename {sysom_web => ui}/src/locales/pt-BR/globalHeader.js (100%) rename {sysom_web => ui}/src/locales/pt-BR/menu.js (100%) rename {sysom_web => ui}/src/locales/pt-BR/pages.js (100%) rename {sysom_web => ui}/src/locales/pt-BR/pwa.js (100%) rename {sysom_web => ui}/src/locales/pt-BR/settingDrawer.js (100%) rename {sysom_web => ui}/src/locales/pt-BR/settings.js (100%) rename {sysom_web => ui}/src/locales/zh-CN.js (100%) rename {sysom_web => ui}/src/locales/zh-CN/component.js (100%) rename {sysom_web => ui}/src/locales/zh-CN/globalHeader.js (100%) rename {sysom_web => ui}/src/locales/zh-CN/menu.js (100%) rename {sysom_web => ui}/src/locales/zh-CN/pages.js (100%) rename {sysom_web => ui}/src/locales/zh-CN/pwa.js (100%) rename {sysom_web => ui}/src/locales/zh-CN/settingDrawer.js (100%) rename {sysom_web => ui}/src/locales/zh-CN/settings.js (100%) rename {sysom_web => ui}/src/locales/zh-TW.js (100%) rename {sysom_web => ui}/src/locales/zh-TW/component.js (100%) rename {sysom_web => ui}/src/locales/zh-TW/globalHeader.js (100%) rename {sysom_web => ui}/src/locales/zh-TW/menu.js (100%) rename {sysom_web => ui}/src/locales/zh-TW/pwa.js (100%) rename {sysom_web => ui}/src/locales/zh-TW/settingDrawer.js (100%) rename {sysom_web => ui}/src/locales/zh-TW/settings.js (100%) rename {sysom_web => ui}/src/manifest.json (100%) rename {sysom_web => ui}/src/pages/404.jsx (100%) rename {sysom_web => ui}/src/pages/Admin.jsx (100%) rename {sysom_web => ui}/src/pages/Monitor/SystemDashboard.jsx (100%) rename {sysom_web => ui}/src/pages/Welcome.jsx (100%) rename {sysom_web => ui}/src/pages/Welcome.less (100%) rename {sysom_web => ui}/src/pages/diagnose/Io/IOResults.js (100%) rename {sysom_web => ui}/src/pages/diagnose/Io/IOTableList.jsx (100%) rename {sysom_web => ui}/src/pages/diagnose/Io/index.jsx (100%) rename {sysom_web => ui}/src/pages/diagnose/Net/NetTableList.jsx (100%) rename {sysom_web => ui}/src/pages/diagnose/Net/NetworkFlow.js (100%) rename {sysom_web => ui}/src/pages/diagnose/Net/PacketLoss.js (100%) rename {sysom_web => ui}/src/pages/diagnose/Net/index.jsx (100%) rename {sysom_web => ui}/src/pages/diagnose/_mock.js (100%) rename {sysom_web => ui}/src/pages/diagnose/components/MetricShow.js (100%) rename {sysom_web => ui}/src/pages/diagnose/diagnose.less (100%) rename {sysom_web => ui}/src/pages/diagnose/service.js (100%) rename {sysom_web => ui}/src/pages/document.ejs (100%) rename {sysom_web => ui}/src/pages/host/List/index.jsx (100%) rename {sysom_web => ui}/src/pages/host/Terminal/index.jsx (100%) rename {sysom_web => ui}/src/pages/host/_mock.js (100%) rename {sysom_web => ui}/src/pages/host/components/ClusterForm.jsx (100%) rename {sysom_web => ui}/src/pages/host/service.js (100%) rename {sysom_web => ui}/src/pages/user/Login/_mock.js (100%) rename {sysom_web => ui}/src/pages/user/Login/index.jsx (100%) rename {sysom_web => ui}/src/pages/user/Login/index.less (100%) rename {sysom_web => ui}/src/pages/user/Login/service.js (100%) rename {sysom_web => ui}/src/pages/vmcore/Analyse/index.jsx (100%) rename {sysom_web => ui}/src/pages/vmcore/Detail/index.jsx (100%) rename {sysom_web => ui}/src/pages/vmcore/List/index.jsx (100%) rename {sysom_web => ui}/src/pages/vmcore/Match/index.jsx (100%) rename {sysom_web => ui}/src/pages/vmcore/_mock.js (100%) rename {sysom_web => ui}/src/pages/vmcore/components/VmcoreCard.jsx (100%) rename {sysom_web => ui}/src/pages/vmcore/components/VmcoreIssueForm.jsx (100%) rename {sysom_web => ui}/src/pages/vmcore/components/VmcoreTableList.jsx (100%) rename {sysom_web => ui}/src/pages/vmcore/service.js (100%) rename {sysom_web => ui}/src/service-worker.js (100%) rename {sysom_web => ui}/src/static/img/banner1.jpg (100%) rename {sysom_web => ui}/src/static/img/banner2.jpg (100%) rename {sysom_web => ui}/src/static/img/banner3.jpg (100%) rename {sysom_web => ui}/tests/PuppeteerEnvironment.js (100%) rename {sysom_web => ui}/tests/beforeTest.js (100%) rename {sysom_web => ui}/tests/getBrowser.js (100%) rename {sysom_web => ui}/tests/run-tests.js (100%) rename {sysom_web => ui}/tests/setupTests.js (100%) rename {sysom_web => ui}/yarn.lock (100%) diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..c9b8b5c3 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,7 @@ +recursive-include sysom *.py +recursive-include ui * +recursive-include tools * +recursive-include requirements *.txt +include service_scripts/sysom-python +include VERSION +include Makefile diff --git a/Makefile b/Makefile index a33b7ecb..0900108c 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,17 @@ # python venv global variable # start: -------------------------------------- -PYTHON ?= python3.7 +PYTHON ?= python3 PYTHON_VERSION = $(shell $(PYTHON) -c "from distutils.sysconfig import get_python_version; print(get_python_version())") -VERSION := $(shell $(PYTHON) sysom_api/setup.py --version) +VERSION := $(shell $(PYTHON) setup.py --version) NAME ?= sysom SDIST_TAR_NAME = $(NAME)-$(VERSION) SDIST_TAR_FILE ?= $(SDIST_TAR_NAME).tar.gz -VENV_BASE ?= /var/lib/sysom/venv +DEST_BASE ?= /var/lib/sysom +VENV_BASE = $(DEST_BASE)/venv # Python packages to install only from source (not from binary wheels) # Comma separated list @@ -41,7 +42,7 @@ clean-nodejs: rm -f node-$(NODE_VERSION)-$(DISTRO).tar.xz clean-web: - rm -rf sysom_web/node_modules + rm -rf ui/node_modules clean: clean-nodejs clean-web @@ -54,17 +55,22 @@ install_nodejs: if [ ! -d "$(THIRD_PARTY)" ]; then \ mkdir $(THIRD_PARTY); \ fi; \ - wget https://npmmirror.com/mirrors/node/$(NODE_VERSION)/node-$(NODE_VERSION)-$(DISTRO).tar.xz ; \ - tar -xf node-$(NODE_VERSION)-$(DISTRO).tar.xz -C $(THIRD_PARTY) ; \ + wget https://npmmirror.com/mirrors/node/$(NODE_VERSION)/node-$(NODE_VERSION)-$(DISTRO).tar.xz; \ + tar -xf node-$(NODE_VERSION)-$(DISTRO).tar.xz -C $(THIRD_PARTY); \ fi -build_web: install_nodejs +build_ui: install_nodejs @echo build web - npm config set registry 'https://registry.npmmirror.com' ; - npm install --global yarn ; - yarn --cwd sysom_web install ; - yarn --cwd sysom_web build - + npm config set registry 'https://registry.npmmirror.com'; \ + npm install --global yarn; \ + yarn --cwd ui install; \ + yarn --cwd ui build; \ + if [ "$(DEST_BASE)" ]; then \ + if [ ! -d "$(DEST_BASE)/ui" ]; then \ + mkdir -p $(DEST_BASE)/ui; \ + fi; \ + mv ui/dist $(DEST_BASE)/ui; \ + fi # end: -------------------------------------- # sysom web @@ -89,12 +95,10 @@ virtualenv_sysom: # Install third-party requirements needed for sysom's environment. # this does not use system site packages intentionally requirements_sysom: virtualenv_sysom - if [[ "$(PIP_OPTIONS)" == *"--no-index"* ]]; then \ - $(VENV_BASE)/sysom/bin/pip install $(PIP_OPTIONS) -r sysom_api/requirements/requirements.txt ; \ - fi + $(VENV_BASE)/sysom/bin/pip install $(PIP_OPTIONS) -r requirements/requirements.txt ; \ requirements_dev: - $(VENV_BASE)/sysom/bin/pip install -r sysom_api/requirements/requirements_dev.txt + $(VENV_BASE)/sysom/bin/pip install -r requirements/requirements_dev.txt # end: -------------------------------------- diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..3eefcb9d --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +1.0.0 diff --git a/sysom_api/manage.py b/manage.py similarity index 100% rename from sysom_api/manage.py rename to manage.py diff --git a/package.sh b/package.sh deleted file mode 100644 index 25ed686c..00000000 --- a/package.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -green="\033[32m" -RELEASE=sysomRelease-$(date +"%Y%m%d%H%M%S") -APIDIR=sysom_api -WEBDIR=sysom_web -SCRIPTDIR=script -TOOLSDIR=tools -# build web -pushd sysom_web -yarn -yarn build -popd - -mkdir -p ${RELEASE} -cp -r ${APIDIR}/ ${TOOLSDIR}/ ${RELEASE}/ -cp -r ${WEBDIR}/dist/ ${RELEASE}/${WEBDIR}/ -mkdir -p ${RELEASE}/${WEBDIR}/download/ -cp ${TOOLSDIR}/deploy/deploy.sh ${RELEASE}/ -cp -r ${SCRIPTDIR} ${RELEASE}/ -tar czf ${RELEASE}.tar.gz ${RELEASE}/ -rm -rf ${RELEASE} -printf "$green The release pacakge is ${RELEASE}.tar.gz" diff --git a/sysom_api/requirements/requirements.txt b/requirements/requirements.txt similarity index 100% rename from sysom_api/requirements/requirements.txt rename to requirements/requirements.txt diff --git a/sysom_api/requirements/requirements_dev.txt b/requirements/requirements_dev.txt similarity index 100% rename from sysom_api/requirements/requirements_dev.txt rename to requirements/requirements_dev.txt diff --git a/script/node/conf b/script/node/conf deleted file mode 100644 index 0fa2c673..00000000 --- a/script/node/conf +++ /dev/null @@ -1,2 +0,0 @@ -APP_HOME=/usr/local/sysom -SERVER_IP=172.16.139.35 diff --git a/script/node/init.sh b/script/node/init.sh deleted file mode 100644 index b1817fe1..00000000 --- a/script/node/init.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -x - -basedir=`dirname $0` - -cd $basedir - -for i in `cat conf` -do - export $i -done - -for dir in `ls` -do - if [ -d $dir ] - then - pushd $dir - bash -x init.sh - popd - fi -done diff --git a/script/node/monitor/init.sh b/script/node/monitor/init.sh deleted file mode 120000 index 8a68572a..00000000 --- a/script/node/monitor/init.sh +++ /dev/null @@ -1 +0,0 @@ -node_exporter_deploy.sh \ No newline at end of file diff --git a/script/node/monitor/node_exporter_deploy.sh b/script/node/monitor/node_exporter_deploy.sh deleted file mode 100755 index 4838acc7..00000000 --- a/script/node/monitor/node_exporter_deploy.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -x - -RESOURCE_DIR=${APP_HOME}/monitor -NODE_EXPORTER_VER=1.2.2 -NODE_EXPORTER_ARCH=linux-amd64 -NODE_EXPORTER_PKG=node_exporter-${NODE_EXPORTER_VER}.${NODE_EXPORTER_ARCH} -NODE_EXPORTER_TAR=${NODE_EXPORTER_PKG}.tar.gz - -##设置node_exporter开机自动启动 -cat << EOF > node_exporter.service -[Unit] -Description=SysOM Monitor Promethues -Documentation=SysOM Monitor Promethues -Wants=network-online.target -After=network-online.target - -[Service] -ExecStart=${RESOURCE_DIR}/node_exporter/node_exporter - -[Install] -WantedBy=multi-user.target -EOF - -main() -{ - tar -zxvf ${NODE_EXPORTER_TAR} - rm -rf ${RESOURCE_DIR}/node_exporter - mkdir -p ${RESOURCE_DIR} - mv ${NODE_EXPORTER_PKG} ${RESOURCE_DIR}/node_exporter - mv node_exporter.service /usr/lib/systemd/system - systemctl daemon-reload - systemctl enable node_exporter - systemctl start node_exporter - ps -elf | grep "${RESOURCE_DIR}/node_exporter/node_exporter" | grep -v grep 1>/dev/null - if [ $? -ne 0 ] - then - exit 1 - fi - exit 0 -} - -main diff --git a/script/node/pre_init.sh b/script/node/pre_init.sh deleted file mode 100755 index 8862af22..00000000 --- a/script/node/pre_init.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -x - -UPLOAD_DIR=${APP_HOME}/target/sysom_web/download/ -APP_CMD_CONF=${APP_HOME}/target/sysom_api/conf/__init__.py -RESOURCE_DIR=${APP_HOME}/monitor -PROMETHEUS_ARCH=linux-amd64 -NODE_EXPORTER_VER=1.2.2 -NODE_EXPORTER_PKG=node_exporter-${NODE_EXPORTER_VER}.${PROMETHEUS_ARCH} -NODE_EXPORTER_TAR=$NODE_EXPORTER_PKG.tar.gz -NODE_INIT_DIR=sysom_node_init -NODE_INIT_PKG=sysom_node_init.tar.gz - -BASE_DIR=`dirname $0` - -init_monitor() -{ - cp ${RESOURCE_DIR}/${NODE_EXPORTER_TAR} monitor/ -} - -prepare_init_tar() -{ - rm -f conf - echo "APP_HOME=${APP_HOME}" >> conf - echo "SERVER_IP=${SERVER_IP}" >> conf - mkdir -p ../${NODE_INIT_DIR} - cp -r * ../${NODE_INIT_DIR} - rm -f ../${NODE_INIT_DIR}/pre_init.sh - tar -zvcf ../${NODE_INIT_PKG} ../${NODE_INIT_DIR} - rm -rf ../${NODE_INIT_DIR} - mv ../${NODE_INIT_PKG} ${UPLOAD_DIR} -} - -set_node_init_cmd() -{ - line_num=`cat -n $APP_CMD_CONF | grep CLIENT_DEPLOY_CMD | awk '{print $1}'` - sed -i "s/CLIENT_DEPLOY_CMD/#CLIENT_DEPLOY_CMD/g" $APP_CMD_CONF - sed -i "$line_num a \ \ \ \ CLIENT_DEPLOY_CMD = \'rm -rf /tmp/sysom; mkdir -p /tmp/sysom;cd /tmp/sysom;wget http://${SERVER_IP}/download/${NODE_INIT_PKG};tar -xf ${NODE_INIT_PKG};bash -x ${NODE_INIT_DIR}/init.sh\'" $APP_CMD_CONF -} - -pre_init() -{ - pushd ${BASE_DIR} - init_monitor - prepare_init_tar - set_node_init_cmd - popd -} - -main() -{ - pre_init -} - -main diff --git a/script/node/vmcore/init.sh b/script/node/vmcore/init.sh deleted file mode 120000 index 6223fe60..00000000 --- a/script/node/vmcore/init.sh +++ /dev/null @@ -1 +0,0 @@ -init_vmcore.sh \ No newline at end of file diff --git a/script/node/vmcore/init_vmcore.sh b/script/node/vmcore/init_vmcore.sh deleted file mode 100644 index 08115058..00000000 --- a/script/node/vmcore/init_vmcore.sh +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh -yum install nfs-utils rpcbind -y -systemctl start rpcbind && systemctl enable rpcbind -systemctl start nfs && systemctl enable nfs - -VMCORE_HOME=${APP_HOME}/vmcore -VMCORE_NFS_HOME=${APP_HOME}/vmcore/vmcore-nfs -mkdir -p ${VMCORE_HOME} - -service=" -[Unit] -Description=Collect vmcore file to oss -After=network.target network-online.target remote-fs.target basic.target -DefaultDependencies=no - -[Service] -Type=forking -ExecStart=/usr/bin/python3 ${VMCORE_HOME}/vmcore_collect.py ${SERVER_IP} ${VMCORE_NFS_HOME} -StartLimitInterval=0 -StandardOutput=syslog -StandardError=inherit - -[Install] -WantedBy=multi-user.target -" - -cat << EOF > vmcore-collect.service -$service -EOF - -cp vmcore_collect.py ${VMCORE_HOME} -mv vmcore-collect.service /usr/lib/systemd/system/vmcore-collect.service -chmod 644 /usr/lib/systemd/system/vmcore-collect.service -systemctl daemon-reload -systemctl enable vmcore-collect.service diff --git a/script/server/init.sh b/script/server/init.sh deleted file mode 100644 index 1e768856..00000000 --- a/script/server/init.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -x - -basedir=`dirname $0` - -cd $basedir - -for dir in `ls` -do - if [ -d $dir ] - then - pushd $dir - bash -x init.sh - popd - fi -done diff --git a/script/server/monitor/Readme.txt b/script/server/monitor/Readme.txt deleted file mode 100644 index 257dfa25..00000000 --- a/script/server/monitor/Readme.txt +++ /dev/null @@ -1,15 +0,0 @@ -本目录脚本主要用于一键部署prometheus + grafana监控 -主要有以下步骤： -1、从grafana官网下载grafana安装包，并安装启动 -2、从prometheus官网下载prometheus的安装包，并安装启动，设置systemd 服务 -3、从prometheus官网下载node_exporter安装包 -4、配置grafana的prometheus数据库，配置dashboard - - -直接在sysom server机器，执行bash -x monitor_server_deploy.sh脚本即可。 - -另外， -1、如果受外网访问限制，你也可以预先下载好grafana,prometheus,node_exporter等安装包， -并把安装包，放置到/usr/local/sysom/monitor目录下。 -2、sysom项目，当前采用grafana-8.2.5-1.x86_64.rpm，prometheus-2.29.1.linux-amd64.tar.gz，node_exporter-1.2.2.linux-amd64.tar.gz -等软件包版本，如果你需要使用其它软件包版本进行安装，你需要修改一下monitor_server_deploy.sh中的版本号信息。 diff --git a/script/server/monitor/init.sh b/script/server/monitor/init.sh deleted file mode 120000 index 3a90bc95..00000000 --- a/script/server/monitor/init.sh +++ /dev/null @@ -1 +0,0 @@ -monitor_server_deploy.sh \ No newline at end of file diff --git a/script/server/monitor/local_copy_pkg.sh b/script/server/monitor/local_copy_pkg.sh deleted file mode 100755 index a6b4388b..00000000 --- a/script/server/monitor/local_copy_pkg.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -mkdir -p /usr/local/sysom/monitor/ -pushd ../ -cp grafana-8.2.5-1.x86_64.rpm prometheus-2.29.1.linux-amd64.tar.gz node_exporter-1.2.2.linux-amd64.tar.gz /usr/local/sysom/monitor/ -popd diff --git a/script/server/monitor/monitor_server_clear.sh b/script/server/monitor/monitor_server_clear.sh deleted file mode 100755 index ced882d6..00000000 --- a/script/server/monitor/monitor_server_clear.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -x - -RESOURCE_DIR=$1/monitor - -disable_prometheus() -{ - systemctl stop prometheus - systemctl disable prometheus -} - -disable_grafana() -{ - systemctl stop grafana-server - systemctl disable grafana-server -} - -uninstall_pkg() -{ - rm -f /usr/lib/systemd/system/prometheus.service - rm -rf $RESOURCE_DIR/prometheus - yum erase -y grafana.x86_64 - rm -rf /usr/share/grafana - rm -rf /var/lib/grafana - rm -rf /var/logre/grafana - rm -rf /etc/grafana -} - -main() -{ - disable_prometheus - disable_grafana - uninstall_pkg -} - -main diff --git a/script/server/monitor/monitor_server_deploy.sh b/script/server/monitor/monitor_server_deploy.sh deleted file mode 100755 index 9bc65fd5..00000000 --- a/script/server/monitor/monitor_server_deploy.sh +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/bash -x - -UPLOAD_DIR=${APP_HOME}/target/sysom_web/download/ -RESOURCE_DIR=${APP_HOME}/monitor -GRAFANA_PKG=grafana-8.2.5-1.x86_64.rpm -PROMETHEUS_VER=2.29.1 -PROMETHEUS_ARCH=linux-amd64 -PROMETHEUS_PKG=prometheus-${PROMETHEUS_VER}.${PROMETHEUS_ARCH} -PROMETHEUS_TAR=$PROMETHEUS_PKG.tar.gz -NODE_EXPORTER_VER=1.2.2 -NODE_EXPORTER_PKG=node_exporter-${NODE_EXPORTER_VER}.${PROMETHEUS_ARCH} -NODE_EXPORTER_TAR=$NODE_EXPORTER_PKG.tar.gz - -service_head=" -[Unit] -Description=SysOM Monitor Promethues -Documentation=SysOM Monitor Promethues -Wants=network-online.target -After=network-online.target - -[Service] -" - -service_tail=" - -[Install] -WantedBy=multi-user.target -" - -service_task="ExecStart=" - -start_grafana_service() -{ - systemctl daemon-reload - systemctl enable grafana-server - systemctl start grafana-server -} - -install_grafana() -{ - echo "install grafana......" - - pushd $RESOURCE_DIR - ls | grep $GRAFANA_PKG 1>/dev/null 2>/dev/null - if [ $? -ne 0 ] - then - wget https://dl.grafana.com/oss/release/$GRAFANA_PKG - ls - fi - - yum install -y $GRAFANA_PKG - popd -} - -##configure prometheus.yml to auto discovery new nodes -add_auto_discovery() -{ - pushd ${RESOURCE_DIR}/prometheus - mkdir -p node - - cat << EOF >> prometheus.yml - - job_name: 'auto_discovery' - file_sd_configs: - - files: - - "${RESOURCE_DIR}/prometheus/node/node.json" - refresh_interval: 10s -EOF - - popd - cp prometheus_get_node.py ${RESOURCE_DIR}/prometheus/ -} - -start_prometheus_service() -{ - ##create prometheus service - prometheus_exec=${RESOURCE_DIR}/prometheus/prometheus - prometheus_config="--config.file=\"${RESOURCE_DIR}/prometheus/prometheus.yml\"" - prometheus_data="--storage.tsdb.path=\"${RESOURCE_DIR}/prometheus/data/\"" - - prometheus_service_task="$service_task$prometheus_exec $prometheus_config $prometheus_data" - - cat << EOF > prometheus.service -$service_head -$prometheus_service_task -$service_tail -EOF - - cat prometheus.service - - add_auto_discovery - - mv prometheus.service /usr/lib/systemd/system - systemctl daemon-reload - systemctl enable prometheus - systemctl start prometheus -} - -##download and install prometheus -install_prometheus() -{ - echo "install prometheus......" - pushd $RESOURCE_DIR - - rm -rf prometheus - - ls | grep $PROMETHEUS_TAR 1>/dev/null 2>/dev/null - if [ $? -ne 0 ] - then - wget https://github.com/prometheus/prometheus/releases/download/v${PROMETHEUS_VER}/$PROMETHEUS_TAR - ls - fi - tar -zxvf $PROMETHEUS_TAR - - ##rename the prometheus directory - mv $PROMETHEUS_PKG prometheus - popd -} - -##download node_exporter pkg -download_node_exporter() -{ - echo "install node_exporter......" - pushd $RESOURCE_DIR - rm -rf node_exporter - - ls | grep $NODE_EXPORTER_TAR 1>/dev/null 2>/dev/null - if [ $? -ne 0 ] - then - echo "wget node_exporter" - wget https://github.com/prometheus/node_exporter/releases/download/v$NODE_EXPORTER_VER/$NODE_EXPORTER_TAR - fi - popd - -} - -configure_grafana() -{ - bash -x grafana_api_set.sh -} - -configure_cron() -{ - echo "* * * * * python3 $RESOURCE_DIR/prometheus/prometheus_get_node.py" ${APP_HOME} >> /var/spool/cron/root - echo "* * * * * sleep 10;python3 $RESOURCE_DIR/prometheus/prometheus_get_node.py" ${APP_HOME} >> /var/spool/cron/root - echo "* * * * * sleep 20;python3 $RESOURCE_DIR/prometheus/prometheus_get_node.py" ${APP_HOME} >> /var/spool/cron/root - echo "* * * * * sleep 30;python3 $RESOURCE_DIR/prometheus/prometheus_get_node.py" ${APP_HOME} >> /var/spool/cron/root - echo "* * * * * sleep 40;python3 $RESOURCE_DIR/prometheus/prometheus_get_node.py" ${APP_HOME} >> /var/spool/cron/root - echo "* * * * * sleep 50;python3 $RESOURCE_DIR/prometheus/prometheus_get_node.py" ${APP_HOME} >> /var/spool/cron/root -} - -main() -{ - yum install -y wget - echo "perpare download resource packages: grafana, prometheus, node_exporter" - mkdir -p $RESOURCE_DIR -# bash -x local_copy_pkg.sh - install_grafana - install_prometheus - download_node_exporter - - start_grafana_service - start_prometheus_service -# start_node_exporter_service - - configure_grafana - configure_cron -} - -main diff --git a/script/server/monitor/test.py b/script/server/monitor/test.py deleted file mode 100644 index 27f960ad..00000000 --- a/script/server/monitor/test.py +++ /dev/null @@ -1,17 +0,0 @@ -# test_命令行传参.py -import sys -def para_input(): - print(len(sys.argv)) # 参数序列的长度，此时所有参数存放在一个list之中 - if len(sys.argv) < 2: - sys.exit("python error") - script_name = sys.argv[0] #第一个参数指的是脚本名称 - param_first = sys.argv[1] #第二个参数，此时也是一个str列表 - param_second = sys.argv[2] #第三个参数 - - print(script_name) - print(param_first) - print(param_second) - print(type(param_second)) - print(script_name, param_first, param_second) -if __name__ == "__main__": - para_input() diff --git a/script/server/vmcore/init.sh b/script/server/vmcore/init.sh deleted file mode 120000 index 76eb4bdd..00000000 --- a/script/server/vmcore/init.sh +++ /dev/null @@ -1 +0,0 @@ -init_server.sh \ No newline at end of file diff --git a/script/server/vmcore/init_server.sh b/script/server/vmcore/init_server.sh deleted file mode 100644 index 950e6e63..00000000 --- a/script/server/vmcore/init_server.sh +++ /dev/null @@ -1,18 +0,0 @@ -#! /bin/sh -yum install nfs-utils rpcbind -y -systemctl start rpcbind && systemctl enable rpcbind -systemctl start nfs && systemctl enable nfs -if [ $? -ne 0 ];then - systemctl start nfs-server && systemctl enable nfs-server -fi - -internal_net_seg=`echo ${SERVER_IP} | awk -F"." '{print $1"."$2"."$3}'` -file_path=${APP_HOME}/vmcore/vmcore-nfs -mkdir -p ${file_path} -echo "${file_path} ${internal_net_seg}.0/24(rw,async)" >> /etc/exports -exportfs -rv -chmod -R 777 ${file_path} - -cp parse_panic.py ${APP_HOME}/vmcore -cp vmcore_const.py ${APP_HOME}/vmcore -echo "* * * * * pushd ${APP_HOME}/vmcore;python3 parse_panic.py ${file_path};popd" >> /var/spool/cron/root diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..cc9dd545 --- /dev/null +++ b/setup.py @@ -0,0 +1,77 @@ +#!/usr/bin/python3 +""" +Description: setup up the sysom +""" + +import os +from setuptools import setup, find_packages + +def use_scm_version(): + return False if version_file() else True + + +def get_version_from_file(): + vf = version_file() + if vf: + with open(vf, 'r') as file: + return file.read().strip() + + +def version_file(): + current_dir = os.path.dirname(os.path.abspath(__file__)) + version_file = os.path.join(current_dir, 'VERSION') + + if os.path.exists(version_file): + return version_file + + +def setup_requires(): + if version_file(): + return [] + else: + return ['setuptools_scm'] + + +extra_setup_args = {} +if not version_file(): + extra_setup_args.update(dict(use_scm_version=use_scm_version(), setup_requires=setup_requires())) + + +##################################################################### +setup( + name='sysom', + version=get_version_from_file(), + author='sysom team', + author_email='wangqing@uniontech.om', + description='sysom: API, UI and Task Engine', + long_description='sysom provides a web-based user interface, REST API and ' 'task engine ', + license='MIT', + url='https://gitee.com/anolis/sysom', + packages=find_packages(), + include_package_data=True, + zip_safe=False, + classifiers=[ + 'Development Status :: 5 - Production/Stable', + 'Environment :: Web Environment', + 'Framework :: Django', + 'Intended Audience :: Developers', + 'Intended Audience :: Information Technology', + 'Intended Audience :: System Administrators' 'License :: MIT', + 'Natural Language :: English', + 'Operating System :: OS Independent', + 'Operating System :: POSIX', + 'Programming Language :: Python', + 'Topic :: System :: Installation/Setup', + 'Topic :: System :: Systems Administration', + ], + data_files=[ + ('/usr/bin', ['service_scripts/sysom-python']), + ], + options={ + 'aliases': {'dev_build': 'clean --all egg_info sdist', 'release_build': 'clean --all egg_info -b "" sdist'}, + 'build_scripts': { + 'executable': '/usr/bin/sysom-python', + }, + }, + **extra_setup_args, +) diff --git a/sysom_api/sysom/__init__.py b/sysom/__init__.py similarity index 100% rename from sysom_api/sysom/__init__.py rename to sysom/__init__.py diff --git a/sysom_api/apps/__init__.py b/sysom/apps/__init__.py similarity index 100% rename from sysom_api/apps/__init__.py rename to sysom/apps/__init__.py diff --git a/sysom_api/apps/accounts/__init__.py b/sysom/apps/accounts/__init__.py similarity index 100% rename from sysom_api/apps/accounts/__init__.py rename to sysom/apps/accounts/__init__.py diff --git a/sysom_api/apps/accounts/admin.py b/sysom/apps/accounts/admin.py similarity index 100% rename from sysom_api/apps/accounts/admin.py rename to sysom/apps/accounts/admin.py diff --git a/sysom_api/apps/accounts/apps.py b/sysom/apps/accounts/apps.py similarity index 100% rename from sysom_api/apps/accounts/apps.py rename to sysom/apps/accounts/apps.py diff --git a/sysom_api/apps/accounts/authentication.py b/sysom/apps/accounts/authentication.py similarity index 100% rename from sysom_api/apps/accounts/authentication.py rename to sysom/apps/accounts/authentication.py diff --git a/sysom_api/apps/accounts/models.py b/sysom/apps/accounts/models.py similarity index 100% rename from sysom_api/apps/accounts/models.py rename to sysom/apps/accounts/models.py diff --git a/sysom_api/apps/accounts/permissions.py b/sysom/apps/accounts/permissions.py similarity index 100% rename from sysom_api/apps/accounts/permissions.py rename to sysom/apps/accounts/permissions.py diff --git a/sysom_api/apps/accounts/role.json b/sysom/apps/accounts/role.json similarity index 100% rename from sysom_api/apps/accounts/role.json rename to sysom/apps/accounts/role.json diff --git a/sysom_api/apps/accounts/serializer.py b/sysom/apps/accounts/serializer.py similarity index 100% rename from sysom_api/apps/accounts/serializer.py rename to sysom/apps/accounts/serializer.py diff --git a/sysom_api/apps/accounts/tests.py b/sysom/apps/accounts/tests.py similarity index 100% rename from sysom_api/apps/accounts/tests.py rename to sysom/apps/accounts/tests.py diff --git a/sysom_api/apps/accounts/urls.py b/sysom/apps/accounts/urls.py similarity index 100% rename from sysom_api/apps/accounts/urls.py rename to sysom/apps/accounts/urls.py diff --git a/sysom_api/apps/accounts/user.json b/sysom/apps/accounts/user.json similarity index 100% rename from sysom_api/apps/accounts/user.json rename to sysom/apps/accounts/user.json diff --git a/sysom_api/apps/accounts/views.py b/sysom/apps/accounts/views.py similarity index 100% rename from sysom_api/apps/accounts/views.py rename to sysom/apps/accounts/views.py diff --git a/sysom_api/apps/host/__init__.py b/sysom/apps/host/__init__.py similarity index 100% rename from sysom_api/apps/host/__init__.py rename to sysom/apps/host/__init__.py diff --git a/sysom_api/apps/host/admin.py b/sysom/apps/host/admin.py similarity index 100% rename from sysom_api/apps/host/admin.py rename to sysom/apps/host/admin.py diff --git a/sysom_api/apps/host/apps.py b/sysom/apps/host/apps.py similarity index 100% rename from sysom_api/apps/host/apps.py rename to sysom/apps/host/apps.py diff --git a/sysom_api/apps/host/models.py b/sysom/apps/host/models.py similarity index 100% rename from sysom_api/apps/host/models.py rename to sysom/apps/host/models.py diff --git a/sysom_api/apps/host/serializer.py b/sysom/apps/host/serializer.py similarity index 100% rename from sysom_api/apps/host/serializer.py rename to sysom/apps/host/serializer.py diff --git a/sysom_api/apps/host/tests.py b/sysom/apps/host/tests.py similarity index 100% rename from sysom_api/apps/host/tests.py rename to sysom/apps/host/tests.py diff --git a/sysom_api/apps/host/urls.py b/sysom/apps/host/urls.py similarity index 100% rename from sysom_api/apps/host/urls.py rename to sysom/apps/host/urls.py diff --git a/sysom_api/apps/host/views.py b/sysom/apps/host/views.py similarity index 100% rename from sysom_api/apps/host/views.py rename to sysom/apps/host/views.py diff --git a/sysom_api/apps/monitor/__init__.py b/sysom/apps/monitor/__init__.py similarity index 100% rename from sysom_api/apps/monitor/__init__.py rename to sysom/apps/monitor/__init__.py diff --git a/sysom_api/apps/monitor/admin.py b/sysom/apps/monitor/admin.py similarity index 100% rename from sysom_api/apps/monitor/admin.py rename to sysom/apps/monitor/admin.py diff --git a/sysom_api/apps/monitor/apps.py b/sysom/apps/monitor/apps.py similarity index 100% rename from sysom_api/apps/monitor/apps.py rename to sysom/apps/monitor/apps.py diff --git a/sysom_api/apps/monitor/models.py b/sysom/apps/monitor/models.py similarity index 100% rename from sysom_api/apps/monitor/models.py rename to sysom/apps/monitor/models.py diff --git a/sysom_api/apps/monitor/tests.py b/sysom/apps/monitor/tests.py similarity index 100% rename from sysom_api/apps/monitor/tests.py rename to sysom/apps/monitor/tests.py diff --git a/sysom_api/apps/monitor/urls.py b/sysom/apps/monitor/urls.py similarity index 100% rename from sysom_api/apps/monitor/urls.py rename to sysom/apps/monitor/urls.py diff --git a/sysom_api/apps/monitor/views.py b/sysom/apps/monitor/views.py similarity index 100% rename from sysom_api/apps/monitor/views.py rename to sysom/apps/monitor/views.py diff --git a/sysom_api/apps/task/__init__.py b/sysom/apps/task/__init__.py similarity index 100% rename from sysom_api/apps/task/__init__.py rename to sysom/apps/task/__init__.py diff --git a/sysom_api/apps/task/admin.py b/sysom/apps/task/admin.py similarity index 100% rename from sysom_api/apps/task/admin.py rename to sysom/apps/task/admin.py diff --git a/sysom_api/apps/task/apps.py b/sysom/apps/task/apps.py similarity index 100% rename from sysom_api/apps/task/apps.py rename to sysom/apps/task/apps.py diff --git a/sysom_api/apps/task/models.py b/sysom/apps/task/models.py similarity index 100% rename from sysom_api/apps/task/models.py rename to sysom/apps/task/models.py diff --git a/sysom_api/apps/task/seriaizer.py b/sysom/apps/task/seriaizer.py similarity index 100% rename from sysom_api/apps/task/seriaizer.py rename to sysom/apps/task/seriaizer.py diff --git a/sysom_api/apps/task/tests.py b/sysom/apps/task/tests.py similarity index 100% rename from sysom_api/apps/task/tests.py rename to sysom/apps/task/tests.py diff --git a/sysom_api/apps/task/urls.py b/sysom/apps/task/urls.py similarity index 100% rename from sysom_api/apps/task/urls.py rename to sysom/apps/task/urls.py diff --git a/sysom_api/apps/task/views.py b/sysom/apps/task/views.py similarity index 100% rename from sysom_api/apps/task/views.py rename to sysom/apps/task/views.py diff --git a/sysom_api/apps/vmcore/__init__.py b/sysom/apps/vmcore/__init__.py similarity index 100% rename from sysom_api/apps/vmcore/__init__.py rename to sysom/apps/vmcore/__init__.py diff --git a/sysom_api/apps/vmcore/admin.py b/sysom/apps/vmcore/admin.py similarity index 100% rename from sysom_api/apps/vmcore/admin.py rename to sysom/apps/vmcore/admin.py diff --git a/sysom_api/apps/vmcore/apps.py b/sysom/apps/vmcore/apps.py similarity index 100% rename from sysom_api/apps/vmcore/apps.py rename to sysom/apps/vmcore/apps.py diff --git a/sysom_api/apps/vmcore/models.py b/sysom/apps/vmcore/models.py similarity index 100% rename from sysom_api/apps/vmcore/models.py rename to sysom/apps/vmcore/models.py diff --git a/sysom_api/apps/vmcore/serializer.py b/sysom/apps/vmcore/serializer.py similarity index 100% rename from sysom_api/apps/vmcore/serializer.py rename to sysom/apps/vmcore/serializer.py diff --git a/sysom_api/apps/vmcore/tests.py b/sysom/apps/vmcore/tests.py similarity index 100% rename from sysom_api/apps/vmcore/tests.py rename to sysom/apps/vmcore/tests.py diff --git a/sysom_api/apps/vmcore/urls.py b/sysom/apps/vmcore/urls.py similarity index 100% rename from sysom_api/apps/vmcore/urls.py rename to sysom/apps/vmcore/urls.py diff --git a/sysom_api/apps/vmcore/views.py b/sysom/apps/vmcore/views.py similarity index 100% rename from sysom_api/apps/vmcore/views.py rename to sysom/apps/vmcore/views.py diff --git a/sysom_api/apps/vmcore/vmcore.json b/sysom/apps/vmcore/vmcore.json similarity index 100% rename from sysom_api/apps/vmcore/vmcore.json rename to sysom/apps/vmcore/vmcore.json diff --git a/sysom_api/sysom/asgi.py b/sysom/asgi.py similarity index 100% rename from sysom_api/sysom/asgi.py rename to sysom/asgi.py diff --git a/sysom_api/conf/__init__.py b/sysom/conf/__init__.py similarity index 100% rename from sysom_api/conf/__init__.py rename to sysom/conf/__init__.py diff --git a/sysom_api/conf/common.py b/sysom/conf/common.py similarity index 100% rename from sysom_api/conf/common.py rename to sysom/conf/common.py diff --git a/sysom_api/conf/develop.py b/sysom/conf/develop.py similarity index 100% rename from sysom_api/conf/develop.py rename to sysom/conf/develop.py diff --git a/sysom_api/conf/product.py b/sysom/conf/product.py similarity index 100% rename from sysom_api/conf/product.py rename to sysom/conf/product.py diff --git a/sysom_api/conf/testing.py b/sysom/conf/testing.py similarity index 100% rename from sysom_api/conf/testing.py rename to sysom/conf/testing.py diff --git a/sysom_api/consumer/__init__.py b/sysom/consumer/__init__.py similarity index 100% rename from sysom_api/consumer/__init__.py rename to sysom/consumer/__init__.py diff --git a/sysom_api/consumer/consumers.py b/sysom/consumer/consumers.py similarity index 100% rename from sysom_api/consumer/consumers.py rename to sysom/consumer/consumers.py diff --git a/sysom_api/consumer/executors.py b/sysom/consumer/executors.py similarity index 100% rename from sysom_api/consumer/executors.py rename to sysom/consumer/executors.py diff --git a/sysom_api/consumer/middleware.py b/sysom/consumer/middleware.py similarity index 100% rename from sysom_api/consumer/middleware.py rename to sysom/consumer/middleware.py diff --git a/sysom_api/consumer/routing.py b/sysom/consumer/routing.py similarity index 100% rename from sysom_api/consumer/routing.py rename to sysom/consumer/routing.py diff --git a/sysom_api/lib/__init__.py b/sysom/lib/__init__.py similarity index 100% rename from sysom_api/lib/__init__.py rename to sysom/lib/__init__.py diff --git a/sysom_api/lib/base_model.py b/sysom/lib/base_model.py similarity index 100% rename from sysom_api/lib/base_model.py rename to sysom/lib/base_model.py diff --git a/sysom_api/lib/exception.py b/sysom/lib/exception.py similarity index 100% rename from sysom_api/lib/exception.py rename to sysom/lib/exception.py diff --git a/sysom_api/lib/paginations.py b/sysom/lib/paginations.py similarity index 100% rename from sysom_api/lib/paginations.py rename to sysom/lib/paginations.py diff --git a/sysom_api/lib/response.py b/sysom/lib/response.py similarity index 100% rename from sysom_api/lib/response.py rename to sysom/lib/response.py diff --git a/sysom_api/lib/ssh.py b/sysom/lib/ssh.py similarity index 100% rename from sysom_api/lib/ssh.py rename to sysom/lib/ssh.py diff --git a/sysom_api/lib/utils.py b/sysom/lib/utils.py similarity index 100% rename from sysom_api/lib/utils.py rename to sysom/lib/utils.py diff --git a/sysom_api/sysom/settings.py b/sysom/settings.py similarity index 100% rename from sysom_api/sysom/settings.py rename to sysom/settings.py diff --git a/sysom_api/sysom/urls.py b/sysom/urls.py similarity index 100% rename from sysom_api/sysom/urls.py rename to sysom/urls.py diff --git a/sysom_api/sysom/wsgi.py b/sysom/wsgi.py similarity index 100% rename from sysom_api/sysom/wsgi.py rename to sysom/wsgi.py diff --git a/sysom_api/dockerfile b/sysom_api/dockerfile deleted file mode 100644 index c06da861..00000000 --- a/sysom_api/dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM python:3.7.5 -WORKDIR /home -RUN pip install django==3.2.3 -RUN pip install uwsgi -EXPOSE 8080 diff --git a/sysom_api/service_scripts/pingtrace b/sysom_api/service_scripts/pingtrace deleted file mode 100755 index 590802f9..00000000 --- a/sysom_api/service_scripts/pingtrace +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/python3 -# coding=utf-8 -import json -import sys - -############################################################################### -## 如前端入参是这个： -## { -## "源虚拟机私网IP":"192.168.1.101", -## "目标虚拟机私网IP":"192.168.1.102", -## "追踪包数":"100", -## "间隔毫秒数":"10", -## "报文协议":"ICMP" -## } -## 解析参数方法： -## sysak pingtrace -s -t 6 -## -t 6 来自 “追踪包数” * "间隔毫秒数” / 1000 + 5 -## 本命令运行在“目标虚拟机私网ip” -## -## sysak pingtrace_raw -c 192.168.1.102 -t 2 -i 10000 -C 100 -o log -## -c 192.168.1.102 来自 “目标虚拟机私网ip” -## -t 2 来自 “追踪包数” * "间隔毫秒数” / 1000 + 1 -## -i 10000 来自 “间隔毫秒数”* 1000 -## -C 100 来自 “追踪包数” -## 本命令运行在“源虚拟机私网ip” -############################################################################### - -args = json.loads(sys.argv[1]) -result = {} -result['commands'] = [] - -cmd0_arg = int(int(args["追踪包数"]) * int(args["间隔毫秒数"]) / 1000) + 5 -cmd0 = {} -cmd0['instance'] = args["源实例IP"] -cmd0['cmd'] = "sysak pingtrace -s -t "+str(cmd0_arg)+" &" - -cmd1 = {} -cmd1['instance'] = args["目标实例IP"] -cmd1_arg_c = args["目标实例IP"] -cmd1_arg_t = str(cmd0_arg - 4) -cmd1_arg_i = str(int(args["间隔毫秒数"]) * 1000) -cmd1_arg_C = str(args["追踪包数"]) -cmd1['cmd'] = "sysak pingtrace -c "+cmd1_arg_c+" -t "+cmd1_arg_t+" -i "+cmd1_arg_i+" -C "+cmd1_arg_C - -result['commands'].append(cmd0) -result['commands'].append(cmd1) - -data = json.dumps(result) -print(data) diff --git a/sysom_api/service_scripts/pingtrace_post b/sysom_api/service_scripts/pingtrace_post deleted file mode 100644 index d9f665a0..00000000 --- a/sysom_api/service_scripts/pingtrace_post +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/python3 -# coding=utf-8 -import sys -import os -import json -import random - -class CpingDeamon(object): - def __init__(self, f): - super(CpingDeamon, self).__init__() - self._file = f - - def proc(self): - dPing = {"stat": None, "seq": []} - for l in self._file.readlines(): - obj = json.loads(l) - if "stat" in obj: - dPing['stat'] = obj["stat"] - else: - dPing["seq"].append(obj) - s = json.dumps(dPing, indent=4) - print(s) - -if __name__ == "__main__": - fname="/tmp/pingtrace_argv_"+str(random.random()) - f=open(fname,"w+") - f.write(sys.argv[1]) - f.close() - f=open(fname,"r") - c = CpingDeamon(f) - c.proc() - f.close() - os.remove(fname) diff --git a/sysom_api/service_scripts/test b/sysom_api/service_scripts/test deleted file mode 100755 index e0c1b732..00000000 --- a/sysom_api/service_scripts/test +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -args=$1 -echo "{ - 'commands':[ - { - 'instance': '116.62.146.75', - 'cmd': 'ls /root' - }, - { - 'instance': '116.62.146.75', - 'cmd': 'ls /root && echo ${args}' - } - ] -}" \ No newline at end of file diff --git a/sysom_api/service_scripts/test.sh b/sysom_api/service_scripts/test.sh deleted file mode 100644 index d688d2c7..00000000 --- a/sysom_api/service_scripts/test.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -echo "{ - 'commands':[ - { - 'instance': '192.168.0.2', - 'cmd': 'ls /root' - }, - { - 'instance': '192.168.0.3', - 'cmd': 'ls /root' - } - ], - 'taskid': 'xxxx' -}" diff --git a/sysom_api/service_scripts/tpython b/sysom_api/service_scripts/tpython deleted file mode 100755 index 8bf65e64..00000000 --- a/sysom_api/service_scripts/tpython +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python -import json -import sys - -args = sys.argv[1] -result = { - 'commands':[ - { - 'instance': '116.62.146.75', - 'cmd': 'ls /root' - }, - { - 'instance': '116.62.146.75', - 'cmd': 'ls /; echo %s' % args, - } - ] -} -data = json.dumps(result) -print(data) diff --git a/sysom_api/setup.cfg b/sysom_api/setup.cfg deleted file mode 100644 index 8bfd5a12..00000000 --- a/sysom_api/setup.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[egg_info] -tag_build = -tag_date = 0 - diff --git a/sysom_api/setup.py b/sysom_api/setup.py deleted file mode 100644 index efdbd6e7..00000000 --- a/sysom_api/setup.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/python3 -""" -Description: setup up the sysom_api -""" - -from setuptools import setup, find_packages - -setup( - name='syspm_api', - version='1.0.0', - packages=find_packages(), - author='sysom team', - data_files=[ - ('/usr/bin', ['service_scripts/sysom-python']), - ], - zip_safe=False -) diff --git a/sysom_api/uwsgi.ini b/sysom_api/uwsgi.ini deleted file mode 100644 index 9cfa0387..00000000 --- a/sysom_api/uwsgi.ini +++ /dev/null @@ -1,10 +0,0 @@ -[uwsgi] -socket=0.0.0.0:7001 -chdir=/home/sysom/target/sysom_api -module=sysom.wsgi:application -processes=10 -master=True -vacuum=True -pidfile=/var/run/uwsgi.pid -enable-threads=true -daemonize=/home/sysom/logs/uwsgi.log diff --git a/sysom_web/public/CNAME b/sysom_web/public/CNAME deleted file mode 100644 index 30c2d4d3..00000000 --- a/sysom_web/public/CNAME +++ /dev/null @@ -1 +0,0 @@ -preview.pro.ant.design \ No newline at end of file diff --git a/sysom_web/public/favicon.ico b/sysom_web/public/favicon.ico deleted file mode 100644 index e2e93252988b5bed120ddeb168eb577bf0caa881..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4286 zcmeHLO(?8k6#ga#Gs=ufvobTd=q@y~nOLdYlqL%nQY4WqC`)z}3y~cqOAAF4VkQd~ z^3$wrC}~D1l%!eMp!|gA&U5sN?~b{2>)yNg-s#Lc-+9k_p7Y<=XqqYcDJs(Vt%dBG z=F~Lpdy*pd!Y zozZT}udJ-#| zqiAVq0sT@kAMMobbULxOw+F6{j*egO8CQ?TgTuo^+}_@zrlv;l$*-)e#PRVl?(Xgo zi9`?zg>ZFsh0DuJ)Ya9!von7LPN@OfP9IfH_4tet&&I~a#O{TK1<3*LO-xJ( zZ*Fc5%v&m4#Z&mZySs8{XJ-fV^Yh@{p`ju8d_J)w6+U%`!(qAC+uJK~qg_o+O|QC` zTVg0Y{jSHqzP^^&G0t4^cwF+$`egj?@9$AtTMLuPB>7!lUKY8&zP?xd=H_PM(U;HS ztNi!(_oJes0<5X6tu4{BxVR{FO)_x3UauFkv$I%RTSHe@7dAIHF+4mhc?|>t(!XbCXVQZk z8yje7Xh2R*&WCwdw&?N4$H!4$Uyq)i9_;V$3;y)^-LKhmkv{Z#(CP^-7Wn# zI5-H>z`y`nTU%u=f7Tbh-mg5fPT0G8`Wx6^vD1(>-r0;AFlyjWYC!!D@UQlt)%}4^ diff --git a/sysom_web/public/icons/icon-128x128.png b/sysom_web/public/icons/icon-128x128.png deleted file mode 100644 index 48d0e2339a60a637b94319c65e8654289b4f4b6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1329 zcmV-11C0002qP)t-s01zMl z|Nj6D8~_Fu01Fxg6ePmN$p8o!Wo~x>2^n*Hg!uURG(b#MUupdO{0J2!4IC;FATIs> z{@dN(0umtr1r+b_@!;a*CNn?_87S=S?pR`MN>yMYFg?=M*UQe)wYk2qw7Hs~re<$= zUubdX=<2(_!=9w6l9``_ijrw^dn`Fc6(TV7_4V=c^R2SBrmV4+ouiMHoQsl~euj;D zf{I&ZZXPQ+87DQ^+ugv!$3;(CLQPmWL{HY)+rGlaqNuHRe}`^&fKXdyK1x+FK1#;P z&4`be_4fDTmuWjt2mKnbI+d3dfa z_PK3Vs;zn;Ot~u#==o*X;a^nmOa{(_o(tmupuw*`!> z#lUp|BbBD0;J$!S0To9DO4Z9XkCjq#?=s{WNE{XLCFmLibLLfxLm3nt7Wj-&k{L;X zo_Y$L6(Ax^@lhJo2uNHK09we3_>jt`DV`HX8L^}WDJO|ULbS4T1b_}iycq`oGqNH4 zQJi@^@H`%ly#;k8%FIH(J#9^VH>(ITJX3)9M7)?mVD;pNM){2bV!rABC{yFeZXJ$q ztx`Yw*~Rj#FGR_Att-g zD?cOlXM^rD8S|s+a(LB7MePP8cKc zywqQW@o0gm8Qu`-)UW-9#K*uQ5WQT5&CGnc%phPyF4p1{wj=@#5xikX3uI#(QrZ2A z66>Nxz+a;r*Km#iEGXxR4BFJu%9#^UG{?XqFlA~7sH!J&2X_C6*P7#50#^tYfm`)p zW2Pupno-5;QoKQ)pCj;SS_MKc4Ai#W7h-YyLi$8b7l@8b3KjwX8wCk}6<4mh7hj6_ z@bnBUa)|InAVBSV)+C{3Cf$?e`b2@nQysp0$(swOoN^Eg(SO9p-Q1JJAAwzQCMaKm&bGV`U^9&pp0Gf^+nkRf5 zTo3@>xi{%p{gIpTF5iJBic@aIws^IC=-v{M~W@Y%aj8G0o!r2b|HdROb8D$LP+n;FWCW`~3a=G(k;6PFes57kh(>00a~S6Cwx} zCE()Z^7Hf|E zp{K0H$jr97ziM-QXK;BCA1!ozgl>0$_4f8XNmSCn^FkCmKwfQVshbU{p46e2L| z?Ct65?BnI;*4f+4&(glZ#fXoVgo~3^UusNOVjC$ov9`LWtg%K>TsK2c$;{8e#mKwA z!>qBksjjnFVr-b6q?4MUQCw!>t&JT300tCEL_t(|+U?tESK2@nfZ>~&tE5s!683!u zK~Xjr+;FLD`~QDWsaSMof{9Cdrsv$}Q$GacB{NB8tUw4Mgb+dqA%qY@2qA(L2bqdsgXsNTkuvsd$l2J=n5?~ND zV51VpX8=z3{QjGMB}&;~4lO{w(%Zazp$0@daWIEhfP~dcYQd#z&@Au`02`W0K*FSZ zfqww-)R9s!Ht2yOKmf3z60nW%2IP#}oH2Xl0XAm~+{S+rP&t$X9^nbbm-x&1;@!yj zY%9B7sWA>ZWO1jKtCah(e))TD=Eenv9so{D4rn_thqYd2VK|ELzaOufx!t$^NZw>p z+Iyj>U-gQu^kN;GPyD#d{Hh5IJ3uJYc+Z77Ufo$Ggo+WA3Y*@1Ky13)LZP31QSeOBPQ+XWH1FRE< znBBKzO$T4zWLDa@R>>EuJj^qYQEmht0qwfj(!SqQ@iKSEQ|m2>2OGl+_^GUFJOcJ= zXWHkFZpC2%v9sp4{dDSJXp{It8QP8>kQnV+s>T(A1*ey{eEoDWoB-?=l!qbE1M&?^ zlg>TQVZNQW0vG^>5+Gs?WoT;w-lorADbq%mw`k7}=L`%i*#i$2a3L12&mCI9?2mZ} z0W6}7?qr1p3pjZ?4xKwIs2_Fw@&LQuwzS(*uz)OwIWgMMHdb!T{tPE4SL`S{H8xBn!v4)5iQu&kynG zu&g>v%A749U2|<^9&fVG1>_^~CFZ7LP5t_J?7+%^=uNif%+;?)oeFwB$`&F5UWnO^ z@}M}gKew%NvbE6ZWlDEPmWMOGGN93O87@!W;veOx{0)tnve;1G63u~Z#6xV7>iY035`Xj%Y> z^Q5IJ+!Y6p_dlYRYQ(^}0Dwm;s0$Yi48Tdj3g$4vO$-3uKeU2KKGd0O0O0VXbm7s4;+l9&n%p_`cvI z?LB&meH%ahXIS9}0Jn2n$9YS(u{W#$gO9RPz0KE#GlYO}vMs$dg#n^%CpUU*6%xDq zjs0(lqaT-@s*4=qi*zHU+H4m-VgiXywKHFAtzxV0RWJzsovKI0FJxD0TBWR9R(cUae(Kj zsHF%%MItH28Xp(4*{bSm0T9Fm0Q3xia~uV&0pKeFz=jn7(rEx(_sVL}lf@aG=xQ21 z0F-Q4EcX2Td}n9x&+_W8>Dj@bW1Zc-_04UCC6!U}srDWLO4_FE!gBaD92g8{VR7ke zeM?AW92o=O(D2yXclnR)y=d4(E-o&bT05P*g06FjUtV6efBWI#2OS@uWaJd^OFd|4 zX;(M2f>E+f{F>2!?AX@%T}(mq>gp=@<7Y-5siUJ~-_R&H)yX)dzBXt+ zw3(irC-{#uAUx*V_rCAF0|y6(^qk`23R+NfVtI9aeo@&CE(t4VpY6XpJmUB8uHDiy zwv9=Ab9i`ka&k&{ODsM)GxBB9kG{dJ?Y|`SJP2xb|L_=>Cn3tZ=GbsG#NjrD{p8lZ+I*;#ZnN-&`)3V#iUD zMPI6J3dwTaR#efm@D7ZSx~Kc$)0fQLLZ9GgMwTwT5=zbJZ|@6AUcO3G4f|Pz+YOkF zhRS^y7A`o43kXqaS`P?+li?F^ab$DRnFBz%pmtx;FkotX)-fdI0SkIBo$3`kjGW}D zZoDeqLtS3Q2M@@N^6~Cb6R{D+s3aFqxA6=o*eHod92P`F`24wEin51>RC@xG+Cw7; zO)`T9mP{{KyOZ{F0<#_c5Bhd4GTu4*uXH<{{3_)6x4r)lr){`JohSKG%?$A}zhMc= zW|@O)q8WsJQ6EdzmKROG;U@_#(HhDuk8bo;Ho`*6l-2u9HLE*dOv$E=6gvnZLNCqP zprds6w}?9hZO+b`b-ggB&>$s;nRQSt|AE@)FA7Ls_I33&;P}~m=VyWbcR}f(OIN21 zGvpB_DYkJ<3MQsNhOEYodj;5({(pE0$4P!F$)xqVIwo83~69g=48RK+49na7Q(C zC7>Jw*DbzEje?QUe|LGt3nX|7Uz)%oP2zR&b4Op@R)(SMB<|5c3@$a63w&>G*}*

*C7T$?5!b= z&nPVm(<;~Sw_*kJlio|*qhI8#F?9y#@jvQ4Y?j2~r_a^)YoQ-co4WFOwF)i5mFnrV zp3rz^`K|nrI`guQ$X^%JuCI5qSS(}Tc|%+~o}P6dC={o1Q&<)3lnFnXE=l2Po$K4W zYZ0|2<3Cp|&)NE>;p=Muwg#BLXuboTJ(mwtjLbtdOE_A4n^}l29p9@>4vpS+t*^qG zb2Uo-W$@vKeR}iztf6tJTUh8=^kh_EBe^3f?1b(p_oBq&dpqW$pAyBB**bIt4BhwK zX02JE@mc}FExq0q+5_8B#EP&@;6-lx4t~)@$HBEBXnIqX0E$mhb$(} zt|vYUzekLn0SQ;Cd)J1 zXF3gv$u52+$>oQVvh7DxPpKeWD4yJgdWQQ`D#($Z=j%Df!iAxvR)-y7Ie5nI39+zG z4a3_4mE;SBh@MK8p%(n|yGj>Ao>j51ETLI#vuUt#g|%FDZG}&kbEb(|*9!RyL&U?| zvNnv+oEL_*R{Mw_;x+O`vNWUXL6>@M)sQr_lmlng7?sCaDH0YaGf%+R1ZM}9#$j$3 zi}N01^7uoRgvG74Fxi{415}={tg=gDHuqwR$1?9qlK<#~ zLG@an>_SlEY6+k8PD+S)C&NU7!~`$+Sin{JS2aLn_Jm#q|8H%OnLqt&n-f~C7KW9K z>QxTE1D!cV+(E>-8N#r>Aw98T*8=odDM_y2&?=ag7-=Rj&p%xvU zq=o{%T2@T(b@VqinV#`~IN4t3^z$HE=3~ZiDQ=xP6Gt)g;q1Wv2N&CBx=Ndw5 z6U*fS@;@VBF^MGsyag~+Eq&2UZ@5SG$!SM2ckBL!E1lBg>*t^{Lqn=cK^-Rhc#S(% zuAqbI(^+PqN#)t&5xr~v&*Y$qZ$3Yz)nRe`ZZcJUU8hd=)9$7 z6n-k7p||Esq}igp(IoxtD&_5A!OwcTvM3p-HHJGcVh|>N13O;!W%RXd{Y6@BEp1Jz zHCH!~H~lR%<3E0b>}>_dD6Ef8r_)LSp}O5L`DerkKk|Jc@n6*BmU&r@TKhG$-x=>`wv*Vj%M=6<7!P7~3+)?^D>AA~&^F+{mzBAMLh zuTiItS}IqcPpj-t;W15ahnBV9rHnrShN-@GCY+EyXV6Gass&4cM~^;F?z{3+SXKe7 zX8rBU7Fc!Kr5M!K@lDd)Bl)VMR)yb6;AHxpH?Q1Bx14XQy~`&ggyC$4u>az;q|C7G ziTI-A3y9BZbxP7rW4_G!ju{^(NOZstl}tvVR+j8_B`~)2cWn2~;amI9u@_9oSC+Xc z_+DcYbc7S~MIl7Fjk6qEWXDo6>n5U0O4P_k15Z^c%P@0?*Oaj8%BIU*uy|Vgi@eqH zPKZqrW$wXWQ9=QoQrY4VBCFzACRJhEv+U(FOmx1_uwVirtukLVbyF&%?xKU6D>Yot zj6ZW-1$@|ASwJlAu1;!K9!5uPdov-?7RK^;L%bs%6z9abcvP!i20^{1|g}`{&O=}R+#D;J+z#Fj(x6k%xY0!5_DrzSsTCn;pu^6 zIZV~_c4b?yxFutJZTc`BT4+(N21dx%Bxx5_=*+^Gl`PCmvS7QnNZUr>RqS>smtAo7 z%1fV4h6YI+Y2X$?ZuQmeFj!XWfPJxAc1<0;;3C|?V?=BITB{AnSkYW;+Vbas9ODwo zC?uf|l|KjLdt@iP*&!CGbh&OT1l3&s3RD|7knGOc{T%o)WLqmqSnTE5-M^OKN+8ct1C(XwQJJg%OozV)cJ^w# zVxbg~z7OMwn+eEPaBRR0KIDX14Kb^G-Strc8r6QmoINnF;F1;|U5n3%rdT9(U0dcP zI*}ZU>2wFp1u1KmK2cwSwk|=oZ8?l*@yIPBD3BPN(BINzFh#VAKBpVxZ71*JgwpWXLZfS%KkGa_tQn0bX5)h8 z6Q7LGdb=)NQ}a}>SD{8~!ga|bE*aS_Nxg_+ojhQ1{b@sVzaX)Z{rV-1%Qa*ioSy65 zb4ke$#&Mf>xuBg{&aCGNbhbOGbN4XT4?qQpRW^!2z;9eCH6fH7)+qpWe;n~*tCIq= z&w&jc@_tBWRiS3IyovPwt~fl#1Z-%o%T_B%)sO*FrOIkz-1r$#mr+&N2J06a?u1<~QB}EoR?wnU)c32Ew0(EP^w=K@< zM;7MeoWTwa-$09MwD#{-p5K@kGTM6q@*9`~NBz#snAQt$W%fZr`qk|A%IEM4|B(?x zOpx+g1-*Q?a%JHpKf|Cs>MCBj^^EmKDb?*U1(_uF({whek67oi^wL)^XH3=`&u$U^ z*K&AEIc$ISs)O2r7emK9XW_i^6Jxw-Ug6tIn{3gqAYG+j_U1<)>HovW7l7Z>STIh4 z7OH$pfQM^<6ZPN`%FY^PFKzq89tYsIi0BGroup 28 Copy 5Created with Sketch. \ No newline at end of file diff --git a/sysom_web/public/pro_icon.svg b/sysom_web/public/pro_icon.svg deleted file mode 100644 index e075b78d..00000000 --- a/sysom_web/public/pro_icon.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/tools/deploy/deploy.sh b/tools/deploy/deploy.sh deleted file mode 100755 index a3e797d2..00000000 --- a/tools/deploy/deploy.sh +++ /dev/null @@ -1,178 +0,0 @@ -#!/bin/bash -#****************************************************************# -# ScriptName: deploy.sh -# Author: algalon -# Create Date: 2021-11-13 22:42 -# Modify Date: 2021-11-16 00:02 -# Function: deploy sysom -#***************************************************************# - -ALIYUN_MIRROR="https://mirrors.aliyun.com/pypi/simple/" -APP_NAME="sysom" -API_DIR="sysom_api" -WEB_DIR="sysom_web" -SCRIPT_DIR="script" - -if [ $# != 3 ] ; then - echo "USAGE: $0 INSTALL_DIR Internal_IP EXTERNAL_IP" - echo " e.g.: $0 /usr/local/sysom 192.168.0.100 120.26.xx.xx" - exit 1 -fi - -APP_HOME=$1 -SERVER_IP=$2 -OUTER_IP=$3 - -export APP_HOME=${APP_HOME} -export SERVER_IP=${SERVER_IP} - -VIRTUALENV_HOME="${APP_HOME}/virtualenv" -TARGET_PATH="${APP_HOME}/target" - -if [ "$UID" -ne 0 ]; then - echo "Please run as root" - exit 1 -fi - -mkdir -p ${APP_HOME} - -touch_env_rpms() { - if [ -f /etc/alios-release ]; then - if [ ! -f /etc/yum.repos.d/epel.repo ]; then - wget -O /etc/yum.repos.d/epel.repo http://mirrors.aliyun.com/repo/epel-7.repo - fi - elif [ -f /etc/anolis-release ]; then - sed -i '/epel\/8\/Everything/{n;s/enabled=0/enabled=1/;}' /etc/yum.repos.d/AnolisOS-DDE.repo - fi - rpm -q --quiet python3 || yum install -y python3 - rpm -q --quiet python3-virtualenv || yum install -y python3-virtualenv - rpm -q --quiet mariadb-server || yum install -y mariadb-server - rpm -q --quiet supervisor || yum install -y supervisor - rpm -q --quiet nginx || yum install -y nginx - rpm -q --quiet gcc || yum install -y gcc -} - -touch_virtualenv() { - mkdir -p ~/.pip - cp tools/deploy/pip.conf ~/.pip/ - if [ -d ${VIRTUALENV_HOME} ]; then - echo "virtualenv exists, skip" - else - virtualenv-3 ${VIRTUALENV_HOME} - if [ "$?" = 0 ]; then - echo "INFO: create virtualenv success" - else - echo "ERROR: create virtualenv failed" - exit 1 - fi - fi - echo "INFO: activate virtualenv..." - source ${VIRTUALENV_HOME}/bin/activate || exit 1 -} - - -update_target() { - if [ -d "${TARGET_PATH}" ]; then - rm -rf ${TARGET_PATH} - fi - mkdir -p ${TARGET_PATH} - echo "INFO: copy project file..." - cp -r ${API_DIR} ${WEB_DIR} ${TARGET_PATH} - -} - -check_requirements() { - echo "INFO: begin install requirements..." - - if ! [ -d ${APP_HOME}/logs/ ]; then - mkdir -p ${APP_HOME}/logs/ || exit 1 - fi - - local requirements_log="${APP_HOME}/logs/${APP_NAME}_requirements.log" - local requirements="${API_DIR}/requirements.txt" - python_version=$(python -V | cut -b 8-10) - if [ ${python_version} == "3.6" ];then - requirements="tools/deploy/requirements.txt" - fi - touch "$requirements_log" || exit - pip install pytest-runner cffi - pip install -r ${requirements} -i "${ALIYUN_MIRROR}" |tee -a "${requirements_log}" || exit 1 - local pip_res=$? - if [ $pip_res -ne 0 ]; then - echo "ERROR: requirements not satisfied and auto install failed, please check ${requirements_log}" - exit 1 - fi -} - -setup_database() { - systemctl restart mariadb.service - systemctl enable mariadb.service - mysql -uroot -e "create user 'sysom'@'%' identified by 'sysom_admin';" - mysql -uroot -e "grant usage on *.* to 'sysom'@'localhost' identified by 'sysom_admin'" - mysql -uroot -e "drop database sysom;" - mysql -uroot -e "create database sysom character set utf8;" - mysql -uroot -e "grant all privileges on sysom.* to 'sysom'@'%';" - mysql -uroot -e "flush privileges;" -} - -init_conf() { - mkdir -p /run/daphne - cp tools/deploy/nginx.conf /etc/nginx/ - cp tools/deploy/sysom.conf /etc/nginx/conf.d/ - sed -i "s;/home/sysom;${APP_HOME};g" /etc/nginx/conf.d/sysom.conf - cp tools/deploy/sysom.ini /etc/supervisord.d/ - sed -i "s;/home/sysom;${APP_HOME};g" /etc/supervisord.d/sysom.ini - cp tools/deploy/uwsgi.ini ${TARGET_PATH}/${API_DIR} - sed -i "s;/home/sysom;${APP_HOME};g" ${TARGET_PATH}/${API_DIR}/uwsgi.ini - pushd ${TARGET_PATH}/${API_DIR} - rm -f apps/*/migrations/00*.py - python manage.py makemigrations accounts - python manage.py makemigrations host - python manage.py makemigrations vmcore - python manage.py makemigrations task - python manage.py makemigrations monitor - python manage.py migrate - python manage.py loaddata ./apps/accounts/user.json - python manage.py loaddata ./apps/vmcore/vmcore.json - popd -} - -start_app() { - systemctl enable nginx.service - systemctl enable supervisord.service - systemctl restart nginx.service - systemctl restart supervisord.service -} - -start_script_server() { - pushd ${SCRIPT_DIR}/server - bash -x init.sh - popd -} - -start_script_node() { - pushd ${SCRIPT_DIR}/node - bash -x pre_init.sh - popd -} - -modify_grafana_url() { - pushd ${TARGET_PATH}/${WEB_DIR} - sed -i "s/127.0.0.1:3000/${OUTER_IP}\/grafana/g" p__monitor__SystemDashboard*js - popd -} - -deploy() { - touch_env_rpms - touch_virtualenv - update_target - check_requirements - setup_database > ${APP_HOME}/logs/${APP_NAME}_setup_database.log 2>&1 - init_conf - start_script_server - start_script_node - modify_grafana_url - start_app -} - -deploy diff --git a/tools/deploy/nginx.conf b/tools/deploy/nginx.conf deleted file mode 100644 index 959830cd..00000000 --- a/tools/deploy/nginx.conf +++ /dev/null @@ -1,68 +0,0 @@ -# For more information on configuration, see: -# * Official English Documentation: http://nginx.org/en/docs/ -# * Official Russian Documentation: http://nginx.org/ru/docs/ - -user nginx; -worker_processes auto; -error_log /var/log/nginx/error.log; -pid /run/nginx.pid; - -# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic. -include /usr/share/nginx/modules/*.conf; - -events { - worker_connections 1024; -} - -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - server_tokens off; - keepalive_timeout 0; - types_hash_max_size 4096; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - - # Load modular configuration files from the /etc/nginx/conf.d directory. - # See http://nginx.org/en/docs/ngx_core_module.html#include - # for more information. - include /etc/nginx/conf.d/*.conf; - - -# Settings for a TLS enabled server. -# -# server { -# listen 443 ssl http2; -# listen [::]:443 ssl http2; -# server_name _; -# root /usr/share/nginx/html; -# -# ssl_certificate "/etc/pki/nginx/server.crt"; -# ssl_certificate_key "/etc/pki/nginx/private/server.key"; -# ssl_session_cache shared:SSL:1m; -# ssl_session_timeout 10m; -# ssl_ciphers HIGH:!aNULL:!MD5; -# ssl_prefer_server_ciphers on; -# -# # Load configuration files for the default server block. -# include /etc/nginx/default.d/*.conf; -# -# error_page 404 /404.html; -# location = /40x.html { -# } -# -# error_page 500 502 503 504 /50x.html; -# location = /50x.html { -# } -# } - -} - diff --git a/tools/deploy/pip.conf b/tools/deploy/pip.conf deleted file mode 100644 index ccb91ab5..00000000 --- a/tools/deploy/pip.conf +++ /dev/null @@ -1,8 +0,0 @@ -## Note, this file is written by cloud-init on first boot of an instance -## modifications made here will not survive a re-bundle. -### -[global] -index-url=https://mirrors.aliyun.com/pypi/simple/ - -[install] -trusted-host=mirrors.aliyun.com diff --git a/tools/deploy/requirements.txt b/tools/deploy/requirements.txt deleted file mode 100644 index 48b1d885..00000000 --- a/tools/deploy/requirements.txt +++ /dev/null @@ -1,70 +0,0 @@ -APScheduler==3.8.1 -aioredis==1.3.1 -asgiref==3.4.1 -async-timeout==3.0.1 -attrs==21.2.0 -autobahn==21.2.1 -Automat==20.2.0 -autopep8==1.6.0 -bcrypt==3.2.0 -cairocffi==1.2.0 -CairoSVG==2.5.2 -certifi==2021.10.8 -cffi==1.15.0 -channels==3.0.4 -channels-redis==3.3.1 -charset-normalizer==2.0.7 -constantly==15.1.0 -coreapi==2.3.3 -coreschema==0.0.4 -cryptography==35.0.0 -cssselect2==0.4.1 -daphne==3.0.2 -defusedxml==0.7.1 -Django==3.2.8 -django-cors-headers==3.10.0 -django-filter==21.1 -django-redis==5.0.0 -djangorestframework==3.12.2 -djangorestframework-jwt==1.11.0 -drf-yasg==1.20.0 -hiredis==2.0.0 -hyperlink==21.0.0 -idna==3.3 -incremental==21.3.0 -inflection==0.5.1 -install==1.3.4 -itypes==1.2.0 -Jinja2==3.0.2 -MarkupSafe==2.0.1 -msgpack==1.0.2 -packaging==21.0 -paramiko==2.8.0 -Pillow==8.4.0 -pyasn1==0.4.8 -pyasn1-modules==0.2.8 -pycodestyle==2.8.0 -pycparser==2.20 -PyJWT==1.7.1 -PyMySQL==1.0.2 -PyNaCl==1.4.0 -pyOpenSSL==21.0.0 -pyparsing==3.0.3 -pytz==2021.3 -redis==3.5.3 -requests==2.26.0 -ruamel.yaml==0.17.16 -ruamel.yaml.clib==0.2.6 -service-identity==21.1.0 -six==1.16.0 -sqlparse==0.4.2 -tinycss2==1.1.0 -toml==0.10.2 -Twisted==21.7.0 -txaio==21.2.1 -typing-extensions==3.10.0.2 -uritemplate==4.1.1 -urllib3==1.26.7 -uWSGI==2.0.19.1 -webencodings==0.5.1 -zope.interface==5.4.0 diff --git a/tools/deploy/sysom-uwsgi.ini b/tools/deploy/sysom-uwsgi.ini deleted file mode 100644 index c1597281..00000000 --- a/tools/deploy/sysom-uwsgi.ini +++ /dev/null @@ -1,9 +0,0 @@ -[program:sysom] -directory = /home/sysom/target/sysom_api -command=/home/sysom/virtualenv/bin/uwsgi --ini /home/sysom/target/sysom_api/uwsgi.ini --catch-exceptions --protocol=http -autostart=true -autorestart=true -redirect_stderr=true -stopasgroup=true -stdout_logfile=/home/sysom/logs/supervisor.log -environment=PATH="/home/sysom/virtualenv/bin" diff --git a/tools/deploy/uwsgi.ini b/tools/deploy/uwsgi.ini deleted file mode 100644 index 9cfa0387..00000000 --- a/tools/deploy/uwsgi.ini +++ /dev/null @@ -1,10 +0,0 @@ -[uwsgi] -socket=0.0.0.0:7001 -chdir=/home/sysom/target/sysom_api -module=sysom.wsgi:application -processes=10 -master=True -vacuum=True -pidfile=/var/run/uwsgi.pid -enable-threads=true -daemonize=/home/sysom/logs/uwsgi.log diff --git a/script/server/monitor/grafana_api_set.sh b/tools/grafana/grafana_api_set.sh similarity index 100% rename from script/server/monitor/grafana_api_set.sh rename to tools/grafana/grafana_api_set.sh diff --git a/script/server/monitor/netinfo_dashboard.json b/tools/grafana/netinfo_dashboard.json similarity index 100% rename from script/server/monitor/netinfo_dashboard.json rename to tools/grafana/netinfo_dashboard.json diff --git a/script/server/monitor/netinfo_dashboard_new.json b/tools/grafana/netinfo_dashboard_new.json similarity index 100% rename from script/server/monitor/netinfo_dashboard_new.json rename to tools/grafana/netinfo_dashboard_new.json diff --git a/script/server/monitor/sysom-dashboard.json b/tools/grafana/sysom-dashboard.json similarity index 100% rename from script/server/monitor/sysom-dashboard.json rename to tools/grafana/sysom-dashboard.json diff --git a/tools/deploy/sysom.conf b/tools/nginx/nginx-sysom.conf similarity index 95% rename from tools/deploy/sysom.conf rename to tools/nginx/nginx-sysom.conf index 5895d4be..e740f7fa 100644 --- a/tools/deploy/sysom.conf +++ b/tools/nginx/nginx-sysom.conf @@ -5,7 +5,7 @@ upstream daphne { server { listen 80; server_name _; - root /var/lib/sysom/ui; + root /var/lib/sysom/ui/dist; index index.html; client_max_body_size 20m; diff --git a/script/server/monitor/prometheus_get_node.py b/tools/prometheus/prometheus_get_node.py similarity index 100% rename from script/server/monitor/prometheus_get_node.py rename to tools/prometheus/prometheus_get_node.py diff --git a/sysom_api/service_scripts/sysom-python b/tools/scripts/sysom-python similarity index 100% rename from sysom_api/service_scripts/sysom-python rename to tools/scripts/sysom-python diff --git a/tools/deploy/sysom.ini b/tools/supervisord/sysom.ini similarity index 100% rename from tools/deploy/sysom.ini rename to tools/supervisord/sysom.ini diff --git a/script/server/vmcore/parse_panic.py b/tools/vmcore/parse_panic.py similarity index 100% rename from script/server/vmcore/parse_panic.py rename to tools/vmcore/parse_panic.py diff --git a/script/node/vmcore/vmcore_collect.py b/tools/vmcore/vmcore_collect.py similarity index 100% rename from script/node/vmcore/vmcore_collect.py rename to tools/vmcore/vmcore_collect.py diff --git a/script/server/vmcore/vmcore_const.py b/tools/vmcore/vmcore_const.py similarity index 100% rename from script/server/vmcore/vmcore_const.py rename to tools/vmcore/vmcore_const.py diff --git a/sysom_web/README.md b/ui/README.md similarity index 100% rename from sysom_web/README.md rename to ui/README.md diff --git a/sysom_web/config/config.dev.js b/ui/config/config.dev.js similarity index 100% rename from sysom_web/config/config.dev.js rename to ui/config/config.dev.js diff --git a/sysom_web/config/config.js b/ui/config/config.js similarity index 100% rename from sysom_web/config/config.js rename to ui/config/config.js diff --git a/sysom_web/config/defaultSettings.js b/ui/config/defaultSettings.js similarity index 100% rename from sysom_web/config/defaultSettings.js rename to ui/config/defaultSettings.js diff --git a/sysom_web/config/oneapi.json b/ui/config/oneapi.json similarity index 100% rename from sysom_web/config/oneapi.json rename to ui/config/oneapi.json diff --git a/sysom_web/config/proxy.js b/ui/config/proxy.js similarity index 100% rename from sysom_web/config/proxy.js rename to ui/config/proxy.js diff --git a/sysom_web/config/routes.js b/ui/config/routes.js similarity index 100% rename from sysom_web/config/routes.js rename to ui/config/routes.js diff --git a/sysom_web/jest.config.js b/ui/jest.config.js similarity index 100% rename from sysom_web/jest.config.js rename to ui/jest.config.js diff --git a/sysom_web/jsconfig.json b/ui/jsconfig.json similarity index 100% rename from sysom_web/jsconfig.json rename to ui/jsconfig.json diff --git a/sysom_web/package.json b/ui/package.json similarity index 100% rename from sysom_web/package.json rename to ui/package.json diff --git a/sysom_web/dist/CNAME b/ui/public/CNAME similarity index 100% rename from sysom_web/dist/CNAME rename to ui/public/CNAME diff --git a/sysom_web/dist/favicon.ico b/ui/public/favicon.ico similarity index 100% rename from sysom_web/dist/favicon.ico rename to ui/public/favicon.ico diff --git a/sysom_web/dist/icons/icon-128x128.png b/ui/public/icons/icon-128x128.png similarity index 100% rename from sysom_web/dist/icons/icon-128x128.png rename to ui/public/icons/icon-128x128.png diff --git a/sysom_web/dist/icons/icon-192x192.png b/ui/public/icons/icon-192x192.png similarity index 100% rename from sysom_web/dist/icons/icon-192x192.png rename to ui/public/icons/icon-192x192.png diff --git a/sysom_web/dist/icons/icon-512x512.png b/ui/public/icons/icon-512x512.png similarity index 100% rename from sysom_web/dist/icons/icon-512x512.png rename to ui/public/icons/icon-512x512.png diff --git a/sysom_web/dist/logo.svg b/ui/public/logo.svg similarity index 100% rename from sysom_web/dist/logo.svg rename to ui/public/logo.svg diff --git a/sysom_web/dist/pro_icon.svg b/ui/public/pro_icon.svg similarity index 100% rename from sysom_web/dist/pro_icon.svg rename to ui/public/pro_icon.svg diff --git a/sysom_web/src/access.js b/ui/src/access.js similarity index 100% rename from sysom_web/src/access.js rename to ui/src/access.js diff --git a/sysom_web/src/app.jsx b/ui/src/app.jsx similarity index 100% rename from sysom_web/src/app.jsx rename to ui/src/app.jsx diff --git a/sysom_web/src/components/Footer/index.jsx b/ui/src/components/Footer/index.jsx similarity index 100% rename from sysom_web/src/components/Footer/index.jsx rename to ui/src/components/Footer/index.jsx diff --git a/sysom_web/src/components/HeaderDropdown/index.jsx b/ui/src/components/HeaderDropdown/index.jsx similarity index 100% rename from sysom_web/src/components/HeaderDropdown/index.jsx rename to ui/src/components/HeaderDropdown/index.jsx diff --git a/sysom_web/src/components/HeaderDropdown/index.less b/ui/src/components/HeaderDropdown/index.less similarity index 100% rename from sysom_web/src/components/HeaderDropdown/index.less rename to ui/src/components/HeaderDropdown/index.less diff --git a/sysom_web/src/components/HeaderSearch/index.jsx b/ui/src/components/HeaderSearch/index.jsx similarity index 100% rename from sysom_web/src/components/HeaderSearch/index.jsx rename to ui/src/components/HeaderSearch/index.jsx diff --git a/sysom_web/src/components/HeaderSearch/index.less b/ui/src/components/HeaderSearch/index.less similarity index 100% rename from sysom_web/src/components/HeaderSearch/index.less rename to ui/src/components/HeaderSearch/index.less diff --git a/sysom_web/src/components/NoticeIcon/NoticeIcon.jsx b/ui/src/components/NoticeIcon/NoticeIcon.jsx similarity index 100% rename from sysom_web/src/components/NoticeIcon/NoticeIcon.jsx rename to ui/src/components/NoticeIcon/NoticeIcon.jsx diff --git a/sysom_web/src/components/NoticeIcon/NoticeList.jsx b/ui/src/components/NoticeIcon/NoticeList.jsx similarity index 100% rename from sysom_web/src/components/NoticeIcon/NoticeList.jsx rename to ui/src/components/NoticeIcon/NoticeList.jsx diff --git a/sysom_web/src/components/NoticeIcon/NoticeList.less b/ui/src/components/NoticeIcon/NoticeList.less similarity index 100% rename from sysom_web/src/components/NoticeIcon/NoticeList.less rename to ui/src/components/NoticeIcon/NoticeList.less diff --git a/sysom_web/src/components/NoticeIcon/index.jsx b/ui/src/components/NoticeIcon/index.jsx similarity index 100% rename from sysom_web/src/components/NoticeIcon/index.jsx rename to ui/src/components/NoticeIcon/index.jsx diff --git a/sysom_web/src/components/NoticeIcon/index.less b/ui/src/components/NoticeIcon/index.less similarity index 100% rename from sysom_web/src/components/NoticeIcon/index.less rename to ui/src/components/NoticeIcon/index.less diff --git a/sysom_web/src/components/RightContent/AvatarDropdown.jsx b/ui/src/components/RightContent/AvatarDropdown.jsx similarity index 100% rename from sysom_web/src/components/RightContent/AvatarDropdown.jsx rename to ui/src/components/RightContent/AvatarDropdown.jsx diff --git a/sysom_web/src/components/RightContent/index.jsx b/ui/src/components/RightContent/index.jsx similarity index 100% rename from sysom_web/src/components/RightContent/index.jsx rename to ui/src/components/RightContent/index.jsx diff --git a/sysom_web/src/components/RightContent/index.less b/ui/src/components/RightContent/index.less similarity index 100% rename from sysom_web/src/components/RightContent/index.less rename to ui/src/components/RightContent/index.less diff --git a/sysom_web/src/components/WebConsole/index.jsx b/ui/src/components/WebConsole/index.jsx similarity index 100% rename from sysom_web/src/components/WebConsole/index.jsx rename to ui/src/components/WebConsole/index.jsx diff --git a/sysom_web/src/components/WebConsole/index.less b/ui/src/components/WebConsole/index.less similarity index 100% rename from sysom_web/src/components/WebConsole/index.less rename to ui/src/components/WebConsole/index.less diff --git a/sysom_web/src/components/index.md b/ui/src/components/index.md similarity index 100% rename from sysom_web/src/components/index.md rename to ui/src/components/index.md diff --git a/sysom_web/src/e2e/baseLayout.e2e.js b/ui/src/e2e/baseLayout.e2e.js similarity index 100% rename from sysom_web/src/e2e/baseLayout.e2e.js rename to ui/src/e2e/baseLayout.e2e.js diff --git a/sysom_web/src/global.jsx b/ui/src/global.jsx similarity index 100% rename from sysom_web/src/global.jsx rename to ui/src/global.jsx diff --git a/sysom_web/src/global.less b/ui/src/global.less similarity index 100% rename from sysom_web/src/global.less rename to ui/src/global.less diff --git a/sysom_web/src/locales/bn-BD.js b/ui/src/locales/bn-BD.js similarity index 100% rename from sysom_web/src/locales/bn-BD.js rename to ui/src/locales/bn-BD.js diff --git a/sysom_web/src/locales/bn-BD/component.js b/ui/src/locales/bn-BD/component.js similarity index 100% rename from sysom_web/src/locales/bn-BD/component.js rename to ui/src/locales/bn-BD/component.js diff --git a/sysom_web/src/locales/bn-BD/globalHeader.js b/ui/src/locales/bn-BD/globalHeader.js similarity index 100% rename from sysom_web/src/locales/bn-BD/globalHeader.js rename to ui/src/locales/bn-BD/globalHeader.js diff --git a/sysom_web/src/locales/bn-BD/menu.js b/ui/src/locales/bn-BD/menu.js similarity index 100% rename from sysom_web/src/locales/bn-BD/menu.js rename to ui/src/locales/bn-BD/menu.js diff --git a/sysom_web/src/locales/bn-BD/pages.js b/ui/src/locales/bn-BD/pages.js similarity index 100% rename from sysom_web/src/locales/bn-BD/pages.js rename to ui/src/locales/bn-BD/pages.js diff --git a/sysom_web/src/locales/bn-BD/pwa.js b/ui/src/locales/bn-BD/pwa.js similarity index 100% rename from sysom_web/src/locales/bn-BD/pwa.js rename to ui/src/locales/bn-BD/pwa.js diff --git a/sysom_web/src/locales/bn-BD/settingDrawer.js b/ui/src/locales/bn-BD/settingDrawer.js similarity index 100% rename from sysom_web/src/locales/bn-BD/settingDrawer.js rename to ui/src/locales/bn-BD/settingDrawer.js diff --git a/sysom_web/src/locales/bn-BD/settings.js b/ui/src/locales/bn-BD/settings.js similarity index 100% rename from sysom_web/src/locales/bn-BD/settings.js rename to ui/src/locales/bn-BD/settings.js diff --git a/sysom_web/src/locales/en-US.js b/ui/src/locales/en-US.js similarity index 100% rename from sysom_web/src/locales/en-US.js rename to ui/src/locales/en-US.js diff --git a/sysom_web/src/locales/en-US/component.js b/ui/src/locales/en-US/component.js similarity index 100% rename from sysom_web/src/locales/en-US/component.js rename to ui/src/locales/en-US/component.js diff --git a/sysom_web/src/locales/en-US/globalHeader.js b/ui/src/locales/en-US/globalHeader.js similarity index 100% rename from sysom_web/src/locales/en-US/globalHeader.js rename to ui/src/locales/en-US/globalHeader.js diff --git a/sysom_web/src/locales/en-US/menu.js b/ui/src/locales/en-US/menu.js similarity index 100% rename from sysom_web/src/locales/en-US/menu.js rename to ui/src/locales/en-US/menu.js diff --git a/sysom_web/src/locales/en-US/pages.js b/ui/src/locales/en-US/pages.js similarity index 100% rename from sysom_web/src/locales/en-US/pages.js rename to ui/src/locales/en-US/pages.js diff --git a/sysom_web/src/locales/en-US/pwa.js b/ui/src/locales/en-US/pwa.js similarity index 100% rename from sysom_web/src/locales/en-US/pwa.js rename to ui/src/locales/en-US/pwa.js diff --git a/sysom_web/src/locales/en-US/settingDrawer.js b/ui/src/locales/en-US/settingDrawer.js similarity index 100% rename from sysom_web/src/locales/en-US/settingDrawer.js rename to ui/src/locales/en-US/settingDrawer.js diff --git a/sysom_web/src/locales/en-US/settings.js b/ui/src/locales/en-US/settings.js similarity index 100% rename from sysom_web/src/locales/en-US/settings.js rename to ui/src/locales/en-US/settings.js diff --git a/sysom_web/src/locales/fa-IR.js b/ui/src/locales/fa-IR.js similarity index 100% rename from sysom_web/src/locales/fa-IR.js rename to ui/src/locales/fa-IR.js diff --git a/sysom_web/src/locales/fa-IR/component.js b/ui/src/locales/fa-IR/component.js similarity index 100% rename from sysom_web/src/locales/fa-IR/component.js rename to ui/src/locales/fa-IR/component.js diff --git a/sysom_web/src/locales/fa-IR/globalHeader.js b/ui/src/locales/fa-IR/globalHeader.js similarity index 100% rename from sysom_web/src/locales/fa-IR/globalHeader.js rename to ui/src/locales/fa-IR/globalHeader.js diff --git a/sysom_web/src/locales/fa-IR/menu.js b/ui/src/locales/fa-IR/menu.js similarity index 100% rename from sysom_web/src/locales/fa-IR/menu.js rename to ui/src/locales/fa-IR/menu.js diff --git a/sysom_web/src/locales/fa-IR/pages.js b/ui/src/locales/fa-IR/pages.js similarity index 100% rename from sysom_web/src/locales/fa-IR/pages.js rename to ui/src/locales/fa-IR/pages.js diff --git a/sysom_web/src/locales/fa-IR/pwa.js b/ui/src/locales/fa-IR/pwa.js similarity index 100% rename from sysom_web/src/locales/fa-IR/pwa.js rename to ui/src/locales/fa-IR/pwa.js diff --git a/sysom_web/src/locales/fa-IR/settingDrawer.js b/ui/src/locales/fa-IR/settingDrawer.js similarity index 100% rename from sysom_web/src/locales/fa-IR/settingDrawer.js rename to ui/src/locales/fa-IR/settingDrawer.js diff --git a/sysom_web/src/locales/fa-IR/settings.js b/ui/src/locales/fa-IR/settings.js similarity index 100% rename from sysom_web/src/locales/fa-IR/settings.js rename to ui/src/locales/fa-IR/settings.js diff --git a/sysom_web/src/locales/id-ID.js b/ui/src/locales/id-ID.js similarity index 100% rename from sysom_web/src/locales/id-ID.js rename to ui/src/locales/id-ID.js diff --git a/sysom_web/src/locales/id-ID/component.js b/ui/src/locales/id-ID/component.js similarity index 100% rename from sysom_web/src/locales/id-ID/component.js rename to ui/src/locales/id-ID/component.js diff --git a/sysom_web/src/locales/id-ID/globalHeader.js b/ui/src/locales/id-ID/globalHeader.js similarity index 100% rename from sysom_web/src/locales/id-ID/globalHeader.js rename to ui/src/locales/id-ID/globalHeader.js diff --git a/sysom_web/src/locales/id-ID/menu.js b/ui/src/locales/id-ID/menu.js similarity index 100% rename from sysom_web/src/locales/id-ID/menu.js rename to ui/src/locales/id-ID/menu.js diff --git a/sysom_web/src/locales/id-ID/pages.js b/ui/src/locales/id-ID/pages.js similarity index 100% rename from sysom_web/src/locales/id-ID/pages.js rename to ui/src/locales/id-ID/pages.js diff --git a/sysom_web/src/locales/id-ID/pwa.js b/ui/src/locales/id-ID/pwa.js similarity index 100% rename from sysom_web/src/locales/id-ID/pwa.js rename to ui/src/locales/id-ID/pwa.js diff --git a/sysom_web/src/locales/id-ID/settingDrawer.js b/ui/src/locales/id-ID/settingDrawer.js similarity index 100% rename from sysom_web/src/locales/id-ID/settingDrawer.js rename to ui/src/locales/id-ID/settingDrawer.js diff --git a/sysom_web/src/locales/id-ID/settings.js b/ui/src/locales/id-ID/settings.js similarity index 100% rename from sysom_web/src/locales/id-ID/settings.js rename to ui/src/locales/id-ID/settings.js diff --git a/sysom_web/src/locales/ja-JP.js b/ui/src/locales/ja-JP.js similarity index 100% rename from sysom_web/src/locales/ja-JP.js rename to ui/src/locales/ja-JP.js diff --git a/sysom_web/src/locales/ja-JP/component.js b/ui/src/locales/ja-JP/component.js similarity index 100% rename from sysom_web/src/locales/ja-JP/component.js rename to ui/src/locales/ja-JP/component.js diff --git a/sysom_web/src/locales/ja-JP/globalHeader.js b/ui/src/locales/ja-JP/globalHeader.js similarity index 100% rename from sysom_web/src/locales/ja-JP/globalHeader.js rename to ui/src/locales/ja-JP/globalHeader.js diff --git a/sysom_web/src/locales/ja-JP/menu.js b/ui/src/locales/ja-JP/menu.js similarity index 100% rename from sysom_web/src/locales/ja-JP/menu.js rename to ui/src/locales/ja-JP/menu.js diff --git a/sysom_web/src/locales/ja-JP/pages.js b/ui/src/locales/ja-JP/pages.js similarity index 100% rename from sysom_web/src/locales/ja-JP/pages.js rename to ui/src/locales/ja-JP/pages.js diff --git a/sysom_web/src/locales/ja-JP/pwa.js b/ui/src/locales/ja-JP/pwa.js similarity index 100% rename from sysom_web/src/locales/ja-JP/pwa.js rename to ui/src/locales/ja-JP/pwa.js diff --git a/sysom_web/src/locales/ja-JP/settingDrawer.js b/ui/src/locales/ja-JP/settingDrawer.js similarity index 100% rename from sysom_web/src/locales/ja-JP/settingDrawer.js rename to ui/src/locales/ja-JP/settingDrawer.js diff --git a/sysom_web/src/locales/ja-JP/settings.js b/ui/src/locales/ja-JP/settings.js similarity index 100% rename from sysom_web/src/locales/ja-JP/settings.js rename to ui/src/locales/ja-JP/settings.js diff --git a/sysom_web/src/locales/pt-BR.js b/ui/src/locales/pt-BR.js similarity index 100% rename from sysom_web/src/locales/pt-BR.js rename to ui/src/locales/pt-BR.js diff --git a/sysom_web/src/locales/pt-BR/component.js b/ui/src/locales/pt-BR/component.js similarity index 100% rename from sysom_web/src/locales/pt-BR/component.js rename to ui/src/locales/pt-BR/component.js diff --git a/sysom_web/src/locales/pt-BR/globalHeader.js b/ui/src/locales/pt-BR/globalHeader.js similarity index 100% rename from sysom_web/src/locales/pt-BR/globalHeader.js rename to ui/src/locales/pt-BR/globalHeader.js diff --git a/sysom_web/src/locales/pt-BR/menu.js b/ui/src/locales/pt-BR/menu.js similarity index 100% rename from sysom_web/src/locales/pt-BR/menu.js rename to ui/src/locales/pt-BR/menu.js diff --git a/sysom_web/src/locales/pt-BR/pages.js b/ui/src/locales/pt-BR/pages.js similarity index 100% rename from sysom_web/src/locales/pt-BR/pages.js rename to ui/src/locales/pt-BR/pages.js diff --git a/sysom_web/src/locales/pt-BR/pwa.js b/ui/src/locales/pt-BR/pwa.js similarity index 100% rename from sysom_web/src/locales/pt-BR/pwa.js rename to ui/src/locales/pt-BR/pwa.js diff --git a/sysom_web/src/locales/pt-BR/settingDrawer.js b/ui/src/locales/pt-BR/settingDrawer.js similarity index 100% rename from sysom_web/src/locales/pt-BR/settingDrawer.js rename to ui/src/locales/pt-BR/settingDrawer.js diff --git a/sysom_web/src/locales/pt-BR/settings.js b/ui/src/locales/pt-BR/settings.js similarity index 100% rename from sysom_web/src/locales/pt-BR/settings.js rename to ui/src/locales/pt-BR/settings.js diff --git a/sysom_web/src/locales/zh-CN.js b/ui/src/locales/zh-CN.js similarity index 100% rename from sysom_web/src/locales/zh-CN.js rename to ui/src/locales/zh-CN.js diff --git a/sysom_web/src/locales/zh-CN/component.js b/ui/src/locales/zh-CN/component.js similarity index 100% rename from sysom_web/src/locales/zh-CN/component.js rename to ui/src/locales/zh-CN/component.js diff --git a/sysom_web/src/locales/zh-CN/globalHeader.js b/ui/src/locales/zh-CN/globalHeader.js similarity index 100% rename from sysom_web/src/locales/zh-CN/globalHeader.js rename to ui/src/locales/zh-CN/globalHeader.js diff --git a/sysom_web/src/locales/zh-CN/menu.js b/ui/src/locales/zh-CN/menu.js similarity index 100% rename from sysom_web/src/locales/zh-CN/menu.js rename to ui/src/locales/zh-CN/menu.js diff --git a/sysom_web/src/locales/zh-CN/pages.js b/ui/src/locales/zh-CN/pages.js similarity index 100% rename from sysom_web/src/locales/zh-CN/pages.js rename to ui/src/locales/zh-CN/pages.js diff --git a/sysom_web/src/locales/zh-CN/pwa.js b/ui/src/locales/zh-CN/pwa.js similarity index 100% rename from sysom_web/src/locales/zh-CN/pwa.js rename to ui/src/locales/zh-CN/pwa.js diff --git a/sysom_web/src/locales/zh-CN/settingDrawer.js b/ui/src/locales/zh-CN/settingDrawer.js similarity index 100% rename from sysom_web/src/locales/zh-CN/settingDrawer.js rename to ui/src/locales/zh-CN/settingDrawer.js diff --git a/sysom_web/src/locales/zh-CN/settings.js b/ui/src/locales/zh-CN/settings.js similarity index 100% rename from sysom_web/src/locales/zh-CN/settings.js rename to ui/src/locales/zh-CN/settings.js diff --git a/sysom_web/src/locales/zh-TW.js b/ui/src/locales/zh-TW.js similarity index 100% rename from sysom_web/src/locales/zh-TW.js rename to ui/src/locales/zh-TW.js diff --git a/sysom_web/src/locales/zh-TW/component.js b/ui/src/locales/zh-TW/component.js similarity index 100% rename from sysom_web/src/locales/zh-TW/component.js rename to ui/src/locales/zh-TW/component.js diff --git a/sysom_web/src/locales/zh-TW/globalHeader.js b/ui/src/locales/zh-TW/globalHeader.js similarity index 100% rename from sysom_web/src/locales/zh-TW/globalHeader.js rename to ui/src/locales/zh-TW/globalHeader.js diff --git a/sysom_web/src/locales/zh-TW/menu.js b/ui/src/locales/zh-TW/menu.js similarity index 100% rename from sysom_web/src/locales/zh-TW/menu.js rename to ui/src/locales/zh-TW/menu.js diff --git a/sysom_web/src/locales/zh-TW/pwa.js b/ui/src/locales/zh-TW/pwa.js similarity index 100% rename from sysom_web/src/locales/zh-TW/pwa.js rename to ui/src/locales/zh-TW/pwa.js diff --git a/sysom_web/src/locales/zh-TW/settingDrawer.js b/ui/src/locales/zh-TW/settingDrawer.js similarity index 100% rename from sysom_web/src/locales/zh-TW/settingDrawer.js rename to ui/src/locales/zh-TW/settingDrawer.js diff --git a/sysom_web/src/locales/zh-TW/settings.js b/ui/src/locales/zh-TW/settings.js similarity index 100% rename from sysom_web/src/locales/zh-TW/settings.js rename to ui/src/locales/zh-TW/settings.js diff --git a/sysom_web/src/manifest.json b/ui/src/manifest.json similarity index 100% rename from sysom_web/src/manifest.json rename to ui/src/manifest.json diff --git a/sysom_web/src/pages/404.jsx b/ui/src/pages/404.jsx similarity index 100% rename from sysom_web/src/pages/404.jsx rename to ui/src/pages/404.jsx diff --git a/sysom_web/src/pages/Admin.jsx b/ui/src/pages/Admin.jsx similarity index 100% rename from sysom_web/src/pages/Admin.jsx rename to ui/src/pages/Admin.jsx diff --git a/sysom_web/src/pages/Monitor/SystemDashboard.jsx b/ui/src/pages/Monitor/SystemDashboard.jsx similarity index 100% rename from sysom_web/src/pages/Monitor/SystemDashboard.jsx rename to ui/src/pages/Monitor/SystemDashboard.jsx diff --git a/sysom_web/src/pages/Welcome.jsx b/ui/src/pages/Welcome.jsx similarity index 100% rename from sysom_web/src/pages/Welcome.jsx rename to ui/src/pages/Welcome.jsx diff --git a/sysom_web/src/pages/Welcome.less b/ui/src/pages/Welcome.less similarity index 100% rename from sysom_web/src/pages/Welcome.less rename to ui/src/pages/Welcome.less diff --git a/sysom_web/src/pages/diagnose/Io/IOResults.js b/ui/src/pages/diagnose/Io/IOResults.js similarity index 100% rename from sysom_web/src/pages/diagnose/Io/IOResults.js rename to ui/src/pages/diagnose/Io/IOResults.js diff --git a/sysom_web/src/pages/diagnose/Io/IOTableList.jsx b/ui/src/pages/diagnose/Io/IOTableList.jsx similarity index 100% rename from sysom_web/src/pages/diagnose/Io/IOTableList.jsx rename to ui/src/pages/diagnose/Io/IOTableList.jsx diff --git a/sysom_web/src/pages/diagnose/Io/index.jsx b/ui/src/pages/diagnose/Io/index.jsx similarity index 100% rename from sysom_web/src/pages/diagnose/Io/index.jsx rename to ui/src/pages/diagnose/Io/index.jsx diff --git a/sysom_web/src/pages/diagnose/Net/NetTableList.jsx b/ui/src/pages/diagnose/Net/NetTableList.jsx similarity index 100% rename from sysom_web/src/pages/diagnose/Net/NetTableList.jsx rename to ui/src/pages/diagnose/Net/NetTableList.jsx diff --git a/sysom_web/src/pages/diagnose/Net/NetworkFlow.js b/ui/src/pages/diagnose/Net/NetworkFlow.js similarity index 100% rename from sysom_web/src/pages/diagnose/Net/NetworkFlow.js rename to ui/src/pages/diagnose/Net/NetworkFlow.js diff --git a/sysom_web/src/pages/diagnose/Net/PacketLoss.js b/ui/src/pages/diagnose/Net/PacketLoss.js similarity index 100% rename from sysom_web/src/pages/diagnose/Net/PacketLoss.js rename to ui/src/pages/diagnose/Net/PacketLoss.js diff --git a/sysom_web/src/pages/diagnose/Net/index.jsx b/ui/src/pages/diagnose/Net/index.jsx similarity index 100% rename from sysom_web/src/pages/diagnose/Net/index.jsx rename to ui/src/pages/diagnose/Net/index.jsx diff --git a/sysom_web/src/pages/diagnose/_mock.js b/ui/src/pages/diagnose/_mock.js similarity index 100% rename from sysom_web/src/pages/diagnose/_mock.js rename to ui/src/pages/diagnose/_mock.js diff --git a/sysom_web/src/pages/diagnose/components/MetricShow.js b/ui/src/pages/diagnose/components/MetricShow.js similarity index 100% rename from sysom_web/src/pages/diagnose/components/MetricShow.js rename to ui/src/pages/diagnose/components/MetricShow.js diff --git a/sysom_web/src/pages/diagnose/diagnose.less b/ui/src/pages/diagnose/diagnose.less similarity index 100% rename from sysom_web/src/pages/diagnose/diagnose.less rename to ui/src/pages/diagnose/diagnose.less diff --git a/sysom_web/src/pages/diagnose/service.js b/ui/src/pages/diagnose/service.js similarity index 100% rename from sysom_web/src/pages/diagnose/service.js rename to ui/src/pages/diagnose/service.js diff --git a/sysom_web/src/pages/document.ejs b/ui/src/pages/document.ejs similarity index 100% rename from sysom_web/src/pages/document.ejs rename to ui/src/pages/document.ejs diff --git a/sysom_web/src/pages/host/List/index.jsx b/ui/src/pages/host/List/index.jsx similarity index 100% rename from sysom_web/src/pages/host/List/index.jsx rename to ui/src/pages/host/List/index.jsx diff --git a/sysom_web/src/pages/host/Terminal/index.jsx b/ui/src/pages/host/Terminal/index.jsx similarity index 100% rename from sysom_web/src/pages/host/Terminal/index.jsx rename to ui/src/pages/host/Terminal/index.jsx diff --git a/sysom_web/src/pages/host/_mock.js b/ui/src/pages/host/_mock.js similarity index 100% rename from sysom_web/src/pages/host/_mock.js rename to ui/src/pages/host/_mock.js diff --git a/sysom_web/src/pages/host/components/ClusterForm.jsx b/ui/src/pages/host/components/ClusterForm.jsx similarity index 100% rename from sysom_web/src/pages/host/components/ClusterForm.jsx rename to ui/src/pages/host/components/ClusterForm.jsx diff --git a/sysom_web/src/pages/host/service.js b/ui/src/pages/host/service.js similarity index 100% rename from sysom_web/src/pages/host/service.js rename to ui/src/pages/host/service.js diff --git a/sysom_web/src/pages/user/Login/_mock.js b/ui/src/pages/user/Login/_mock.js similarity index 100% rename from sysom_web/src/pages/user/Login/_mock.js rename to ui/src/pages/user/Login/_mock.js diff --git a/sysom_web/src/pages/user/Login/index.jsx b/ui/src/pages/user/Login/index.jsx similarity index 100% rename from sysom_web/src/pages/user/Login/index.jsx rename to ui/src/pages/user/Login/index.jsx diff --git a/sysom_web/src/pages/user/Login/index.less b/ui/src/pages/user/Login/index.less similarity index 100% rename from sysom_web/src/pages/user/Login/index.less rename to ui/src/pages/user/Login/index.less diff --git a/sysom_web/src/pages/user/Login/service.js b/ui/src/pages/user/Login/service.js similarity index 100% rename from sysom_web/src/pages/user/Login/service.js rename to ui/src/pages/user/Login/service.js diff --git a/sysom_web/src/pages/vmcore/Analyse/index.jsx b/ui/src/pages/vmcore/Analyse/index.jsx similarity index 100% rename from sysom_web/src/pages/vmcore/Analyse/index.jsx rename to ui/src/pages/vmcore/Analyse/index.jsx diff --git a/sysom_web/src/pages/vmcore/Detail/index.jsx b/ui/src/pages/vmcore/Detail/index.jsx similarity index 100% rename from sysom_web/src/pages/vmcore/Detail/index.jsx rename to ui/src/pages/vmcore/Detail/index.jsx diff --git a/sysom_web/src/pages/vmcore/List/index.jsx b/ui/src/pages/vmcore/List/index.jsx similarity index 100% rename from sysom_web/src/pages/vmcore/List/index.jsx rename to ui/src/pages/vmcore/List/index.jsx diff --git a/sysom_web/src/pages/vmcore/Match/index.jsx b/ui/src/pages/vmcore/Match/index.jsx similarity index 100% rename from sysom_web/src/pages/vmcore/Match/index.jsx rename to ui/src/pages/vmcore/Match/index.jsx diff --git a/sysom_web/src/pages/vmcore/_mock.js b/ui/src/pages/vmcore/_mock.js similarity index 100% rename from sysom_web/src/pages/vmcore/_mock.js rename to ui/src/pages/vmcore/_mock.js diff --git a/sysom_web/src/pages/vmcore/components/VmcoreCard.jsx b/ui/src/pages/vmcore/components/VmcoreCard.jsx similarity index 100% rename from sysom_web/src/pages/vmcore/components/VmcoreCard.jsx rename to ui/src/pages/vmcore/components/VmcoreCard.jsx diff --git a/sysom_web/src/pages/vmcore/components/VmcoreIssueForm.jsx b/ui/src/pages/vmcore/components/VmcoreIssueForm.jsx similarity index 100% rename from sysom_web/src/pages/vmcore/components/VmcoreIssueForm.jsx rename to ui/src/pages/vmcore/components/VmcoreIssueForm.jsx diff --git a/sysom_web/src/pages/vmcore/components/VmcoreTableList.jsx b/ui/src/pages/vmcore/components/VmcoreTableList.jsx similarity index 100% rename from sysom_web/src/pages/vmcore/components/VmcoreTableList.jsx rename to ui/src/pages/vmcore/components/VmcoreTableList.jsx diff --git a/sysom_web/src/pages/vmcore/service.js b/ui/src/pages/vmcore/service.js similarity index 100% rename from sysom_web/src/pages/vmcore/service.js rename to ui/src/pages/vmcore/service.js diff --git a/sysom_web/src/service-worker.js b/ui/src/service-worker.js similarity index 100% rename from sysom_web/src/service-worker.js rename to ui/src/service-worker.js diff --git a/sysom_web/src/static/img/banner1.jpg b/ui/src/static/img/banner1.jpg similarity index 100% rename from sysom_web/src/static/img/banner1.jpg rename to ui/src/static/img/banner1.jpg diff --git a/sysom_web/src/static/img/banner2.jpg b/ui/src/static/img/banner2.jpg similarity index 100% rename from sysom_web/src/static/img/banner2.jpg rename to ui/src/static/img/banner2.jpg diff --git a/sysom_web/src/static/img/banner3.jpg b/ui/src/static/img/banner3.jpg similarity index 100% rename from sysom_web/src/static/img/banner3.jpg rename to ui/src/static/img/banner3.jpg diff --git a/sysom_web/tests/PuppeteerEnvironment.js b/ui/tests/PuppeteerEnvironment.js similarity index 100% rename from sysom_web/tests/PuppeteerEnvironment.js rename to ui/tests/PuppeteerEnvironment.js diff --git a/sysom_web/tests/beforeTest.js b/ui/tests/beforeTest.js similarity index 100% rename from sysom_web/tests/beforeTest.js rename to ui/tests/beforeTest.js diff --git a/sysom_web/tests/getBrowser.js b/ui/tests/getBrowser.js similarity index 100% rename from sysom_web/tests/getBrowser.js rename to ui/tests/getBrowser.js diff --git a/sysom_web/tests/run-tests.js b/ui/tests/run-tests.js similarity index 100% rename from sysom_web/tests/run-tests.js rename to ui/tests/run-tests.js diff --git a/sysom_web/tests/setupTests.js b/ui/tests/setupTests.js similarity index 100% rename from sysom_web/tests/setupTests.js rename to ui/tests/setupTests.js diff --git a/sysom_web/yarn.lock b/ui/yarn.lock similarity index 100% rename from sysom_web/yarn.lock rename to ui/yarn.lock -- Gitee From 9f683120e105b7306f83635ca275eef8470978d8 Mon Sep 17 00:00:00 2001 From: wangqing Date: Thu, 10 Feb 2022 11:38:25 +0800 Subject: [PATCH 7/9] run server ok --- MANIFEST.in | 2 +- Makefile | 4 ++-- setup.py | 2 +- sysom/apps/accounts/apps.py | 2 +- sysom/apps/accounts/authentication.py | 2 +- sysom/apps/accounts/models.py | 2 +- sysom/apps/accounts/permissions.py | 2 +- sysom/apps/accounts/views.py | 8 ++++---- sysom/apps/host/apps.py | 4 ++-- sysom/apps/host/models.py | 6 +++--- sysom/apps/host/serializer.py | 2 +- sysom/apps/host/urls.py | 2 +- sysom/apps/host/views.py | 14 +++++++------- sysom/apps/monitor/apps.py | 2 +- sysom/apps/monitor/urls.py | 2 +- sysom/apps/monitor/views.py | 6 +++--- sysom/apps/task/apps.py | 2 +- sysom/apps/task/models.py | 6 +++--- sysom/apps/task/seriaizer.py | 2 +- sysom/apps/task/urls.py | 2 +- sysom/apps/task/views.py | 14 +++++++------- sysom/apps/vmcore/apps.py | 2 +- sysom/apps/vmcore/models.py | 2 +- sysom/apps/vmcore/urls.py | 2 +- sysom/apps/vmcore/views.py | 8 ++++---- sysom/asgi.py | 2 +- sysom/conf/common.py | 26 +++++++++++++------------- sysom/consumer/consumers.py | 2 +- sysom/consumer/executors.py | 6 +++--- sysom/consumer/middleware.py | 2 +- sysom/lib/__init__.py | 6 +++--- sysom/lib/base_model.py | 2 +- sysom/lib/paginations.py | 4 ++-- sysom/lib/utils.py | 2 +- sysom/settings.py | 8 ++++---- sysom/urls.py | 12 ++++++------ 36 files changed, 87 insertions(+), 87 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index c9b8b5c3..1ff039c3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,6 +2,6 @@ recursive-include sysom *.py recursive-include ui * recursive-include tools * recursive-include requirements *.txt -include service_scripts/sysom-python +include tools/scripts/sysom-python include VERSION include Makefile diff --git a/Makefile b/Makefile index 0900108c..4db6e6ca 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ install_nodejs: @echo install nodejs if [ "$(THIRD_PARTY)" ]; then \ if [ ! -d "$(THIRD_PARTY)" ]; then \ - mkdir $(THIRD_PARTY); \ + mkdir -p $(THIRD_PARTY); \ fi; \ wget https://npmmirror.com/mirrors/node/$(NODE_VERSION)/node-$(NODE_VERSION)-$(DISTRO).tar.xz; \ tar -xf node-$(NODE_VERSION)-$(DISTRO).tar.xz -C $(THIRD_PARTY); \ @@ -84,7 +84,7 @@ virtualenv: virtualenv_sysom virtualenv_sysom: if [ "$(VENV_BASE)" ]; then \ if [ ! -d "$(VENV_BASE)" ]; then \ - mkdir $(VENV_BASE); \ + mkdir -p $(VENV_BASE); \ fi; \ if [ ! -d "$(VENV_BASE)/sysom" ]; then \ $(PYTHON) -m venv $(VENV_BASE)/sysom; \ diff --git a/setup.py b/setup.py index cc9dd545..c316f722 100644 --- a/setup.py +++ b/setup.py @@ -65,7 +65,7 @@ setup( 'Topic :: System :: Systems Administration', ], data_files=[ - ('/usr/bin', ['service_scripts/sysom-python']), + ('/usr/bin', ['tools/scripts/sysom-python']), ], options={ 'aliases': {'dev_build': 'clean --all egg_info sdist', 'release_build': 'clean --all egg_info -b "" sdist'}, diff --git a/sysom/apps/accounts/apps.py b/sysom/apps/accounts/apps.py index 445b3f16..64d374c3 100644 --- a/sysom/apps/accounts/apps.py +++ b/sysom/apps/accounts/apps.py @@ -7,7 +7,7 @@ logger = logging.getLogger(__name__) class AccountsConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.accounts' + name = 'sysom.apps.accounts' def ready(self) -> None: logger.info(">>> Accounts module loading success") diff --git a/sysom/apps/accounts/authentication.py b/sysom/apps/accounts/authentication.py index f6aca38a..51778947 100644 --- a/sysom/apps/accounts/authentication.py +++ b/sysom/apps/accounts/authentication.py @@ -14,7 +14,7 @@ from rest_framework.exceptions import AuthenticationFailed from rest_framework import serializers from rest_framework.request import Request -from apps.accounts.models import User +from sysom.apps.accounts.models import User logger = logging.getLogger(__name__) jwt_decode_handler = api_settings.JWT_DECODE_HANDLER diff --git a/sysom/apps/accounts/models.py b/sysom/apps/accounts/models.py index 319de49e..d77b8d80 100644 --- a/sysom/apps/accounts/models.py +++ b/sysom/apps/accounts/models.py @@ -1,6 +1,6 @@ from django.db import models from django.contrib.auth.hashers import make_password, check_password -from lib import BaseModel +from sysom.lib import BaseModel class User(BaseModel): diff --git a/sysom/apps/accounts/permissions.py b/sysom/apps/accounts/permissions.py index f64953d8..81ef1096 100644 --- a/sysom/apps/accounts/permissions.py +++ b/sysom/apps/accounts/permissions.py @@ -10,7 +10,7 @@ from rest_framework.permissions import BasePermission from rest_framework.request import Request from rest_framework.views import APIView -from apps.accounts.models import User +from sysom.apps.accounts.models import User logger = logging.getLogger(__name__) diff --git a/sysom/apps/accounts/views.py b/sysom/apps/accounts/views.py index 793c963d..2584dab1 100644 --- a/sysom/apps/accounts/views.py +++ b/sysom/apps/accounts/views.py @@ -5,12 +5,12 @@ from rest_framework.viewsets import GenericViewSet from rest_framework import mixins, status from rest_framework.views import APIView -from apps.accounts.permissions import IsAdminPermission, IsOperationPermission -from apps.accounts.serializer import UserAuthSerializer -from apps.accounts.authentication import Authentication +from sysom.apps.accounts.permissions import IsAdminPermission, IsOperationPermission +from sysom.apps.accounts.serializer import UserAuthSerializer +from sysom.apps.accounts.authentication import Authentication from . import models from . import serializer -from lib import success, other_response +from sysom.lib import success, other_response logger = logging.getLogger(__name__) diff --git a/sysom/apps/host/apps.py b/sysom/apps/host/apps.py index 9c2f3652..91e06ac1 100644 --- a/sysom/apps/host/apps.py +++ b/sysom/apps/host/apps.py @@ -7,7 +7,7 @@ logger = logging.getLogger(__name__) class HostConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.host' + name = 'sysom.apps.host' def ready(self): - logger.info(">>> Host module loading success") \ No newline at end of file + logger.info(">>> Host module loading success") diff --git a/sysom/apps/host/models.py b/sysom/apps/host/models.py index 57599747..5dda27e9 100644 --- a/sysom/apps/host/models.py +++ b/sysom/apps/host/models.py @@ -1,8 +1,8 @@ from django.db import models -from lib import BaseModel -from apps.accounts.models import User +from sysom.lib import BaseModel +from sysom.apps.accounts.models import User -from lib.ssh import SSH +from sysom.lib.ssh import SSH class HostModel(BaseModel): diff --git a/sysom/apps/host/serializer.py b/sysom/apps/host/serializer.py index 93117795..7a65986b 100644 --- a/sysom/apps/host/serializer.py +++ b/sysom/apps/host/serializer.py @@ -1,7 +1,7 @@ import logging from django.utils.translation import ugettext as _ from rest_framework import serializers -from apps.host.models import HostModel, Cluster +from sysom.apps.host.models import HostModel, Cluster logger = logging.getLogger(__name__) diff --git a/sysom/apps/host/urls.py b/sysom/apps/host/urls.py index 0a0010cf..0678d183 100644 --- a/sysom/apps/host/urls.py +++ b/sysom/apps/host/urls.py @@ -3,7 +3,7 @@ from django.urls.conf import include from rest_framework.routers import DefaultRouter -from apps.host import views +from . import views router = DefaultRouter() router.register('host', views.HostModelViewSet) diff --git a/sysom/apps/host/views.py b/sysom/apps/host/views.py index 40aebd58..e9000d07 100644 --- a/sysom/apps/host/views.py +++ b/sysom/apps/host/views.py @@ -12,13 +12,13 @@ from django.db.models import Q from django_filters.rest_framework import DjangoFilterBackend from django.conf import settings -from apps.host import serializer -from apps.host.models import HostModel, Cluster -from apps.accounts.authentication import Authentication -from consumer.executors import SshJob -from apps.task.models import JobModel -from lib import * -from lib.exception import APIException +from sysom.apps.host import serializer +from sysom.apps.host.models import HostModel, Cluster +from sysom.apps.accounts.authentication import Authentication +from sysom.consumer.executors import SshJob +from sysom.apps.task.models import JobModel +from sysom.lib import * +from sysom.lib.exception import APIException logger = logging.getLogger(__name__) diff --git a/sysom/apps/monitor/apps.py b/sysom/apps/monitor/apps.py index 077debb5..b664677b 100644 --- a/sysom/apps/monitor/apps.py +++ b/sysom/apps/monitor/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class MonitorConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.monitor' + name = 'sysom.apps.monitor' diff --git a/sysom/apps/monitor/urls.py b/sysom/apps/monitor/urls.py index 55dcad6f..e8b3d552 100644 --- a/sysom/apps/monitor/urls.py +++ b/sysom/apps/monitor/urls.py @@ -7,7 +7,7 @@ """ from django.urls import path, re_path -from apps.monitor import views +from sysom.apps.monitor import views urlpatterns = [ path('api/v1/svg_info/', views.SvgInfoAPIView.as_view()), diff --git a/sysom/apps/monitor/views.py b/sysom/apps/monitor/views.py index 291d37bb..25b6cd25 100644 --- a/sysom/apps/monitor/views.py +++ b/sysom/apps/monitor/views.py @@ -6,9 +6,9 @@ from django.conf import settings from django.http import HttpResponse from django.views.decorators.clickjacking import xframe_options_exempt from rest_framework.views import APIView -from apps.accounts.authentication import Authentication -from lib import * -from lib.exception import FileNotFoundException +from sysom.apps.accounts.authentication import Authentication +from sysom.lib import * +from sysom.lib.exception import FileNotFoundException logger = logging.getLogger(__name__) DOWNLOAD_SVG_URL = "/api/v1/download/svg/" diff --git a/sysom/apps/task/apps.py b/sysom/apps/task/apps.py index ff6c8b12..8757fad8 100644 --- a/sysom/apps/task/apps.py +++ b/sysom/apps/task/apps.py @@ -7,7 +7,7 @@ logger = logging.getLogger(__name__) class JobConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.task' + name = 'sysom.apps.task' def ready(self): logger.info(">>> Job module loading success") diff --git a/sysom/apps/task/models.py b/sysom/apps/task/models.py index 018c203e..dd4077d8 100644 --- a/sysom/apps/task/models.py +++ b/sysom/apps/task/models.py @@ -1,8 +1,8 @@ from django.db import models -from lib import BaseModel -from apps.accounts.models import User -from apps.host.models import HostModel +from sysom.lib import BaseModel +from sysom.apps.accounts.models import User +from sysom.apps.host.models import HostModel class JobModel(BaseModel): diff --git a/sysom/apps/task/seriaizer.py b/sysom/apps/task/seriaizer.py index 248254eb..812b56ec 100644 --- a/sysom/apps/task/seriaizer.py +++ b/sysom/apps/task/seriaizer.py @@ -6,7 +6,7 @@ @Software: PyCharm """ from rest_framework import serializers -from apps.task.models import JobModel +from sysom.apps.task.models import JobModel class JobListSerializer(serializers.ModelSerializer): diff --git a/sysom/apps/task/urls.py b/sysom/apps/task/urls.py index e3eda515..7c973638 100644 --- a/sysom/apps/task/urls.py +++ b/sysom/apps/task/urls.py @@ -7,7 +7,7 @@ """ from django.urls import path, include from rest_framework.routers import DefaultRouter -from apps.task import views +from . import views router = DefaultRouter() diff --git a/sysom/apps/task/views.py b/sysom/apps/task/views.py index 218f7cd7..c4d953bb 100644 --- a/sysom/apps/task/views.py +++ b/sysom/apps/task/views.py @@ -7,13 +7,13 @@ from rest_framework.viewsets import GenericViewSet from rest_framework import mixins from django.conf import settings -from apps.accounts.authentication import Authentication -from apps.task import seriaizer -from apps.task.models import JobModel -from apps.host.models import HostModel -from apps.accounts.models import User -from consumer.executors import SshJob -from lib import * +from sysom.apps.accounts.authentication import Authentication +from sysom.apps.task import seriaizer +from sysom.apps.task.models import JobModel +from sysom.apps.host.models import HostModel +from sysom.apps.accounts.models import User +from sysom.consumer.executors import SshJob +from sysom.lib import * diff --git a/sysom/apps/vmcore/apps.py b/sysom/apps/vmcore/apps.py index 62a6a12d..aedd96e0 100644 --- a/sysom/apps/vmcore/apps.py +++ b/sysom/apps/vmcore/apps.py @@ -3,4 +3,4 @@ from django.apps import AppConfig class VmcoreConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'apps.vmcore' + name = 'sysom.apps.vmcore' diff --git a/sysom/apps/vmcore/models.py b/sysom/apps/vmcore/models.py index 9f019823..9404deca 100644 --- a/sysom/apps/vmcore/models.py +++ b/sysom/apps/vmcore/models.py @@ -1,5 +1,5 @@ from django.db import models -from lib import BaseModel +from sysom.lib import BaseModel # Create your models here. class Panic(BaseModel): diff --git a/sysom/apps/vmcore/urls.py b/sysom/apps/vmcore/urls.py index c74399a9..b87b9e58 100644 --- a/sysom/apps/vmcore/urls.py +++ b/sysom/apps/vmcore/urls.py @@ -3,7 +3,7 @@ from django.urls.conf import include from rest_framework.routers import DefaultRouter -from apps.vmcore import views +from . import views router = DefaultRouter() router.register('vmcore', views.VmcoreViewSet) diff --git a/sysom/apps/vmcore/views.py b/sysom/apps/vmcore/views.py index f39adc71..26e940eb 100644 --- a/sysom/apps/vmcore/views.py +++ b/sysom/apps/vmcore/views.py @@ -8,12 +8,12 @@ from rest_framework import mixins from rest_framework.views import APIView from django_filters.rest_framework import DjangoFilterBackend -from apps.accounts.permissions import IsAdminPermission, IsOperationPermission -from apps.accounts.serializer import UserAuthSerializer -from apps.accounts.authentication import Authentication +from sysom.apps.accounts.permissions import IsAdminPermission, IsOperationPermission +from sysom.apps.accounts.serializer import UserAuthSerializer +from sysom.apps.accounts.authentication import Authentication from . import models from . import serializer -from lib import success, other_response +from sysom.lib import success, other_response import datetime import re diff --git a/sysom/asgi.py b/sysom/asgi.py index 836eaee9..7c552841 100644 --- a/sysom/asgi.py +++ b/sysom/asgi.py @@ -12,7 +12,7 @@ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'sysom.settings') from channels.routing import ProtocolTypeRouter from django.core.asgi import get_asgi_application -from consumer.routing import ws_router +from sysom.consumer.routing import ws_router application = ProtocolTypeRouter({ diff --git a/sysom/conf/common.py b/sysom/conf/common.py index c77c7b95..8e0d9f88 100644 --- a/sysom/conf/common.py +++ b/sysom/conf/common.py @@ -15,12 +15,12 @@ SECRET_KEY = 'django-insecure-^d8b9di9w&-mmsbpt@)o#e+2^z+^m4nhf+z8304%9@8y#ko46l ALLOWED_HOSTS = ['*'] INSTALLED_APPS = [ - 'apps.accounts', - 'apps.host', - 'apps.monitor', - 'apps.task', - 'apps.vmcore', - 'consumer', + 'sysom.apps.accounts', + 'sysom.apps.host', + 'sysom.apps.monitor', + 'sysom.apps.task', + 'sysom.apps.vmcore', + 'sysom.consumer', 'rest_framework', 'corsheaders', @@ -42,10 +42,10 @@ DEBUG = True DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME': 'sysom', - 'USER': 'sysom', - 'PASSWORD': 'sysom_admin', - 'HOST': '127.0.0.1', + 'NAME': 'aops', + 'USER': 'aops', + 'PASSWORD': 'aops', + 'HOST': '10.7.48.37', 'PORT': '3306', } } @@ -79,7 +79,7 @@ REST_FRAMEWORK = { # 'rest_framework.permissions.IsAuthenticated' ), 'DEFAULT_AUTHENTICATION_CLASSES': [ - 'apps.accounts.authentication.Authentication' + 'sysom.apps.accounts.authentication.Authentication' ], 'UNAUTHENTICATED_USER': None, 'DEFAULT_VERSIONING_CLASS': "rest_framework.versioning.URLPathVersioning", @@ -90,9 +90,9 @@ REST_FRAMEWORK = { 'DEFAULT_RENDERER_CLASSES': ( 'rest_framework.renderers.JSONRenderer', ), - 'DEFAULT_PAGINATION_CLASS': 'lib.paginations.Pagination', + 'DEFAULT_PAGINATION_CLASS': 'sysom.lib.paginations.Pagination', 'UNICODE_JSON': False, - 'EXCEPTION_HANDLER': 'lib.exception.exception_handler' + 'EXCEPTION_HANDLER': 'sysom.lib.exception.exception_handler' } JWT_AUTH = { diff --git a/sysom/consumer/consumers.py b/sysom/consumer/consumers.py index b8447608..24e18735 100644 --- a/sysom/consumer/consumers.py +++ b/sysom/consumer/consumers.py @@ -38,7 +38,7 @@ class SshConsumer(WebsocketConsumer): def _connect_host_init(self): """初始化host连接""" - from apps.host.models import HostModel + from sysom.apps.host.models import HostModel instance = get_host_instance(model=HostModel, ip=self.host_ip, created_by=self.user.id) if not instance: self.send(bytes_data=b'Not Found host / No Permission\r\n') diff --git a/sysom/consumer/executors.py b/sysom/consumer/executors.py index cfed72ac..d8e27ea3 100644 --- a/sysom/consumer/executors.py +++ b/sysom/consumer/executors.py @@ -2,9 +2,9 @@ import ast import json import os import socket -from apps.host.models import HostModel -from lib.ssh import SSH -from apps.task.models import JobModel +from sysom.apps.host.models import HostModel +from sysom.lib.ssh import SSH +from sysom.apps.task.models import JobModel from sysom import settings diff --git a/sysom/consumer/middleware.py b/sysom/consumer/middleware.py index da5d14e1..419a66a1 100644 --- a/sysom/consumer/middleware.py +++ b/sysom/consumer/middleware.py @@ -10,7 +10,7 @@ jwt_get_username_from_payload = api_settings.JWT_PAYLOAD_GET_USERNAME_HANDLER @database_sync_to_async def get_user(user_id: int): - from apps.accounts.models import User + from sysom.apps.accounts.models import User try: user = User.objects.get(id=user_id) except User.DoesNotExist: diff --git a/sysom/lib/__init__.py b/sysom/lib/__init__.py index 158595f9..ffc476a1 100644 --- a/sysom/lib/__init__.py +++ b/sysom/lib/__init__.py @@ -7,6 +7,6 @@ @Software: PyCharm """ -from .utils import * -from .base_model import * -from .response import * +from sysom.lib.utils import * +from sysom.lib.base_model import * +from sysom.lib.response import * diff --git a/sysom/lib/base_model.py b/sysom/lib/base_model.py index 7fd9bdf7..3e2a63ec 100644 --- a/sysom/lib/base_model.py +++ b/sysom/lib/base_model.py @@ -8,7 +8,7 @@ """ from django.db import models -from lib import human_datetime +from sysom.lib import human_datetime class BaseModel(models.Model): diff --git a/sysom/lib/paginations.py b/sysom/lib/paginations.py index b14639bb..ee4b9323 100644 --- a/sysom/lib/paginations.py +++ b/sysom/lib/paginations.py @@ -6,7 +6,7 @@ ''' from rest_framework.pagination import PageNumberPagination -from lib.response import success +from sysom.lib.response import success class Pagination(PageNumberPagination): @@ -23,4 +23,4 @@ class Pagination(PageNumberPagination): def get_page_size(self, request): if not request.query_params.get(self.page_size_query_param, None): return self.max_page_size - return super().get_page_size(request) \ No newline at end of file + return super().get_page_size(request) diff --git a/sysom/lib/utils.py b/sysom/lib/utils.py index 25182886..754fec22 100644 --- a/sysom/lib/utils.py +++ b/sysom/lib/utils.py @@ -14,7 +14,7 @@ from decimal import Decimal from apscheduler.schedulers.background import BackgroundScheduler from paramiko import BadAuthenticationType, AuthenticationException -from lib.ssh import SSH +from sysom.lib.ssh import SSH logger = logging.getLogger(__name__) diff --git a/sysom/settings.py b/sysom/settings.py index 64ac03d9..d22696dc 100644 --- a/sysom/settings.py +++ b/sysom/settings.py @@ -4,12 +4,12 @@ env = os.environ.get("env", "testing") if env == "develop": - from conf.develop import * + from sysom.conf.develop import * elif env == "testing": - from conf.testing import * + from sysom.conf.testing import * elif env == "produce": - from conf.product import * + from sysom.conf.product import * # 跨域允许 if DEBUG: - CORS_ORIGIN_ALLOW_ALL = True \ No newline at end of file + CORS_ORIGIN_ALLOW_ALL = True diff --git a/sysom/urls.py b/sysom/urls.py index e267cc7b..c1a8701f 100644 --- a/sysom/urls.py +++ b/sysom/urls.py @@ -19,18 +19,18 @@ from django.conf import settings urlpatterns = [ - path('', include("apps.host.urls")), - path('', include("apps.accounts.urls")), - path('', include("apps.monitor.urls")), - path('', include("apps.task.urls")), - path('', include("apps.vmcore.urls")), + path('', include("sysom.apps.host.urls")), + path('', include("sysom.apps.accounts.urls")), + path('', include("sysom.apps.monitor.urls")), + path('', include("sysom.apps.task.urls")), + path('', include("sysom.apps.vmcore.urls")), ] if settings.DEBUG: from drf_yasg.views import get_schema_view from drf_yasg import openapi - from apps.accounts.authentication import Authentication + from sysom.apps.accounts.authentication import Authentication schema_view = get_schema_view( openapi.Info( -- Gitee From 1b386c6902300bbb1b71d8577beefd3cf0d513e1 Mon Sep 17 00:00:00 2001 From: wangqing Date: Thu, 10 Feb 2022 15:36:42 +0800 Subject: [PATCH 8/9] modify mysql conf Signed-off-by: wangqing --- sysom/conf/common.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sysom/conf/common.py b/sysom/conf/common.py index 8e0d9f88..e9824077 100644 --- a/sysom/conf/common.py +++ b/sysom/conf/common.py @@ -42,10 +42,10 @@ DEBUG = True DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME': 'aops', - 'USER': 'aops', - 'PASSWORD': 'aops', - 'HOST': '10.7.48.37', + 'NAME': 'sysom', + 'USER': 'sysom', + 'PASSWORD': 'sysom_admin', + 'HOST': '127.0.0.1', 'PORT': '3306', } } -- Gitee From b74ee674315e1fa9e64e8d7dba34644045b47f07 Mon Sep 17 00:00:00 2001 From: wangqing Date: Thu, 10 Feb 2022 16:37:36 +0800 Subject: [PATCH 9/9] add /usr/bin/sysom-manage Signed-off-by: wangqing --- setup.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup.py b/setup.py index c316f722..8db2c9b1 100644 --- a/setup.py +++ b/setup.py @@ -64,6 +64,11 @@ setup( 'Topic :: System :: Installation/Setup', 'Topic :: System :: Systems Administration', ], + entry_points={ + 'console_scripts': [ + 'sysom-manage = manage:main', + ], + }, data_files=[ ('/usr/bin', ['tools/scripts/sysom-python']), ], -- Gitee