From 107ad572f820dc0f12a43628abe2425bf24efa1f Mon Sep 17 00:00:00 2001
From: Ulric Qin <ulric.qin@gmail.com>
Date: Sat, 26 Sep 2020 22:21:23 +0800
Subject: [PATCH] code refactor

---
 etc/agent.yml | 16 ++++++++--------
 etc/gop.yml   |  6 ------
 etc/lop.yml   |  2 +-
 etc/rdb.yml   | 10 ++++------
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/etc/agent.yml b/etc/agent.yml
index ac63ab88..2c8b62d1 100644
--- a/etc/agent.yml
+++ b/etc/agent.yml
@@ -4,9 +4,9 @@ logger:
   keepHours: 24
 
 enable:
-  mon: false
-  job: false
-  report: false
+  mon: true
+  job: true
+  report: true
 
 job:
   metadir: ./meta
@@ -22,11 +22,11 @@ report:
   # physical：物理机，virtual：虚拟机，container：容器，switch：交换机
   cate: physical
 
-  # 使用哪个字段作为唯一KEY，即作为where条件更新对应记录
-  # 一般使用sn，虚机的话把uuid当做sn即可，不同IaaS平台获取方式可能不同
-  uniqkey: sn
+  # 使用哪个字段作为唯一KEY，即作为where条件更新对应记录，一般使用sn或ip
+  uniqkey: ip
 
   # 如果是虚拟机，应该是获取uuid
+  # curl -s http://169.254.169.254/a/meta-data/instance-id
   sn: dmidecode -s system-serial-number | tail -n 1
 
   fields:
@@ -37,8 +37,8 @@ report:
 sys:
   # timeout in ms
   # interval in second
-  timeout: 1000
-  interval: 20
+  timeout: 5000
+  interval: 30
   ifacePrefix:
     - eth
     - em
diff --git a/etc/gop.yml b/etc/gop.yml
index ee3a4997..50965096 100644
--- a/etc/gop.yml
+++ b/etc/gop.yml
@@ -8,9 +8,3 @@
           cn: 主机设备删除
         - en: ams_host_modify
           cn: 主机设备信息修改
-    - title: 网络设备
-      ops:
-        - en: ams_netware_mgr_menu
-          cn: 网络设备管理菜单
-        - en: ams_netware_modify
-          cn: 网络设备信息修改
\ No newline at end of file
diff --git a/etc/lop.yml b/etc/lop.yml
index 45bda179..d6b49ea2 100644
--- a/etc/lop.yml
+++ b/etc/lop.yml
@@ -63,4 +63,4 @@
     - title: 告警历史
       ops:
         - en: mon_event_write
-          cn: 告警历史屏蔽、认领、忽略
\ No newline at end of file
+          cn: 告警历史屏蔽、认领、忽略
diff --git a/etc/rdb.yml b/etc/rdb.yml
index 7ee008e6..2ade7f7d 100644
--- a/etc/rdb.yml
+++ b/etc/rdb.yml
@@ -9,16 +9,14 @@ http:
   cookieName: ecmc-user
 
 sso:
-  enable: true
-  ssoAddr: "http://10.86.76.13:8071"
-  redirectURL: "http://10.86.76.13:8072/api/rdb/auth/callback"
+  enable: false
+  ssoAddr: "http://10.1.2.3:8071"
+  redirectURL: "http://10.1.2.3:8072/api/rdb/auth/callback"
   clientId: ""
   clientSecret: ""
   apiKey: ""
 
 tokens:
-  - uic-builtin-token
-  - hsp-builtin-token
   - rdb-builtin-token
 
 # for ldap authorization
@@ -44,7 +42,7 @@ ldap:
 
 # as queue for sender
 redis:
-  enable: false
+  enable: true
   addr: 127.0.0.1:6379
   pass: ""
   idle: 5