-
- {{ cate }}
-
-
-
-
-
-
-
-
- {{ JSON.stringify(row.example) }}
- {{ row.example }}
-
-
-
-
-
-
-
- {{ row.attr }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ JSON.stringify(row.example) }}
- {{ row.example }}
-
-
-
-
-
+
+
+
+
+ {{ cate }}
+
+
+
+
-
+
diff --git a/cmdb-ui/src/modules/cmdb/components/nodeSetting/index.vue b/cmdb-ui/src/modules/cmdb/components/nodeSetting/index.vue
new file mode 100644
index 0000000..ed0bfbc
--- /dev/null
+++ b/cmdb-ui/src/modules/cmdb/components/nodeSetting/index.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ v1
+
+
+ v2c
+
+
+ v3
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cmdb-ui/src/modules/cmdb/lang/en.js b/cmdb-ui/src/modules/cmdb/lang/en.js
index 62468aa..17bfcd1 100644
--- a/cmdb-ui/src/modules/cmdb/lang/en.js
+++ b/cmdb-ui/src/modules/cmdb/lang/en.js
@@ -29,6 +29,7 @@ const cmdb_en = {
attributes: 'Attributes',
relation: 'Relation',
trigger: 'Triggers',
+ autoDiscoveryTab: 'AutoDiscovery',
attributeAD: 'Attributes AutoDiscovery',
relationAD: 'Relation AutoDiscovery',
grant: 'Grant',
@@ -62,6 +63,7 @@ const cmdb_en = {
deletePlugin: 'Delete plugin',
confirmDeleteADT: 'Do you confirm to delete [{pluginName}]',
attributeMap: 'Attribute mapping',
+ nodeConfig: 'Node Configuration',
autoDiscovery: 'AutoDiscovery',
node: 'Node',
adExecConfig: 'Execute configuration',
@@ -69,11 +71,12 @@ const cmdb_en = {
oneagentIdTips: 'Please enter the hexadecimal OneAgent ID starting with 0x',
selectFromCMDBTips: 'Select from CMDB ',
adAutoInLib: 'Save as CI auto',
+ adAutoInLibTip: 'Discovered instances are directly warehoused into CI',
adInterval: 'Collection frequency',
byInterval: 'by interval',
- allNodes: 'All Instances',
- specifyNodes: 'Specify Instance',
- specifyNodesTips: 'Please fill in the specify instance!',
+ allNodes: 'All machines',
+ specifyNodes: 'Specify machine',
+ specifyNodesTips: 'Please fill in the specify machine!',
username: 'Username',
password: 'Password',
link: 'Link',
@@ -203,6 +206,43 @@ const cmdb_en = {
showTips: 'The names of nodes in the service tree and topology view',
isDynamic: 'Dynamic',
dynamicTips: 'For example, for monitoring data and frequently updated data, it is recommended to set it as a dynamic attribute, so that the change history of the attribute will not be recorded.',
+ cloudAccessKey: 'Public Cloud AccessKey',
+ cloudAccessKeyTip: 'For the system to synchronize public cloud information without installing Agent',
+ configCheckTitle: 'Configuration check',
+ checkTestTip: 'Save configuration before checking',
+ checkTestBtn: 'Perform machine synchronization rule checking',
+ checkTestTip2: 'Click to view the synchronization status of the discovery rule on the executing machine, the system synchronizes every 5 minutes, if the status is abnormal, you can view the possible problems',
+ checkTestBtn1: 'Automated discovery testing',
+ checkTestTip3: 'At the click of a button, the system will execute the autodiscovery rules on one machine',
+ checkModalTitle: 'Perform machine synchronization rule checking',
+ checkModalTip: 'If the status is down, check the Agent as follows',
+ checkModalTip1: '1. Check if OneAgent process is alive',
+ checkModalTip2: '2. View OneAgent logs with autodiscovery rule synchronisation every 5 minutes',
+ checkModalColumn1: 'Executing machine',
+ checkModalColumn2: 'AgentID',
+ checkModalColumn3: 'Status',
+ checkModalColumnStatus1: 'online',
+ checkModalColumnStatus2: 'offline',
+ checkModalColumn4: 'Last checkup time',
+ testModalTitle: 'Automated discovery testing',
+ attrMapTableAttrPlaceholder: 'Please edit the name',
+ nodeSettingIp: 'IP Addresses',
+ nodeSettingIpTip: 'Please enter the ip address',
+ nodeSettingIpTip1: 'ip address format error',
+ nodeSettingCommunity: 'Community',
+ nodeSettingCommunityTip: 'Please enter community',
+ nodeSettingVersion: 'Version',
+ nodeSettingVersionTip: 'Please select version',
+ cronRequiredTip: 'Acquisition frequency cannot be null',
+ relationADTip: 'Relationship autodiscovery assumes that there is attribute autodiscovery configured',
+ relationADHeader1: 'AutoDiscovery Attributes',
+ relationADHeader2: 'Associative Model Attributes',
+ relationADSelectAttr: 'Please select auto-discovered attributes',
+ relationADSelectCIType: 'Please select the model associated with this model',
+ relationADSelectModelAttr: 'Please select the associated model attribute',
+ relationADTip2: 'When an auto-discovered attribute matches an associated model attribute, the two instance models are automatically associated',
+ relationADTip3: 'If the value of the auto-discovered attribute is a list, multiple relationships are established with the association model',
+ deleteRelationAdTip: 'Cannot be deleted again',
},
components: {
unselectAttributes: 'Unselected',
@@ -432,12 +472,13 @@ const cmdb_en = {
acceptTime: 'Accept Time',
confirmAccept: 'Confirm Accept?',
acceptSuccess: 'Accept successfully',
- isAccept: 'Is accept',
+ isAccept: 'Accept',
deleteADC: 'Confirm to delete this data?',
batchDelete: 'Confirm to delete this data?',
- agent: 'Built-in & Plug-ins',
+ agent: 'Server',
snmp: 'Network Devices',
http: 'Public Clouds',
+ plugin: 'Plugin',
rule: 'AutoDiscovery Rules',
timeout: 'Timeout error',
mode: 'Mode',
@@ -495,6 +536,19 @@ if __name__ == "__main__":
vserver: 'VServer',
nic: 'NIC',
disk: 'harddisk',
+ httpSearchPlaceHolder: 'Please enter keywords',
+ corporateTip: 'More types are available in the corporate version, please contact us if you need ',
+ ruleCount: 'Rule count',
+ execMachine: 'Exec. machine count',
+ resource: 'Auto-discovered resources count',
+ autoInventory: 'Inclusions count',
+ newThisWeek: 'New this week',
+ newThisMonth: 'New this month',
+ log: 'Log',
+ discoveryCardResoureTip: 'Number of resource types automatically discovered',
+ addPlugin: 'Add plugin',
+ pluginSearchTip: 'Please search the rules',
+ innerFlag: 'Inner'
},
ci: {
attributeDesc: 'Attribute Description',
diff --git a/cmdb-ui/src/modules/cmdb/lang/zh.js b/cmdb-ui/src/modules/cmdb/lang/zh.js
index edfcebe..c0c26c3 100644
--- a/cmdb-ui/src/modules/cmdb/lang/zh.js
+++ b/cmdb-ui/src/modules/cmdb/lang/zh.js
@@ -29,6 +29,7 @@ const cmdb_zh = {
attributes: '模型属性',
relation: '模型关联',
trigger: '触发器',
+ autoDiscoveryTab: '自动发现',
attributeAD: '属性自动发现',
relationAD: '关系自动发现',
grant: '权限配置',
@@ -62,18 +63,20 @@ const cmdb_zh = {
deletePlugin: '删除plugin',
confirmDeleteADT: '确认删除 【{pluginName}】',
attributeMap: '字段映射',
- autoDiscovery: '自动发现',
+ nodeConfig: '节点配置',
+ autoDiscovery: '自动发现属性',
node: '节点',
adExecConfig: '执行配置',
adExecTarget: '执行机器',
oneagentIdTips: '请输入以0x开头的16进制OneAgent ID',
selectFromCMDBTips: '从CMDB中选择 ',
adAutoInLib: '自动入库',
+ adAutoInLibTip: '发现的实例直接入库成CI',
adInterval: '采集频率',
byInterval: '按间隔',
- allNodes: '所有实例',
- specifyNodes: '指定实例',
- specifyNodesTips: '请填写指定实例!',
+ allNodes: '所有机器',
+ specifyNodes: '指定机器',
+ specifyNodesTips: '请填写指定机器!',
username: '用户名',
password: '密码',
link: '链接',
@@ -203,6 +206,43 @@ const cmdb_zh = {
showTips: '服务树和拓扑视图里节点的名称',
isDynamic: '动态属性',
dynamicTips: '譬如监控类的数据, 频繁更新的数据, 建议设置为动态属性, 则不会记录该属性的变更历史',
+ cloudAccessKey: '公有云AccessKey',
+ cloudAccessKeyTip: '用于系统在不安装Agent的情况下同步公有云信息',
+ configCheckTitle: '健康检查',
+ checkTestTip: '检查前请先保存配置',
+ checkTestBtn: '执行机器同步规则检查',
+ checkTestTip2: '点击查看发现规则在执行机器上的同步状态,系统每5分钟同步一次,若状态为异常,可查看可能的问题',
+ checkTestBtn1: '自动发现测试',
+ checkTestTip3: '点击按钮,系统将在一台机器上执行自动发现规则',
+ checkModalTitle: '执行机器同步规则检查',
+ checkModalTip: '若状态为下线,请按以下操作检查Agent',
+ checkModalTip1: '1. 检查OneAgent进程是否存活',
+ checkModalTip2: '2. 查看OneAgent的日志,每5分钟有自动发现规则同步的日志',
+ checkModalColumn1: '执行机器',
+ checkModalColumn2: 'AgentID',
+ checkModalColumn3: '状态',
+ checkModalColumnStatus1: '在线',
+ checkModalColumnStatus2: '下线',
+ checkModalColumn4: '最近检查时间',
+ testModalTitle: '自动发现测试',
+ attrMapTableAttrPlaceholder: '请编辑名称',
+ nodeSettingIp: 'ip地址',
+ nodeSettingIpTip: '请输入 ip 地址',
+ nodeSettingIpTip1: 'ip地址格式错误',
+ nodeSettingCommunity: 'Community',
+ nodeSettingCommunityTip: '请输入 community',
+ nodeSettingVersion: '版本',
+ nodeSettingVersionTip: '请选择版本',
+ cronRequiredTip: '采集频率不能为空',
+ relationADTip: '关系自动发现的前提是配置有属性自动发现',
+ relationADHeader1: '自动发现属性',
+ relationADHeader2: '关联模型属性',
+ relationADSelectAttr: '请选择自动发现的属性',
+ relationADSelectCIType: '请选择与本模型关联的模型',
+ relationADSelectModelAttr: '请选择关联模型属性',
+ relationADTip2: '当自动发现属性与关联模型属性一致时,两实例模型则自动关联',
+ relationADTip3: '如果自动发现的属性值是列表,则会和关联模型建立多个关系',
+ deleteRelationAdTip: '不可再删除',
},
components: {
unselectAttributes: '未选属性',
@@ -432,12 +472,13 @@ const cmdb_zh = {
acceptTime: '入库时间',
confirmAccept: '确认入库?',
acceptSuccess: '入库成功',
- isAccept: '是否入库',
+ isAccept: '入库',
deleteADC: '确认删除该条数据?',
batchDelete: '确认删除这些数据?',
- agent: '内置 & 插件',
+ agent: '服务器',
snmp: '网络设备',
- http: '公有云资源',
+ http: '公有云',
+ plugin: '插件',
rule: '自动发现规则',
timeout: '超时错误',
mode: '模式',
@@ -495,6 +536,19 @@ if __name__ == "__main__":
vserver: '虚拟机',
nic: '网卡',
disk: '硬盘',
+ httpSearchPlaceHolder: '请输入关键词',
+ corporateTip: '更多类型见企业版,有需要请与我们联系 ',
+ ruleCount: '规则数',
+ execMachine: '执行机器数',
+ resource: '自动发现资源数',
+ autoInventory: '入库数',
+ newThisWeek: '本周新增',
+ newThisMonth: '本月新增',
+ log: '日志',
+ discoveryCardResoureTip: '自动发现的资源类型数',
+ addPlugin: '新增插件',
+ pluginSearchTip: '请搜索规则',
+ innerFlag: '内置'
},
ci: {
attributeDesc: '查看属性配置',
diff --git a/cmdb-ui/src/modules/cmdb/views/ci/index.vue b/cmdb-ui/src/modules/cmdb/views/ci/index.vue
index 55bb81c..ee6569e 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci/index.vue
@@ -167,16 +167,20 @@
#default="{ row }"
>
{{ row[col.field] }}
-
{{ row[col.field] }}
+
+
+ {{ item }}
+
+
-
+
{{ $t('cancel') }}
@@ -14,7 +18,7 @@
+
+
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue
index f44ffab..d5436e6 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/attrAD.vue
@@ -1,37 +1,28 @@
-
-
-
- {{ item.extra_option.alias }}
- {{ getADCITypeParam(item.adr_id) }}
- deleteADT(e, item)" />
-
- openEditDrawer(data, type, adType)"
- @handleSave="getCITypeDiscovery"
- />
-
- {
- $refs.adModal.open()
- }
- "
- slot="tabBarExtraContent"
- :style="{ cursor: 'pointer' }"
- >
- {{ $t('add') }}
-
-
+
$refs.adModal.open()"
+ />
+ openEditDrawer(data, type, adType)"
+ @handleSave="saveTabpane"
+ />
-
+
@@ -206,6 +300,7 @@ export default {
.attr-ad {
position: relative;
padding: 0 20px;
+
.attr-ad-header {
width: 100%;
display: inline-flex;
@@ -216,7 +311,13 @@ export default {
border-left: 4px solid @primary-color;
font-size: 16px;
color: rgba(0, 0, 0, 0.75);
+ margin-top: 30px;
}
+
+ .attr-ad-header-margin {
+ margin-bottom: 0px;
+ }
+
.attr-ad-footer {
width: 60%;
text-align: right;
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue
index 30bf11a..0c1b790 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/attrADTabpane.vue
@@ -1,11 +1,11 @@
-