guohongze · lvhaidong · Apr 23, 2018 · Apr 23, 2018 · Apr 23, 2018
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/accounts/__init__.py b/accounts/__init__.py
diff --git a/accounts/__init__.pyc b/accounts/__init__.pyc
diff --git a/accounts/admin.py b/accounts/admin.py
diff --git a/accounts/admin.pyc b/accounts/admin.pyc
diff --git a/accounts/apps.py b/accounts/apps.py
diff --git a/accounts/forms.py b/accounts/forms.py
diff --git a/accounts/forms.pyc b/accounts/forms.pyc
diff --git a/accounts/migrations/0001_initial.py b/accounts/migrations/0001_initial.py
diff --git a/accounts/migrations/0001_initial.pyc b/accounts/migrations/0001_initial.pyc
diff --git a/accounts/migrations/__init__.py b/accounts/migrations/__init__.py
diff --git a/accounts/migrations/__init__.pyc b/accounts/migrations/__init__.pyc
diff --git a/accounts/models.py b/accounts/models.py
diff --git a/accounts/models.pyc b/accounts/models.pyc
diff --git a/accounts/permission.py b/accounts/permission.py
diff --git a/accounts/permission.pyc b/accounts/permission.pyc
diff --git a/accounts/role.py b/accounts/role.py
diff --git a/accounts/role.pyc b/accounts/role.pyc
diff --git a/accounts/tests.py b/accounts/tests.py
diff --git a/accounts/urls.py b/accounts/urls.py
diff --git a/accounts/urls.pyc b/accounts/urls.pyc
diff --git a/accounts/user.py b/accounts/user.py
diff --git a/accounts/user.pyc b/accounts/user.pyc
diff --git a/adminset.conf b/adminset.conf
@@ -9,12 +9,13 @@ engine = mysql
 host = 127.0.0.1
 port = 3306
 user = root
-password =
+password = 123456 
 database = adminset
+charset=utf8
 
 [token]
 token = HPcWR7l4NJNJ
-ssh_pwd = root
+ssh_pwd = HPcWR7l4NJNJ
 
 [log]
 log_path = /var/opt/adminset/logs
@@ -23,17 +24,31 @@ log_level = info
 [mongodb]
 mongodb_ip = 127.0.0.1
 mongodb_port = 27017
-mongodb_user =
-mongodb_pwd =
+mongodb_user = 
+mongodb_pwd = 
 collection = sys_info
 
 [webssh]
-domain = adminset.cn
+domain = meidai.f3322.net
 
 [redis]
 redis_host = 127.0.0.1
 redis_port = 6379
-redis_password =
+redis_password = 
 redis_db = 0
 
+[zabbix]
+url = http://zabbix.meidai.f3322.net/zabbix
+user = Admin
+password = zabbix
+login_url = http://zabbix.meidai.f3322.net/zabbix/index.php
+graph = http://zabbix.meidai.f3322.net/zabbix/chart2.php
+
+[zbmysql]
+host=10.10.10.234
+port=3306
+user=zabbix
+passwd=zabbix
+db=zabbix
+charset=utf8
 
diff --git a/adminset/__init__.py b/adminset/__init__.py
diff --git a/adminset/__init__.pyc b/adminset/__init__.pyc
diff --git a/adminset/celery.py b/adminset/celery.py
diff --git a/adminset/celery.pyc b/adminset/celery.pyc
diff --git a/adminset/ldap.py b/adminset/ldap.py
diff --git a/adminset/middleware.py b/adminset/middleware.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+# author:lvhaidong
+# datetime:2018/4/19 00:00
+# software: PyCharm
+
+import time
+
+import logging
+from lib.log import log
+from config.views import get_dir
+
+level = get_dir("log_level")
+log_path = get_dir("log_path")
+log("middleware.log", level, "/Users/lvhaidong/Desktop/main/logs")
+
+
+class AccessMiddleware(object):
+    def process_request(self, request):
+        meta = request.META
+        print "[%s] PATH_INFO=%s, REMOTE_ADDR=%s, HTTP_USER_AGENT=%s" \
+              % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
+                 meta['PATH_INFO'], meta['REMOTE_ADDR'], meta['HTTP_USER_AGENT'])
+        logging.debug("[%s] PATH_INFO=%s, REMOTE_ADDR=%s, HTTP_USER_AGENT=%s" \
+                     % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
+                        meta['PATH_INFO'], meta['REMOTE_ADDR'], meta['HTTP_USER_AGENT']))
+        logging.info("[%s] PATH_INFO=%s, REMOTE_ADDR=%s, HTTP_USER_AGENT=%s" \
+                      % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
+                         meta['PATH_INFO'], meta['REMOTE_ADDR'], meta['HTTP_USER_AGENT']))
+        logging.warning("[%s] PATH_INFO=%s, REMOTE_ADDR=%s, HTTP_USER_AGENT=%s" \
+                      % (time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
+                         meta['PATH_INFO'], meta['REMOTE_ADDR'], meta['HTTP_USER_AGENT']))
+        return None
+
+    def process_response(self, request, response):
+        return response
diff --git a/adminset/middleware.pyc b/adminset/middleware.pyc
diff --git a/adminset/settings.py b/adminset/settings.py
@@ -52,6 +52,7 @@
     'monitor',
     'appconf',
     'delivery',
+    'zabbix',
     'django_celery_results',
     'django_celery_beat',
     'django.contrib.admin',
@@ -60,6 +61,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'jsonrpc',
 ]
 
 MIDDLEWARE_CLASSES = [
@@ -71,6 +73,7 @@
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    # 'adminset.middleware.AccessMiddleware',
 ]
 
 ROOT_URLCONF = 'adminset.urls'

diff --git a/adminset/settings.pyc b/adminset/settings.pyc
diff --git a/adminset/urls.py b/adminset/urls.py
@@ -1,6 +1,5 @@
 from django.conf.urls import include, url
 from django.contrib import admin
-from django.conf import settings
 import views
 
 urlpatterns = [
@@ -14,4 +13,6 @@
     url(r'^accounts/', include('accounts.urls')),
     url(r'^appconf/', include('appconf.urls')),
     url(r'^delivery/', include('delivery.urls')),
-]
+    url(r'^zabbix/', include('zabbix.urls')),
+]
+
diff --git a/adminset/urls.pyc b/adminset/urls.pyc
diff --git a/adminset/views.py b/adminset/views.py
@@ -1,8 +1,10 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
+import json
+
 
 from django.shortcuts import redirect
 
 
 def index(request):
-    return redirect('/navi/')
+    return redirect('/navi/')
diff --git a/adminset/views.pyc b/adminset/views.pyc
diff --git a/adminset/wsgi.py b/adminset/wsgi.py
diff --git a/adminset/wsgi.pyc b/adminset/wsgi.pyc
diff --git a/appconf/__init__.py b/appconf/__init__.py
diff --git a/appconf/__init__.pyc b/appconf/__init__.pyc
diff --git a/appconf/appowner.py b/appconf/appowner.py
diff --git a/appconf/appowner.pyc b/appconf/appowner.pyc
diff --git a/appconf/apps.py b/appconf/apps.py
diff --git a/appconf/authinfo.py b/appconf/authinfo.py
diff --git a/appconf/authinfo.pyc b/appconf/authinfo.pyc
diff --git a/appconf/forms.py b/appconf/forms.py
diff --git a/appconf/forms.pyc b/appconf/forms.pyc
diff --git a/appconf/migrations/0001_initial.py b/appconf/migrations/0001_initial.py
diff --git a/appconf/migrations/0001_initial.pyc b/appconf/migrations/0001_initial.pyc
diff --git a/appconf/migrations/__init__.py b/appconf/migrations/__init__.py
diff --git a/appconf/migrations/__init__.pyc b/appconf/migrations/__init__.pyc
diff --git a/appconf/models.py b/appconf/models.py
diff --git a/appconf/models.pyc b/appconf/models.pyc
diff --git a/appconf/product.py b/appconf/product.py
diff --git a/appconf/product.pyc b/appconf/product.pyc
diff --git a/appconf/project.py b/appconf/project.py
diff --git a/appconf/project.pyc b/appconf/project.pyc
diff --git a/appconf/tests.py b/appconf/tests.py
diff --git a/appconf/urls.py b/appconf/urls.py
diff --git a/appconf/urls.pyc b/appconf/urls.pyc
diff --git a/appconf/views.py b/appconf/views.py
diff --git a/cmdb/__init__.py b/cmdb/__init__.py
diff --git a/cmdb/__init__.pyc b/cmdb/__init__.pyc
diff --git a/cmdb/admin.py b/cmdb/admin.py
diff --git a/cmdb/admin.pyc b/cmdb/admin.pyc
diff --git a/cmdb/api.py b/cmdb/api.py
diff --git a/cmdb/api.pyc b/cmdb/api.pyc
diff --git a/cmdb/apps.py b/cmdb/apps.py
diff --git a/cmdb/asset.py b/cmdb/asset.py
diff --git a/cmdb/asset.pyc b/cmdb/asset.pyc
diff --git a/cmdb/cabinet.py b/cmdb/cabinet.py
diff --git a/cmdb/cabinet.pyc b/cmdb/cabinet.pyc
diff --git a/cmdb/forms.py b/cmdb/forms.py
diff --git a/cmdb/forms.pyc b/cmdb/forms.pyc
diff --git a/cmdb/group.py b/cmdb/group.py
diff --git a/cmdb/group.pyc b/cmdb/group.pyc
diff --git a/cmdb/idc.py b/cmdb/idc.py
diff --git a/cmdb/idc.pyc b/cmdb/idc.pyc
diff --git a/cmdb/migrations/0001_initial.py b/cmdb/migrations/0001_initial.py
diff --git a/cmdb/migrations/0001_initial.pyc b/cmdb/migrations/0001_initial.pyc
diff --git a/cmdb/migrations/__init__.py b/cmdb/migrations/__init__.py
diff --git a/cmdb/migrations/__init__.pyc b/cmdb/migrations/__init__.pyc
diff --git a/cmdb/models.py b/cmdb/models.py
diff --git a/cmdb/models.pyc b/cmdb/models.pyc
diff --git a/cmdb/templatetags/__init__.py b/cmdb/templatetags/__init__.py
diff --git a/cmdb/templatetags/__init__.pyc b/cmdb/templatetags/__init__.pyc
diff --git a/cmdb/templatetags/mytags.py b/cmdb/templatetags/mytags.py
diff --git a/cmdb/templatetags/mytags.pyc b/cmdb/templatetags/mytags.pyc
diff --git a/cmdb/urls.py b/cmdb/urls.py
@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
-from django.conf.urls import url, include
+from django.conf.urls import url
 from cmdb import api, idc, asset, group, cabinet
 
 

diff --git a/cmdb/urls.pyc b/cmdb/urls.pyc
diff --git a/config/__init__.py b/config/__init__.py
diff --git a/config/__init__.pyc b/config/__init__.pyc
diff --git a/config/admin.py b/config/admin.py
diff --git a/config/admin.pyc b/config/admin.pyc
diff --git a/config/apps.py b/config/apps.py
diff --git a/config/migrations/__init__.py b/config/migrations/__init__.py
diff --git a/config/migrations/__init__.pyc b/config/migrations/__init__.pyc
diff --git a/config/models.py b/config/models.py
diff --git a/config/models.pyc b/config/models.pyc
diff --git a/config/tests.py b/config/tests.py
diff --git a/config/urls.py b/config/urls.py
diff --git a/config/urls.pyc b/config/urls.pyc
diff --git a/config/views.py b/config/views.py
@@ -173,6 +173,11 @@ def get_dir(args):
         redis_port = config.get('redis', 'redis_port')
         redis_password = config.get('redis', 'redis_password')
         redis_db = config.get('redis', 'redis_db')
+        zabbix_url = config.get('zabbix', 'url')
+        zabbix_user = config.get('zabbix', 'user')
+        zabbix_passwd = config.get('zabbix', 'password')
+        login_url = config.get('zabbix', 'login_url')
+        graph = config.get('zabbix', 'graph')
     # 根据传入参数返回变量以获取配置，返回变量名与参数名相同
     if args:
         return vars()[args]

diff --git a/config/views.pyc b/config/views.pyc
diff --git a/delivery/__init__.py b/delivery/__init__.py
diff --git a/delivery/__init__.pyc b/delivery/__init__.pyc
diff --git a/delivery/admin.py b/delivery/admin.py
diff --git a/delivery/admin.pyc b/delivery/admin.pyc
diff --git a/delivery/apps.py b/delivery/apps.py
diff --git a/delivery/delivery.py b/delivery/delivery.py
diff --git a/delivery/delivery.pyc b/delivery/delivery.pyc
diff --git a/delivery/forms.py b/delivery/forms.py
diff --git a/delivery/forms.pyc b/delivery/forms.pyc
diff --git a/delivery/migrations/0001_initial.py b/delivery/migrations/0001_initial.py
diff --git a/delivery/migrations/0001_initial.pyc b/delivery/migrations/0001_initial.pyc
diff --git a/delivery/migrations/__init__.py b/delivery/migrations/__init__.py
diff --git a/delivery/migrations/__init__.pyc b/delivery/migrations/__init__.pyc
diff --git a/delivery/models.py b/delivery/models.py
diff --git a/delivery/models.pyc b/delivery/models.pyc
diff --git a/delivery/tasks.py b/delivery/tasks.py
diff --git a/delivery/tasks.pyc b/delivery/tasks.pyc
diff --git a/delivery/urls.py b/delivery/urls.py
diff --git a/delivery/urls.pyc b/delivery/urls.pyc
diff --git a/delivery/views.py b/delivery/views.py
diff --git a/docs/Manual.md b/docs/Manual.md
@@ -223,6 +223,7 @@
     建议adminset放在网管区中，并且开启防火墙。
     django的settings中开启了DEBUG，在生产中需要关闭并指定自己的域名。
     adminset设计初衷为超级管理员工具集成平台，所以后台权限都使用超管权限，如果生产环境中不符合安全要求，需要自定义各后台权限调用。
-
-# 开发者交流
-  QQ群：536962005
+
+
+# 新增zabbix的模板绑定与解除,主机的创建并且添加到主机组,一个监控按钮
+  在需要新增一个zabbix_host表,并且在adminset.conf中修改对应的zabbix,zbmysql 既可
diff --git a/gunicorn_conf.py b/gunicorn_conf.py
diff --git a/install/client/adminset_agent.py b/install/client/adminset_agent.py
@@ -4,7 +4,7 @@
 import psutil, schedule, requests
 from subprocess import Popen, PIPE
 import logging
-AGENT_VERSION = "0.23"
+AGENT_VERSION = "0.21"
 token = 'HPcWR7l4NJNJ'
 server_ip = '192.168.47.130'
 

diff --git a/install/client/adminsetd.service b/install/client/adminsetd.service
diff --git a/install/client/install.sh b/install/client/install.sh
@@ -34,25 +34,22 @@ EOF
 
 echo "####install pip packages####"
 mkdir -p $work_dir
-
+pip install -U pip==9.0.3
+pip install virtualenv==15.2.0
 source /etc/profile
 
 echo "####config adminset agent####"
 if (echo $os|grep centos) || (echo $os|grep 'Red Hat')
 then
     if (rpm -ql python|grep 2.6)
     then
-        pip install -U pip==9.0.3
-        pip install virtualenv==14.0.0
-        pip install setuptools==28.5.0
+        pip install setuptools==0.6rc11
         scp $cur_dir/adminset_agent.py $work_dir
         scp $cur_dir/adminsetd /etc/init.d/
         dos2unix $work_dir/adminset_agent.py
         dos2unix /etc/init.d/adminsetd
         chmod +x /etc/init.d/adminsetd
     else
-        pip install -U pip==9.0.3
-        pip install virtualenv==15.2.0
         scp $cur_dir/adminset_agent.py $work_dir
         scp $cur_dir/adminsetd.service /usr/lib/systemd/system/
         dos2unix $work_dir/adminset_agent.py
@@ -62,8 +59,6 @@ then
     chkconfig adminsetd on
 elif (echo $os|grep Ubuntu)
 then
-    pip install -U pip==9.0.3
-    pip install virtualenv==15.2.0
     scp $cur_dir/adminset_agent.py $work_dir
     scp $cur_dir/adminsetd.service /etc/systemd/system/
     fromdos $work_dir/adminset_agent.py
@@ -77,7 +72,7 @@ fi
 cd $work_dir
 virtualenv venv
 source $work_dir/venv/bin/activate
-#pip install python-daemon==2.1.2
+pip install python-daemon==2.1.2
 pip install requests==2.11.1
 pip install psutil==5.2.2
 pip install schedule==0.4.3

diff --git a/install/server/adminset.service b/install/server/adminset.service
diff --git a/install/server/ansible/ansible.cfg b/install/server/ansible/ansible.cfg
diff --git a/install/server/celery/beat.conf b/install/server/celery/beat.conf
diff --git a/install/server/celery/beat.service b/install/server/celery/beat.service
diff --git a/install/server/celery/celery.service b/install/server/celery/celery.service
diff --git a/install/server/celery/start_celery.sh b/install/server/celery/start_celery.sh
diff --git a/install/server/nginx/adminset.conf b/install/server/nginx/adminset.conf
diff --git a/install/server/nginx/adminset.conf.https b/install/server/nginx/adminset.conf.https
diff --git a/install/server/nginx/nginx.conf b/install/server/nginx/nginx.conf
diff --git a/install/server/nginx/nginx.crt b/install/server/nginx/nginx.crt
diff --git a/install/server/nginx/nginx.key b/install/server/nginx/nginx.key
diff --git a/install/server/ssh/config b/install/server/ssh/config
diff --git a/install/server/webssh/webssh.service b/install/server/webssh/webssh.service
diff --git a/lib/__init__.py b/lib/__init__.py
diff --git a/lib/__init__.pyc b/lib/__init__.pyc
diff --git a/lib/backup.py b/lib/backup.py
diff --git a/lib/code.py b/lib/code.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+# author:lvhaidong
+# datetime:2018/4/19 13:15
+# software: PyCharm
+
+
+class ResponseCode(object):
+    """返回代码"""
+
+    SUCCEED = 1  # 成功
+    FAIL = 0
+    ERROR = -1  # 失败
+
+
+class ResponseMessage(object):
+    """响应信息"""
+    NOT_LOGIN = "Not Login!"
diff --git a/lib/common.py b/lib/common.py
diff --git a/lib/common.pyc b/lib/common.pyc