Merge pull request #3 from Tencent/v3.3.x

V3.3.x

.travis.yml

@@ -7,6 +7,7 @@ go:
 branches:
   only:
   - master
+  - /^v3\.[1-9]+[0-9]*[0-9]*\.x$/
   - travis_ci
 
 env:

ISSUE_TEMPLATE.md

@@ -1,27 +1,34 @@
-
 问题描述
 ===========
-<这里写问题描述>
+<!-- 这里写问题描述 -->
 
 
 重现方法
 ================
-<列出如何重现的方法或操作步骤>
+<!-- 列出如何重现的方法或操作步骤 -->
 
 
-**重要提醒**: 请优先尝试最新发布的版本 (发布清单： https://github.com/Tencent/bk-cmdb/releases), 如果问题不能在最新发布的版本里重现，说明此问题已经被修复。
+<!-- **重要提醒**:  请优先尝试最新发布的版本 (发布清单： https://github.com/Tencent/bk-cmdb/releases), 如果问题不能在最新发布的版本里重现，说明此问题已经被修复。 -->
 
 
 关键信息
 =========
 
-**重要提醒**: 这些关键信息会辅助我们快速定位问题。
+<!--  **重要提醒**: 这些关键信息会辅助我们快速定位问题。 -->
 
 请提供以下信息:
 
- - [x] bk-cmdb   版本 (发布版本号 或 git tag): `<示例： v3.0.6-alpha 或者 git sha. 请不要使用 "最新版本" 或 "当前版本"等无法准确定位代码版本的语句描述>`
- - [ ] Redis     版本: `<示例： 3.2.11>`
- - [ ] MongoDB   版本: `<示例： 2.8.0>`
- - [ ] ZooKeeper 版本: `<示例： 3.4.11>`
- - [ ] 操作系统      : `<示例： Centos 5 (x64)>`
+ - [x] bk-cmdb   版本: 
+ <!-- 示例： ./cmdb/cmdb-apiserver --version 输出的内容:
+Version  : oc-19.01.30
+Tag      : 
+Branch   : v3.3.x
+BuildTime: 2019-01-30T11:29:27+0800
+GitHash  : a99aabedf7a369387423ad0ab013730c88f4a7b6
+RunMode  : product
+ -->
+ - [ ] Redis     版本: <!-- `示例： 3.2.11`  -->
+ - [ ] MongoDB   版本: <!-- `示例： 2.8.0` -->
+ - [ ] ZooKeeper 版本: <!-- `示例： 3.4.11` -->
+ - [ ] 操作系统      : <!-- `示例： Centos 5 (x64>` -->
  - [ ] bk-cmdb 异常日志

docs/apidoc/object_model_property.md

@@ -54,6 +54,7 @@
 |singlechar|短字符|
 |longchar|长字符|
 |int|整形|
+|float|浮点|
 |enum|枚举类型|
 |date|日期|
 |time|时间|
@@ -190,6 +191,7 @@ data 字段说明
 |singlechar|短字符|
 |longchar|长字符|
 |int|整形|
+|float|浮点|
 |enum|枚举类型|
 |date|日期|
 |time|时间|
@@ -255,6 +257,7 @@ data 字段说明
 |singlechar|短字符|
 |longchar|长字符|
 |int|整形|
+|float|浮点|
 |enum|枚举类型|
 |date|日期|
 |time|时间|
@@ -343,6 +346,7 @@ data字段说明
 |singlechar|短字符|
 |longchar|长字符|
 |int|整形|
+|float|浮点|
 |enum|枚举类型|
 |date|日期|
 |time|时间|

resources/configures/coreservice.conf

@@ -0,0 +1,17 @@
+[mongodb]
+host=127.0.0.1
+usr=user
+pwd=pwd
+database=cmdb
+port=27107
+maxOpenConns=3000
+maxIDleConns=1000
+[redis]
+host=127.0.0.1
+pwd=redisauth
+database=0
+port=6379
+maxOpenConns=3000
+maxIDleConns=1000
+[errors]
+res=conf/errors

resources/errors/common/default/common.json

@@ -11,9 +11,8 @@
     "1199009": "'%s' 参数必须是整型",
     "1199010": "'%s' 未赋值",
     "1199011": "'%s' 参数无效或不存在",
-    "1199012": "唯一性校验不通过",
     "1199013": "读取Data字段数据失败",
-    "1199014": "数据唯一性校验失败",
+    "1199014": "数据唯一性校验失败， %s 重复",
     "1199015": "'%s' 数据越界",
     "1199016": "字段正则校验失败",
     "1199017": "查询数据失败",
@@ -38,7 +37,8 @@
     "1199038": "数据 %s 不能为空",
     "1199039": "%s 字段在模型 % s不存在",
     "1199040": "转换%s模型的%s字段到 %s,错误:%s",
-    "1199041": "处理%，错误:%s",
-
+    "1199041": "处理%s，错误:%s",
+    "1199043": "字段值校验不通过, %s",
+    "1199044": "未全部成功",
     "": ""
 }

resources/errors/common/default/core_service.json

@@ -0,0 +1,5 @@
+{
+    "1113001": "字段分组下包含一些字段",
+
+    "":""
+}

resources/errors/common/default/datacollection.json

@@ -0,0 +1,22 @@
+{
+    "1112000": "增加设备失败",
+    "1112001": "查找设备失败",
+    "1112002": "删除设备失败",
+    "1112003": "模型ID或模型名不是网络采集设备",
+    "1112004": "增加网络设备属性失败",
+    "1112005": "查找网络设备属性失败",
+    "1112006": "删除网络设备属性失败",
+    "1112007": "属性不存在",
+    "1112008": "设备不存在",
+    "1112009": "格式化 period 字段失败",
+    "1112010": "该设备已配置属性，删除失败",
+    "1112011": "查询采集器失败",
+    "1112012": "更新采集器失败",
+    "1112013": "执行发现失败",
+    "1112014": "查询报告失败",
+    "1112015": "确认变更失败",
+    "1112016": "查询变更历史失败",
+    "1112017": "更新设备失败",
+    "1112018": "更新网络设备属性失败",
+    "": ""
+}

resources/errors/common/default/host_controller.json

@@ -18,5 +18,8 @@
 	"1106017":"删除主机收藏失败",
 	"1106019":"最近1分钟内快照通道为空",
 	"1106020":"与快照数据通道的通讯断开",
+	"1106021": "创建云同步任务失败",
+	"1106022": "添加资源确认历史记录失败",
+	"1106023": "查询同步历史失败",
     "":""
 }

resources/errors/common/default/host_server.json

@@ -29,6 +29,15 @@
 	"1110028": "修改主机关系失败",
 	"1110029": "添加主机到模块失败",
 	"1110030": "添加主机到模块失败, error:%s",
+	"1110031": "创建云同步任务失败，任务名称已经存在",
+	"1110032": "更新同步历史失败",
+	"1110033": "加入资源确认失败，错误 %s",
+	"1110034": "获取资源确认实例失败",
+	"1110035": "新加资源确认历史失败",
+	"1110036": "获取云同步任务实例失败",
+	"1110037": "获取资源确认历史失败",
+	"1110038": "任务名称已经存在",
+	"1110039": "开启云同步失败",
 	"1110040": "新加自定义查询失败, 错误 %s",
 	"1110041": "修改自定义查询失败, 错误 %s",
 	"1110042": "删除自定义查询失败, 错误 %s",
@@ -40,6 +49,11 @@
 	"1110048": "业务 %v 不存在",
 	"1110049": "获取模块失败, 错误 %s",
 	"1110050": "获取主机agent状态, 错误 %s",
-
+	"1110051": "未找到资源池",
+    "1110052": "主机已经属于资源池",
+    "1110053": "获取资源池信息失败，错误信息:%s",
+    "1110053": "%s模块不存在",
+
+	"1110080": "添加主机到资源池失败",
 	"":""
 }

resources/errors/common/default/topo_server.json

@@ -66,15 +66,22 @@
     "1101042": "查到多个关联关系实例",
     "1101043": "模型的关联关系已经被实例化，不能被删除",
     "1101044": "查询关联类型[%s]失败",
+    "1101045": "模型关联关系缺少相关参数",
+    "1101046": "模型的关联关系不存在",
+    "1101047": "包含了不允许更新的字段",
 	"1101048": "主线模型[%s->%s]关联关系不存在",
-	"1101049":"关联关系导入失败",
+	"1101049": "关联关系导入失败",
     "1101050": "查询到多个关联实例",
     "1101051": "预置的关联类型不能被删除",
     "1101052": "关联关系为1:1的，不能同时关联多个实例",
     "1101053": "模型已经被关联",
     "1101054": "禁止更新预定义的关联关系",
     "1101055": "禁止删除预定义的关联关系",
 	"1101056": "关联关系不存在",
+    "1101057": "%s行缺少bk_inst_name字段值",
+    "1101058": "%s行bk_inst_name值非字符类型",
+    "1101059": "bk_inst_name %s 值有重复",
+    "1101060": "关联类型已经被使用",
 	"1001060":"创建模型分组唯一失败",
 	"1001061":"更新模型分组唯一失败",
 	"1001062":"删除模型分组唯一失败",
@@ -84,5 +91,12 @@
 	"1001066":"唯一项类型 [%s] 非法",
 	"1001067":"内置的唯一项不允许修改或删除",
 	"1001068":"模型不能有多个必须校验的唯一项",
-  	"": ""
+	"1001069":"模型至少需要有一组的唯一项",
+    "1101075":"关联类型已经被应用到模型",
+    "1101070":"预定义关联类型不能被删除",
+    "1101071":"关联类型不存在",
+    "1101072":"关联实例不存在",
+    "1101073":"被关联实例不存在",
+    "1101074":"实例下有关联关系",
+  "": ""
 }

resources/errors/common/default/web.json

@@ -7,6 +7,11 @@
     "1111006":"获取主机数据失败, 错误:%s",
     "1111007":"创建EXCEL文件失败，错误:%",
     "1111008":"获取实例数据失败, 错误:%s",
+    "1111009":"获取新增设备结果失败, 错误:%s",
+    "1111010":"获取新增设备属性结果失败, 错误:%s",
+    "1111011":"获取设备数据失败, 错误:%s",
+    "1111012":"获取设备属性数据失败, 错误:%s",
+
 
     "":""
-}
+}

resources/errors/english/en/common.json

@@ -11,9 +11,8 @@
     "1199009": "'%s' parameters must be integral",
     "1199010": "'%s' unassigned",
     "1199011": "'%s' the parameter is invalid or does not exist",
-    "1199012": "uniqueness does not pass",
     "1199013": "Failed to read Data field data",
-    "1199014": "data uniqueness check failed",
+    "1199014": "duplicated instances exist, fields [%s] duplicated",
     "1199015": "Data out of bounds",
 	"1199016": "Field regular check failed",
     "1199017": "Failed to query data",
@@ -38,5 +37,7 @@
     "1199039": "%s field does not exist in %s",
     "1199040": "convert %s model field %s to %s error %s",
     "1199041": "handle %s error %s",
+    "1199043": "The field value check does not pass, %s",
+    "1199044": "not all success",
     "":""
 }

resources/errors/english/en/core_service.json

@@ -0,0 +1,5 @@
+{
+    "1113001": "there are some fields under the group",
+
+    "":""
+}

resources/errors/english/en/datacollection.json

@@ -0,0 +1,22 @@
+{
+    "1112000": "Add device failed",
+    "1112001": "Search device failed",
+    "1112002": "Delete device failed",
+    "1112003": "Object ID or object name is not net collect device",
+    "1112004": "Add netDevice property failed",
+    "1112005": "Search netDevice property failed",
+    "1112006": "Delete netDevice property failed",
+    "1112007": "Property does not exist",
+    "1112008": "Device does not exist",
+    "1112009": "Format period field failed",
+    "1112010": "The device has configured properties and fail to delete it",
+    "1112011": "search collector failed",
+    "1112012": "update collector failed",
+    "1112013": "discover failed",
+    "1112014": "search report failed",
+    "1112015": "confirm changes failed",
+    "1112016": "search history failed",
+    "1112017": "Update device failed",
+    "1112018": "Update netDevice property failed",
+    "": ""
+}

resources/errors/english/en/host_controller.json

@@ -18,5 +18,8 @@
 	"1106017": "Failed to delete host favorites",
 	"1106019": "snapshot channel was empty in last minute",
 	"1106020": "couldn't connect to snapshot channel",
+	"1106021": "Failed to create cloud synchronization task",
+	"1106022": "Failed to add resource confirm history",
+	"1106023": "Failed to search synchronization history",
 	"": "" 
 }

resources/errors/english/en/host_server.json

@@ -29,7 +29,16 @@
 	"1110028": "Failed to modify host relationship",
 	"1110029": "Failed to add host to module",
 	"1110030": "Failed to add host to module, error:%s",
-
+	"1110031": "Failed to create cloud synchronization task",
+	"1110032": "Failed to update synchronization history",
+	"1110033": "Failed to add to resource confirm, error: %s",
+	"1110034": "Failure to obtain resource confirmation instance",
+	"1110035": "Failed to add resource instance to confirm history",
+	"1110036": "Failed to obtain cloud task instance",
+	"1110037": "Failed to obtain resource confirm history",
+	"1110038": "Task name already exits",
+	"1110039": "Fail to start cloud Synchronize",
+
 	"1110040": "Create custom query failed, error %s",
 	"1110041": "Modify custom query failed, error %s",
 	"1110042": "Delete custom query failed, error %s",
@@ -41,5 +50,11 @@
 	"1110048": "%v appliction not found",
 	"1110049": "Failed to get module information, error %s",
 	"1110050": "Get host agent status, error %s",
+	"1110051": "The resource pool was not found",
+	"1110052": "The host is already in the resource pool",
+	"1110053": "Failed to get resource pool information, error message: %s",
+	"1110054": "%s module not found",
+
+	"1110080": "Fail to add host to resource pool",
 	"": ""
 }

resources/errors/english/en/topo_server.json

@@ -64,8 +64,11 @@
     "1101040": "the target association object does not exist",
     "1101041": "invalid object association id, should be a int64 value",
     "1101042": "got multiple object association instance with one id",
-    "1101043": "object associaton has already been instantiated, can not be deleted.",
+    "1101043": "object association has already been instantiated, can not be deleted.",
     "1101044": "get association kind[%s] failed.",
+    "1101045": "object association missing parameters.",
+    "1101046": "object association does not exist.",
+    "1101047": "updated the forbidden fields.",
 	"1101048": "mainline object association[%s->%s] does not exist.",
 	"1101049": "association import failed.",
     "1101050": "association kind got multiple instance.",
@@ -75,6 +78,10 @@
     "1101054": "can not update a predefined association.",
     "1101055": "can not delete a predefined association.",
     "1101056": "object association do not exist.",
+    "1101057": "line %s missing bk_inst_name field.",
+    "1101058": "bk_inst_name field value in line %s is not string.",
+    "1101059": "bk_inst_name %s is duplicate.",
+    "1101060": "association kind has already been used.",
 	"1001060":"create model unique constrains failed",
 	"1001061":"update model unique constrains failed",
 	"1001062":"delete model unique constrains failed",
@@ -83,6 +90,13 @@
 	"1001065":"model property [%s] has been used from unique constrains, delete failed",
 	"1001066":"unique constrains key kind [%s] invalid",
 	"1001067":"preset unique constrains could not be delete",
-	"1001068":"model could not have multiple must check unique",
-	"": "" 
+    "1001068":"model could not have multiple must check unique",
+    "1101069":"association kind has been apply to object",
+    "1101069":"model unique constrains should have more than one",
+    "1101070":"pre definition association can not be delete",
+    "1101071":"the association kind is not exist",
+    "1101072":"the association inst is not exist",
+    "1101073":"the  inst to asst  is not exist",
+    "1101074":"the inst has association",
+  "": "" 
 }

resources/errors/english/en/web.json

@@ -7,5 +7,10 @@
     "1111006": "Failed to get host data, error: %s",
     "1111007": "Failed to create EXCEL file, error: %",
     "1111008": "Failed to get instance data, error: %s",
-    "": ""
-}
+    "1111009": "Failed to get add net device result, error: %s",
+    "1111010": "Failed to get add net property result, error: %s",
+    "1111011": "Failed to get net device data, error: %s",
+    "1111012": "Failed to get net property data, error: %s",
+
+    "": ""	   
+}