监控部署

@@ -97,3 +97,39 @@ def create_app():
     # start_schedule()
     # start_schedule()
     return app
     return app
 
 
+def create_schedule():
+    monitor = Flask(__name__)
+    monitor.config['SQLALCHEMY_DATABASE_URI'] = configure.SQLALCHEMY_DATABASE_URI
+    monitor.config['echo'] = True
+    monitor.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
+    monitor.config['JSON_AS_ASCII'] = False
+    monitor.config['SECRET_KEY'] = configure.SECRET_KEY
+
+    # allows cookies and credentials to be submitted across domains
+    monitor.config['CORS_SUPPORTS_CREDENTIALS'] = true
+    monitor.config['CORS_ORIGINS ']="*"
+    
+    # swagger设置
+    swagger_config = Swagger.DEFAULT_CONFIG
+    swagger_config.update(configure.swagger_configure)
+    Swagger(monitor, config=swagger_config)
+    
+    # 创建数据库
+    db.init_app(monitor)
+    db.create_all(app=monitor)
+
+    # 跨域设置
+    CORS(monitor)
+
+    # 日志
+    logging.basicConfig(level=configure.log_level)
+    log_file = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "logs", "monitor_log.txt")
+    handler = logging.FileHandler(log_file, encoding='UTF-8')   # 设置日志字符集和存储路径名字
+    logging_format = logging.Formatter('[%(levelname)s] %(asctime)s %(message)s')
+    handler.setFormatter(logging_format)
+    monitor.logger.addHandler(handler)
+
+    # 不检测https
+    os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
+    start_schedule()
+    return monitor

-import paramiko
-from .models import MonitorHost, MonitorLog
-import datetime
-import math
-import time
-import uuid
-from app.util.component.PGUtil import PGUtil
-import configure
-from app.util.component.StructuredPrint import StructurePrint
-import traceback
-
-def background_job():
-    try:
-        # servers = [{'sid': 'src1', 'hostname': '172.26.99.160',
-        #             'username': 'monitor', 'password': '123456'},
-        #            {'sid': 'src2', 'hostname': '172.26.60.100',
-        #             'username': 'root', 'password': 'DMap@123'}]
-
-        cur_time = datetime.datetime.now()
-        time_stamp = cur_time.strftime(
-            "%Y-%m-%d %H:%M:%S")
-        struct_time = time.strptime(time_stamp, "%Y-%m-%d  %H:%M:%S")
-        d_minu_stamp = math.floor(struct_time.tm_min/10)
-        f_minu_stamp = math.floor(struct_time.tm_min/5)
-
-        sys_session = PGUtil.get_db_session(
-            configure.SQLALCHEMY_DATABASE_URI)
-        sys_ds = PGUtil.open_pg_data_source(
-            0, configure.SQLALCHEMY_DATABASE_URI)
-
-        hosts = sys_session.query(
-            MonitorHost.host, MonitorHost.user, MonitorHost.password, MonitorHost.type, MonitorHost.srcid)
-        servers = list(map(lambda host:
-                           {'hostname': host.host, 'username': host.user,
-                            'password': host.password, 'type': host.type,
-                            'sid': host.srcid},
-                           hosts))
-        logs = []
-        for info in servers:
-            try:
-                StructurePrint().print("schedule，host：{}，user:{}".format(
-                    info['hostname'], info['username']))
-                # 业务逻辑
-                client = paramiko.SSHClient()
-                client.set_missing_host_key_policy(paramiko.AutoAddPolicy)
-                client.connect(hostname=info['hostname'],
-                               username=info['username'], password=info['password'])
-
-                # cpu
-                order = "top -b -n1 | sed -n '3p' | awk '{print $2}'"
-                stdin, stdout, stderr = client.exec_command(order)
-                cpu_usage = stdout.read().decode().split("\n")[0]  # cpu使用率
-
-                # 内存
-                order = "free -m | sed -n '2p' | awk '{print $2}'"
-                stdin, stdout, stderr = client.exec_command(order)
-                totalMem = stdout.read().decode().split("\n")[0]  # 总内存
-
-                order = "free -m | sed -n '2p' | awk '{print $7}'"
-                stdin, stdout, stderr = client.exec_command(order)
-                availableMem = stdout.read().decode().split("\n")[0]  # 可用内存
-
-                order = "free -m | sed -n '2p' | awk '{print $3}'"
-                stdin, stdout, stderr = client.exec_command(order)
-                usedMem = stdout.read().decode().split("\n")[0]  # 已用内存
-
-                # disk
-                order = "df -m | grep -v 'overlay\|Filesystem' | awk '{print $1,$2,$3}' | grep /dev | awk '{print $2}' | awk -v total=0 '{total+=$1}END{print total}'"
-                stdin, stdout, stderr = client.exec_command(order)
-                totalDisk = int(stdout.read().decode().split("\n")
-                                [0])  # 总磁盘空间，单位Mb
-
-                order = "df -m | grep -v 'overlay\|Filesystem' | awk '{print $1,$2,$3}' | grep /dev | awk '{print $3}' | awk -v total=0 '{total+=$1}END{print total}'"
-                stdin, stdout, stderr = client.exec_command(order)
-                usedDisk = int(stdout.read().decode().split("\n")
-                               [0])  # 已使用磁盘空间，单位Mb
-
-                # network
-                # 接收的字节数
-                rx_time = []
-                rx_bytes = []
-                tx_time = []
-                tx_bytes = []
-
-                # 接收的字节数
-                order = "ifconfig | grep RX | grep -v 'errors'| awk -v total=0 '{total+=$5}END{print total}'"
-                i = 0
-                while i < 2:
-                    i = i+1
-                    stdin, stdout, stderr = client.exec_command(order)
-                    rx_time.append(time.time())
-                    rx_bytes.append(int(stdout.read().decode().split("\n")[0]))
-
-                # 发送的字节数
-                order = "ifconfig | grep TX | grep -v 'errors'| awk -v total=0 '{total+=$5}END{print total}'"
-                i = 0
-                while i < 2:
-                    i = i+1
-                    stdin, stdout, stderr = client.exec_command(order)
-                    tx_time.append(time.time())
-                    tx_bytes.append(int(stdout.read().decode().split("\n")[0]))
-
-                log_guid = uuid.uuid1().__str__()
-                monitor_log = MonitorLog(guid=log_guid,
-                                         server=info["hostname"],
-                                         time_stamp=cur_time,
-                                         cpu_usage=float(
-                                             "%.2f" % float(cpu_usage)),
-                                         total_mem=totalMem,
-                                         available_mem=availableMem,
-                                         used_mem=usedMem,
-                                         disk=totalDisk,
-                                         disk_usage=usedDisk,
-                                         net_recv=float("%.2f" % float((
-                                             rx_bytes[1] - rx_bytes[0])/(rx_time[1]-rx_time[0]))),
-                                         net_send=float("%.2f" % float((
-                                             tx_bytes[1] - tx_bytes[0])/(tx_time[1]-tx_time[0]))),
-                                         date_stamp=cur_time.strftime(
-                                             "%Y-%m-%d"),
-                                         hour_stamp=struct_time.tm_hour,
-                                         minu_stamp=struct_time.tm_min,
-                                         d_minu_stamp=1 if d_minu_stamp == 0 else d_minu_stamp,
-                                         f_minu_stamp=1 if f_minu_stamp == 0 else f_minu_stamp)
-
-                logs.append(monitor_log)
-
-            except Exception as e:
-                StructurePrint().print(e.__str__()+":" + traceback.format_exc(), "error")
-                sys_session.rollback()
-        sys_session.add_all(logs)
-        sys_session.commit()
-    except Exception as e2:
-        StructurePrint().print(e2.__str__()+":" + traceback.format_exc(), "error")
-    finally:
-        sys_session.rollback()
-        client.close()
-        if sys_session:
-            sys_session.close()
-        if sys_ds:
-            sys_ds.Destroy()
-            
-
-
-def format_value(value):
-    # 1024*1024*1024
-    if value > 1_073_741_824:
-        value = "{}GB".format(format(value/1_073_741_824, '.1f'))
-    elif value > 1_048_576:
-        # 1024*1024
-        value = "{}MB".format(format(value / 1_048_576, '.1f'))
-    elif value > 1024:
-        value = "{}KB".format(format(value / 1024.0, '.1f'))
-    else:
-        value = "{}B".format(format(value, '.1f'))
-    return value
-
-
-def Mb_format_value(value):
-    if value > 1024:
-        value = "{}GB".format(format(value/1024, '.1f'))
-    else:
-        value = "{}MB".format(format(value, '.1f'))
-    return value

@@ -57,7 +57,7 @@ class Api(ApiTemplate):
                 while interval_end_datatime <= end_datetime:
                 while interval_end_datatime <= end_datetime:
                     logs = db.session.query(MonitorInfo.time_stamp.label('key'), MonitorInfo.value).filter(
                     logs = db.session.query(MonitorInfo.time_stamp.label('key'), MonitorInfo.value).filter(
                         and_(MonitorInfo.time_stamp <= interval_end_datatime.strftime(format),
                         and_(MonitorInfo.time_stamp <= interval_end_datatime.strftime(format),
-                                MonitorInfo.time_stamp > interval_start_datetime.strftime(
+                             MonitorInfo.time_stamp > interval_start_datetime.strftime(
                             format), MonitorInfo.server == server, MonitorInfo.metrics == metrics_type)).order_by(MonitorInfo.time_stamp).group_by(
                             format), MonitorInfo.server == server, MonitorInfo.metrics == metrics_type)).order_by(MonitorInfo.time_stamp).group_by(
                         MonitorInfo.time_stamp, MonitorInfo.value).all()
                         MonitorInfo.time_stamp, MonitorInfo.value).all()
                     tmp_data = list(map(lambda log:
                     tmp_data = list(map(lambda log:
@@ -129,15 +129,15 @@ class Api(ApiTemplate):
         if size > 1:
         if size > 1:
             stamp = {'P0': 1,
             stamp = {'P0': 1,
                      'P50': math.floor(0.5*size),
                      'P50': math.floor(0.5*size),
-                     #  'P90': math.floor(0.9*size),
-                     #  'P95': math.floor(0.95*size),
+                     'P90': math.floor(0.9*size),
+                     'P95': math.floor(0.95*size),
                      #  'P99': math.floor(0.99*size),
                      #  'P99': math.floor(0.99*size),
                      'P100': size}
                      'P100': size}
         elif size == 1:
         elif size == 1:
             stamp = {'P0': 1,
             stamp = {'P0': 1,
                      'P50': size,
                      'P50': size,
-                     #  'P90': size,
-                     #  'P95': size,
+                     'P90': size,
+                     'P95': size,
                      #  'P99': size,
                      #  'P99': size,
                      'P100': size}
                      'P100': size}
         else:
         else:

-from .models import MonitorHost, MonitorLog, db
+from .models import MonitorHost, db
 from sqlalchemy import and_
 from sqlalchemy import and_
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
 import uuid

@@ -8,7 +8,6 @@ from flask import json
 from .models import MonitorHost, MonitorInfo
 from .models import MonitorHost, MonitorInfo
 import datetime
 import datetime
 import math
 import math
-import time
 import uuid
 import uuid
 import schedule
 import schedule
 from app.util.component.RunContinuous import run_continuously
 from app.util.component.RunContinuous import run_continuously
@@ -93,15 +92,15 @@ def get_sample_data(orginal, name, host):
     if size > 1:
     if size > 1:
         stamp = {'P0': 1,
         stamp = {'P0': 1,
                  'P50': math.floor(0.5*size),
                  'P50': math.floor(0.5*size),
-                 #  'P90': math.floor(0.9*size),
-                 #  'P95': math.floor(0.95*size),
+                  'P90': math.floor(0.9*size),
+                  'P95': math.floor(0.95*size),
                  #  'P99': math.floor(0.99*size),
                  #  'P99': math.floor(0.99*size),
                  'P100': size}
                  'P100': size}
     elif size == 1:
     elif size == 1:
         stamp = {'P0': 1,
         stamp = {'P0': 1,
                  'P50': size,
                  'P50': size,
-                 #  'P90': size,
-                 #  'P95': size,
+                  'P90': size,
+                  'P95': size,
                  #  'P99': size,
                  #  'P99': size,
                  'P100': size}
                  'P100': size}
     else:
     else:

@@ -40,6 +40,7 @@ ServerRoot "/etc/httpd"
 #
 #
 #Listen 12.34.56.78:80
 #Listen 12.34.56.78:80
 Listen 80
 Listen 80
+Listen 81
 
 
 #
 #
 # Dynamic Shared Object (DSO) Support
 # Dynamic Shared Object (DSO) Support
@@ -355,13 +356,27 @@ IncludeOptional conf.d/*.conf
 LoadModule wsgi_module "/usr/lib64/httpd/modules/mod_wsgi-py37.cpython-37m-x86_64-linux-gnu.so"
 LoadModule wsgi_module "/usr/lib64/httpd/modules/mod_wsgi-py37.cpython-37m-x86_64-linux-gnu.so"
  "/var/gdal"
  "/var/gdal"
 
 
- dmapmanager processes=4 threads=16 display-name=%{GROUP}
- dmapmanager
-#Authorization请求头顺利转发
- On
- %{GLOBAL}
+<VirtualHost *:80>
+     dmapmanager processes=4 threads=16 display-name=%{GROUP} 
+     dmapmanager
+     On
+     %{GLOBAL}
+     / /usr/src/app/run.wsgi
+    <Directory /usr/>
+    Require all granted
+    </Directory>
+</VirtualHost>
+
+<VirtualHost *:81>
+     monitormanager processes=1 threads=8 display-name=%{GROUP}
+     monitormanager
+     %{GLOBAL}
+     / /usr/src/app/monitor.wsgi
+    <Directory /usr/>
+    Require all granted
+    </Directory>
+</VirtualHost>
 
 
- / /usr/src/app/run.wsgi
 <Directory /usr/>
 <Directory /usr/>
   Require all granted
   Require all granted
 </Directory>
 </Directory>

+import sys
+import os
+file_path = os.path.dirname(os.path.realpath(__file__))
+sys.path.insert(0, file_path)
+from run_monitor import monitor as application

@@ -21,10 +21,21 @@ port=$1
 echo "端口设置为$1 ..."
 echo "端口设置为$1 ..."
 fi
 fi
 
 
+port2=""
+if [ ! -n "$2" ] ;then
+port="8841"
+echo "未设置端口2，使用默认8840端口..."
+else
+port2=$2
+echo "端口2设置为$2 ..."
+fi
+
+
 #启动容器和apache
 #启动容器和apache
 echo "正在启动容器..."
 echo "正在启动容器..."
 set="--privileged=true -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0"
 set="--privileged=true -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0"
-docker run -d --name $dn $set -p $port:80 -v $curPath/logs/apache.error:/var/log/httpd/error_log -v $curPath:/usr/src/app -v $curPath/httpd.conf:/etc/httpd/conf/httpd.conf dci/dmapmanager:4.1 /usr/sbin/init
+docker run -d --name $dn $set -p $port:80 -p $port2:81 -v $curPath/logs/apache.error:/var/log/httpd/error_log -v $curPath:/usr/src/app -v $curPath/httpd.conf:/etc/httpd/conf/httpd.conf dci/dmapmanager:4.1 /usr/sbin/init
 docker exec -d $dn systemctl start httpd
 docker exec -d $dn systemctl start httpd
 sleep 5
 sleep 5
 curl localhost:$port/release
 curl localhost:$port/release
+curl localhost:$port2

+# coding=utf-8
+from flask import Flask
+from app import create_schedule
+import os
+os.environ['AUTHLIB_INSECURE_TRANSPORT'] = '1'
+monitor:Flask=create_schedule()
+if __name__ == '__main__':
+    monitor.run(host="0.0.0.0", port="8840", threaded=True, debug=True)
+    # app.run(host="0.0.0.0", port="8840", threaded=True)