From a533cb631ecfeed1d9685d085644d78b6c5c59ac Mon Sep 17 00:00:00 2001 From: yanchao <845059920@qq.com> Date: Wed, 31 Jul 2019 17:54:08 +0800 Subject: [PATCH 01/10] aa --- PWM/settings.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PWM/settings.py b/PWM/settings.py index bef014e..56cf2d1 100644 --- a/PWM/settings.py +++ b/PWM/settings.py @@ -200,15 +200,15 @@ CONSUL_PROMETHEUS_RULES_DIR = 'prometheus-rules' CONSUL_ALERTMANAGER_DIR = 'alertmanager-config' -SMS_URL = 'http://172.18.100.168:20019/esbsmstrue/api/sms/general/send' -SENDMAIL_SMTP = 'smtp.jieyuechina.com:25' -SENDMAIL_SENDER = 'chaoyan1@jieyuechina.com' -SENDMAIL_SENDER_PASSWORD = 'Chinayc19880510#' +SMS_URL = '' +SENDMAIL_SMTP = '' +SENDMAIL_SENDER = '' +SENDMAIL_SENDER_PASSWORD = '' MONTIOR_REDIS = '10.50.182.65' MONTIOR_PORT = 6379 -WX_URL = 'http://outrel.jieyue.com/outrel/api/externalplatform/interfaceRest/extInterface/v2' +WX_URL = '' ALERTMANAGER_HTTP = 'http://10.50.182.65:9093' ALERTMANAGER_SILENCES_URI = '/api/v2/silences' From 79cd46dc0db7cf6f1b1d906db83659bfbc6724f0 Mon Sep 17 00:00:00 2001 From: yanchao <845059920@qq.com> Date: Wed, 31 Jul 2019 18:20:48 +0800 Subject: [PATCH 02/10] s --- monitor/utils/police.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monitor/utils/police.py b/monitor/utils/police.py index 0603e1d..8d32303 100644 --- a/monitor/utils/police.py +++ b/monitor/utils/police.py @@ -168,7 +168,7 @@ def wx(self,data): "sysCode": "weChat", "funcType": "weChat", "funcPointType": "skynetEarlyWarning", - "frontTransNo": "Q1001F3D7BB211111afgdsafs1", + "frontTransNo": "", "frontTransTime": time1, "interfaceNo": "skynetEarlyWarning", "prod": "weChat", @@ -182,4 +182,4 @@ def wx(self,data): } } r = requests.post(settings.WX_URL, headers=headers,data=json.dumps(data),verify=False) - return 'ok' \ No newline at end of file + return 'ok' From a3d8d63a3f1b8774324bb8ae16a5c0410802e66f Mon Sep 17 00:00:00 2001 From: hongendu Date: Thu, 1 Aug 2019 14:45:58 +0800 Subject: [PATCH 03/10] del req --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 49dac4d..e20eb4a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,6 @@ iniparse==0.4 IPy==0.75 kitchen==1.1.1 msgpack-python==0.5.6 -perf==0.1 policycoreutils-default-encoding==0.1 prometheus-client==0.6.0 pycurl==7.19.0 From 9e79bc008d2baac17b2ffe4b7be0ffa1ae30c4a3 Mon Sep 17 00:00:00 2001 From: hongendu Date: Thu, 1 Aug 2019 15:09:22 +0800 Subject: [PATCH 04/10] s --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e20eb4a..69ab860 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,6 @@ iniparse==0.4 IPy==0.75 kitchen==1.1.1 msgpack-python==0.5.6 -policycoreutils-default-encoding==0.1 prometheus-client==0.6.0 pycurl==7.19.0 pygobject==3.22.0 From e753b595f11c02d0c125fcd63ec30d1ab1dd44eb Mon Sep 17 00:00:00 2001 From: hongendu Date: Thu, 1 Aug 2019 15:15:14 +0800 Subject: [PATCH 05/10] s --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 69ab860..a4d5d02 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,6 @@ pygobject==3.22.0 pygpgme==0.3 pyliblzma==0.5.3 python-consul==1.1.0 -python-linux-procfs==0.4.9 pytz==2019.1 pyudev==0.15 pyxattr==0.5.1 From 00e396ecd0600ee20c240cf6f9729ec389ef9bdb Mon Sep 17 00:00:00 2001 From: hongendu Date: Thu, 1 Aug 2019 15:21:14 +0800 Subject: [PATCH 06/10] s --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a4d5d02..5cdd921 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,6 @@ pyudev==0.15 pyxattr==0.5.1 redis==3.3.2 requests==2.22.0 -schedutils==0.4 seobject==0.1 sepolicy==1.1 six==1.12.0 From 279f01563aa7c292ca05278c2d86bc2c521af971 Mon Sep 17 00:00:00 2001 From: hongendu Date: Thu, 1 Aug 2019 15:25:49 +0800 Subject: [PATCH 07/10] s --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 5cdd921..5e57390 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,6 @@ decorator==3.4.0 Django==1.11.22 django-cors-headers==3.0.2 djangorestframework==3.9.4 -futures==3.2.0 grpc==0.3.post19 idna==2.8 iniparse==0.4 From 583edcdd0c91e2f18347945ae2abcaf2bf06d47d Mon Sep 17 00:00:00 2001 From: hongendu Date: Thu, 1 Aug 2019 15:31:14 +0800 Subject: [PATCH 08/10] s --- requirements.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5e57390..337ac88 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,11 +22,4 @@ pyudev==0.15 pyxattr==0.5.1 redis==3.3.2 requests==2.22.0 -seobject==0.1 -sepolicy==1.1 -six==1.12.0 -slip==0.4.0 -slip.dbus==0.4.0 -urlgrabber==3.10 urllib3==1.25.3 -yum-metadata-parser==1.1.4 From dca62b78deeba08e9b8255da2ee4d75d6516f927 Mon Sep 17 00:00:00 2001 From: hongendu Date: Thu, 1 Aug 2019 16:21:08 +0800 Subject: [PATCH 09/10] add dockerfile --- Dockerfile | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..cb5880d --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +#Author:YANCHAO +FROM centos +MAINTAINER yanchao@jieyuechina.com +ENV EZ_DIR=/opt/ +ENV PROJECT_DIR=/opt/PWM +ENV PIP_DIR=/opt/pip-19.1.1 +ADD PWM.tar.gz /opt/ +ADD 19.1.1.tar.gz /opt/ +ADD ez_setup.py /opt/ +WORKDIR $EZ_DIR +RUN python ez_setup.py +WORKDIR $PIP_DIR +RUN python setup.py install +WORKDIR $PROJECT_DIR +RUN pip install -r requirements.txt +RUN python manage.py makemigrations +RUN python manage.py migrate +EXPOSE 888 +CMD ["python manage.py runserver 0.0.0.0:888"] +ENTRYPOINT ["/bin/bash","-c"] From 5453d95b61374fc0cb5aaf686f54486782a901c3 Mon Sep 17 00:00:00 2001 From: yanchao <845059920@qq.com> Date: Mon, 5 Aug 2019 14:41:26 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=E7=AB=AFdocke?= =?UTF-8?q?rfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 10 ++++++++-- install.sh | 12 ++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 install.sh diff --git a/Dockerfile b/Dockerfile index cb5880d..8af186f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,13 @@ MAINTAINER yanchao@jieyuechina.com ENV EZ_DIR=/opt/ ENV PROJECT_DIR=/opt/PWM ENV PIP_DIR=/opt/pip-19.1.1 +ENV CONSUL_IP="10.50.182.65" +ENV MONTIOR_REDIS="10.50.182.65" +ENV ALERTMANAGER_HTTP="10.50.182.65:9093" ADD PWM.tar.gz /opt/ ADD 19.1.1.tar.gz /opt/ ADD ez_setup.py /opt/ +ADD install.sh /opt/ WORKDIR $EZ_DIR RUN python ez_setup.py WORKDIR $PIP_DIR @@ -15,6 +19,8 @@ WORKDIR $PROJECT_DIR RUN pip install -r requirements.txt RUN python manage.py makemigrations RUN python manage.py migrate +RUN chmod +x /opt/install.sh EXPOSE 888 -CMD ["python manage.py runserver 0.0.0.0:888"] -ENTRYPOINT ["/bin/bash","-c"] +#CMD ["python manage.py runserver 0.0.0.0:888"] +#ENTRYPOINT ["/bin/bash","-c"] +ENTRYPOINT /opt/install.sh ${CONSUL_IP} ${MONTIOR_REDIS} ${ALERTMANAGER_HTTP} diff --git a/install.sh b/install.sh new file mode 100644 index 0000000..85fe65c --- /dev/null +++ b/install.sh @@ -0,0 +1,12 @@ +#!/bin/bash +BASE_DIR=/opt/PWM + +cd $BASE_DIR && sed -i '/CONSUL_IP/d' PWM/settings.py +cd $BASE_DIR && echo "CONSUL_IP = '$1'" >> PWM/settings.py + +cd $BASE_DIR && sed -i '/MONTIOR_REDIS/d' PWM/settings.py +cd $BASE_DIR && echo "MONTIOR_REDIS = '$2'" >> PWM/settings.py + +cd $BASE_DIR && sed -i 's/10.50.182.65:9093/'$3'/g' PWM/settings.py + +cd $BASE_DIR && python manage.py runserver 0.0.0.0:888