7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pycook/cmdb

This commit is contained in:
pycook 2020-04-07 18:03:03 +08:00
parent f2dcd7b82a c60bfe6dd3
commit 854202881d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -26,7 +26,7 @@ COPY cmdb-api /data/apps/cmdb
WORKDIR /data/apps/cmdb WORKDIR /data/apps/cmdb
RUN apk add --no-cache tzdata gcc musl-dev libffi-dev RUN apk add --no-cache tzdata gcc musl-dev libffi-dev openldap-dev
ENV TZ=Asia/Shanghai ENV TZ=Asia/Shanghai

4
cmdb-api/api/lib/cmdb/history.py
View File

@ -1,4 +1,4 @@
# -*- coding:utf-8 -*- # -*- coding:utf-8 -*-
import json import json
@ -83,7 +83,7 @@ class AttributeHistoryManger(object):
username = UserCache.get(record.uid).nickname or UserCache.get(record.uid).username username = UserCache.get(record.uid).nickname or UserCache.get(record.uid).username
timestamp = record.created_at.strftime("%Y-%m-%d %H:%M:%S") timestamp = record.created_at.strftime("%Y-%m-%d %H:%M:%S")
attr_history = AttributeHistory.get_By(record_id=record_id, to_dict=False) attr_history = AttributeHistory.get_by(record_id=record_id, to_dict=False)
rel_history = CIRelationHistory.get_by(record_id=record_id, to_dict=False) rel_history = CIRelationHistory.get_by(record_id=record_id, to_dict=False)
attr_dict, rel_dict = dict(), {"add": [], "delete": []} attr_dict, rel_dict = dict(), {"add": [], "delete": []}

6
docker-compose.yml
View File

@ -54,7 +54,7 @@ services:
- cmdb-search - cmdb-search
cmdb-api: cmdb-api:
image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-api:2.1 image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-api:2.2
# build: # build:
# context: . # context: .
# target: cmdb-api # target: cmdb-api
@ -74,7 +74,7 @@ services:
gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D
flask init-cache flask init-cache
flask init-acl flask init-acl
celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1 celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1
depends_on: depends_on:
- cmdb-db - cmdb-db
@ -86,7 +86,7 @@ services:
- cmdb-api - cmdb-api
cmdb-ui: cmdb-ui:
image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-ui:2.1 image: registry.cn-qingdao.aliyuncs.com/pycook/cmdb-ui:2.2
# build: # build:
# context: . # context: .
# target: cmdb-ui # target: cmdb-ui

4
docs/cmdb.sql
View File

@ -778,7 +778,7 @@ CREATE TABLE `c_ci_types` (
LOCK TABLES `c_ci_types` WRITE; LOCK TABLES `c_ci_types` WRITE;
/*!40000 ALTER TABLE `c_ci_types` DISABLE KEYS */; /*!40000 ALTER TABLE `c_ci_types` DISABLE KEYS */;
INSERT INTO `c_ci_types` VALUES (NULL,0,'2019-08-25 10:42:25',NULL,1,'bu','事业部',1,1,0,'',0),(NULL,0,'2019-08-25 10:45:39',NULL,2,'product','产品线',3,1,0,'',0),(NULL,0,'2019-08-25 10:46:08',NULL,3,'app','应用',4,1,0,'',0),(NULL,0,'2019-08-25 10:57:37',NULL,4,'server','服务器',5,1,0,'',0),(NULL,0,'2019-08-25 10:58:44',NULL,5,'docker','Docker',6,1,0,'',0),(NULL,0,'2019-08-25 11:04:12',NULL,6,'NIC','网卡',7,1,1,'',0),(NULL,0,'2019-08-25 11:04:24',NULL,7,'harddisk','硬盘',8,1,1,'',0),(NULL,0,'2019-08-25 11:04:45',NULL,8,'RAM','内存',9,1,1,'',0); INSERT INTO `c_ci_types` VALUES (NULL,0,'2019-08-25 10:42:25',NULL,1,'bu','事业部',1,1,0,'',0),(NULL,0,'2019-08-25 10:45:39',NULL,2,'product','产品线',3,1,0,'',0),(NULL,0,'2019-08-25 10:46:08',NULL,3,'app','应用',4,1,0,'',0),(NULL,0,'2019-08-25 10:57:37',NULL,4,'server','服务器',5,1,0,'',0),(NULL,0,'2019-08-25 10:58:44',NULL,5,'docker','Docker',6,1,0,'',0),(NULL,0,'2019-08-25 11:04:12',NULL,6,'NIC','网卡',7,1,0,'',0),(NULL,0,'2019-08-25 11:04:24',NULL,7,'harddisk','硬盘',8,1,0,'',0),(NULL,0,'2019-08-25 11:04:45',NULL,8,'RAM','内存',9,1,0,'',0);
/*!40000 ALTER TABLE `c_ci_types` ENABLE KEYS */; /*!40000 ALTER TABLE `c_ci_types` ENABLE KEYS */;
UNLOCK TABLES; UNLOCK TABLES;
@ -1379,4 +1379,4 @@ UNLOCK TABLES;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2020-02-23 18:39:52 -- Dump completed on 2020-04-01 20:34:38