diff --git a/captrace/etc/capconf.yaml b/captrace/etc/capconf.yaml index f918ef1b..42c92214 100644 --- a/captrace/etc/capconf.yaml +++ b/captrace/etc/capconf.yaml @@ -16,7 +16,7 @@ database: password: 1000omc@kp! host: 172.25.97.150 port: 33066 - name: omc_db + name: tenants_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True diff --git a/config/etc/default/capconf.yaml b/config/etc/default/capconf.yaml index 9e7c98f2..717352b3 100644 --- a/config/etc/default/capconf.yaml +++ b/config/etc/default/capconf.yaml @@ -16,7 +16,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True diff --git a/config/etc/default/crontask.yaml b/config/etc/default/crontask.yaml index 85c941d8..a8ed309c 100644 --- a/config/etc/default/crontask.yaml +++ b/config/etc/default/crontask.yaml @@ -24,7 +24,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True # northbound interface, cm/pm diff --git a/config/etc/default/restconf.yaml b/config/etc/default/restconf.yaml index 27f2c2a0..21830b79 100644 --- a/config/etc/default/restconf.yaml +++ b/config/etc/default/restconf.yaml @@ -44,7 +44,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True backup: /usr/local/omc/database diff --git a/config/etc/default/sshsvc.yaml b/config/etc/default/sshsvc.yaml index 80ed06fc..94c19a85 100644 --- a/config/etc/default/sshsvc.yaml +++ b/config/etc/default/sshsvc.yaml @@ -36,7 +36,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True omc: diff --git a/config/etc/default/tasks.yaml b/config/etc/default/tasks.yaml index b49618a2..f0f10975 100644 --- a/config/etc/default/tasks.yaml +++ b/config/etc/default/tasks.yaml @@ -22,7 +22,7 @@ tasks: do: TaskHelloWorld # (Do what: callback function) - name: clear expired history alarm status: Inactive - uri: /api/rest/databaseManagement/v1/omc_db/alarm + uri: /api/rest/databaseManagement/v1/tenants_db/alarm params: WHERE=now()+>+ADDDATE(event_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='historyDuration')+day)+and+alarm_status='0' interval: 1 unit: Days @@ -30,14 +30,14 @@ tasks: do: TaskDeleteExpiredRecord - name: clear expired history gold_kpi status: Inactive - uri: /api/rest/databaseManagement/v1/omc_db/gold_kpi + uri: /api/rest/databaseManagement/v1/tenants_db/gold_kpi params: WHERE=now()+>+ADDDATE(`date`,+interval+IFNULL((SELECT+`value`+FROM+config+WHERE+config_tag='goldKpiDuration'),7)+day) interval: 1 unit: Days at: 00:12:00 do: TaskDeleteExpiredRecord - name: clear deleted custom pm kpi - uri: /api/rest/databaseManagement/v1/omc_db/pm_custom_title + uri: /api/rest/databaseManagement/v1/tenants_db/pm_custom_title params: WHERE=now()+>+ADDDATE(update_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='keepPMCKpi')+day)+and+status='Deleted' interval: 1 unit: Days @@ -45,7 +45,7 @@ tasks: do: TaskDeleteExpiredRecord - name: update expired user session status: Inactive - uri: /api/rest/databaseManagement/v1/omc_db/session + uri: /api/rest/databaseManagement/v1/tenants_db/session params: WHERE=NOW()+>+ADDDATE(shake_time,+interval+expires+second)+and+status='online' body: '{"session":{"status":"offline"}}' interval: 30 @@ -61,28 +61,28 @@ tasks: at: 00:50:00 do: TaskDeleteExpiredRecord - name: Backup measure data - uri: /api/rest/databaseManagement/v1/omc_db/measure_data + uri: /api/rest/databaseManagement/v1/tenants_db/measure_data params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','date','task_id','ne_name','rm_uid','ne_type','granul_option','kpi_code','kpi_id','kpi_ext','start_time','end_time','value','timestamp'+union+select+id,date,task_id,ne_name,rm_uid,ne_type,granul_option,kpi_code,kpi_id,kpi_ext,start_time,end_time,value,timestamp+from+measure_data)+b interval: 1 unit: Days at: 00:20:00 do: TaskDBBackupCSVGetBySQL - name: Backup operation log - uri: /api/rest/databaseManagement/v1/omc_db/operation_log + uri: /api/rest/databaseManagement/v1/tenants_db/operation_log params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'op_id','account_name','op_ip','subsys_tag','op_type','op_content','op_result','begin_time','end_time','vnf_flag','log_time'+union+select+op_id,account_name,op_ip,subsys_tag,op_type,op_content,op_result,begin_time,end_time,vnf_flag,log_time+from+operation_log)+b interval: 1 unit: Days at: 00:26:00 do: TaskDBBackupCSVGetBySQL - name: Backup security log - uri: /api/rest/databaseManagement/v1/omc_db/security_log + uri: /api/rest/databaseManagement/v1/tenants_db/security_log params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','account_name','account_type','op_ip','op_type','op_content','op_result','op_time'+union+select+id,account_name,account_type,op_ip,op_type,op_content,op_result,op_time+from+security_log)+b interval: 1 unit: Days at: 00:28:00 do: TaskDBBackupCSVGetBySQL - name: Backup alarm log - uri: /api/rest/databaseManagement/v1/omc_db/alarm_log + uri: /api/rest/databaseManagement/v1/tenants_db/alarm_log params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','ne_type','ne_id','alarm_seq','alarm_id','alarm_code','alarm_status','event_time','log_time'+union+select+id,ne_type,ne_id,alarm_seq,alarm_id,alarm_code,alarm_status,event_time,log_time+from+alarm_log)+b interval: 1 unit: Days @@ -144,7 +144,7 @@ tasks: at: do: TaskGenMeasureReportTimeoutAlarm - name: Monitor proces list and write system log - uri: /api/rest/databaseManagement/v1/omc_db/system_log + uri: /api/rest/databaseManagement/v1/tenants_db/system_log params: body: interval: 10 diff --git a/crontask/etc/crontask.yaml b/crontask/etc/crontask.yaml index afab47b6..20aadc18 100644 --- a/crontask/etc/crontask.yaml +++ b/crontask/etc/crontask.yaml @@ -24,7 +24,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True backup: d:/local.git/be.ems/restagent/database diff --git a/crontask/etc/tasks.yaml b/crontask/etc/tasks.yaml index 48ee807a..34715790 100644 --- a/crontask/etc/tasks.yaml +++ b/crontask/etc/tasks.yaml @@ -30,35 +30,35 @@ tasks: at: 00:00:00 do: TaskCronUserLoginOMC - name: clear expired history alarm - uri: /api/rest/databaseManagement/v1/omc_db/alarm + uri: /api/rest/databaseManagement/v1/tenants_db/alarm params: WHERE=now()+>+ADDDATE(event_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='historyDuration')+day)+and+alarm_status='0' interval: 1 unit: Days at: 00:10:00 do: TaskDeleteExpiredRecord - name: clear expired history gold_kpi - uri: /api/rest/databaseManagement/v1/omc_db/gold_kpi + uri: /api/rest/databaseManagement/v1/tenants_db/gold_kpi params: WHERE=now()+>+ADDDATE(`date`,+interval+IFNULL((SELECT+`value`+FROM+config+WHERE+config_tag='goldKpiDuration'),7)+day) interval: 1 unit: Days at: 00:11:00 do: TaskDeleteExpiredRecord - name: clear deleted custom pm kpi - uri: /api/rest/databaseManagement/v1/omc_db/pm_custom_title + uri: /api/rest/databaseManagement/v1/tenants_db/pm_custom_title params: WHERE=now()+>+ADDDATE(update_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='keepPMCKpi')+day)+and+status='Deleted' interval: 1 unit: Days at: 00:15:00 do: TaskDeleteExpiredRecord - name: clear expired ne etc backup - uri: /api/rest/databaseManagement/v1/omc_db/ne_backup + uri: /api/rest/databaseManagement/v1/tenants_db/ne_backup params: WHERE=now()+>+ADDDATE(`create_time`,+interval+IFNULL((SELECT+`value`+FROM+config+WHERE+config_tag='BackUpSaveTime'),30)+day) interval: 1 unit: Days at: 15:02:00 do: TaskRemoveExpiredFile - name: update expired user session - uri: /api/rest/databaseManagement/v1/omc_db/session + uri: /api/rest/databaseManagement/v1/tenants_db/session params: WHERE=NOW()+>+ADDDATE(shake_time,+interval+expires+second)+and+status='online' body: '{"session":{"status":"offline"}}' interval: 30 @@ -73,28 +73,28 @@ tasks: at: 00:50:00 do: TaskDeleteExpiredRecord - name: Backup measure data - uri: /api/rest/databaseManagement/v1/omc_db/measure_data + uri: /api/rest/databaseManagement/v1/tenants_db/measure_data params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','date','task_id','ne_name','rm_uid','ne_type','granul_option','kpi_code','kpi_id','kpi_ext','start_time','end_time','value','timestamp'+union+select+id,date,task_id,ne_name,rm_uid,ne_type,granul_option,kpi_code,kpi_id,kpi_ext,start_time,end_time,value,timestamp+from+measure_data)+b interval: 1 unit: Days at: 00:20:00 do: TaskDBBackupCSVGetBySQL - name: Backup operation log - uri: /api/rest/databaseManagement/v1/omc_db/operation_log + uri: /api/rest/databaseManagement/v1/tenants_db/operation_log params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'op_id','account_name','op_ip','subsys_tag','op_type','op_content','op_result','begin_time','end_time','vnf_flag','log_time'+union+select+op_id,account_name,op_ip,subsys_tag,op_type,op_content,op_result,begin_time,end_time,vnf_flag,log_time+from+operation_log)+b interval: 1 unit: Days at: 00:26:00 do: TaskDBBackupCSVGetBySQL - name: Backup security log - uri: /api/rest/databaseManagement/v1/omc_db/security_log + uri: /api/rest/databaseManagement/v1/tenants_db/security_log params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','account_name','account_type','op_ip','op_type','op_content','op_result','op_time'+union+select+id,account_name,account_type,op_ip,op_type,op_content,op_result,op_time+from+security_log)+b interval: 1 unit: Days at: 00:28:00 do: TaskDBBackupCSVGetBySQL - name: Backup alarm log - uri: /api/rest/databaseManagement/v1/omc_db/alarm_log + uri: /api/rest/databaseManagement/v1/tenants_db/alarm_log params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','ne_type','ne_id','alarm_seq','alarm_id','alarm_code','alarm_status','event_time','log_time'+union+select+id,ne_type,ne_id,alarm_seq,alarm_id,alarm_code,alarm_status,event_time,log_time+from+alarm_log)+b interval: 1 unit: Days @@ -155,7 +155,7 @@ tasks: at: do: TaskGenMeasureReportTimeoutAlarm - name: Monitor proces list and write system log - uri: /api/rest/databaseManagement/v1/omc_db/system_log + uri: /api/rest/databaseManagement/v1/tenants_db/system_log params: body: interval: 5 diff --git a/restagent/etc/restconf-t.yaml b/restagent/etc/restconf-t.yaml index b7b2d55d..4be33b7c 100644 --- a/restagent/etc/restconf-t.yaml +++ b/restagent/etc/restconf-t.yaml @@ -44,7 +44,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True backup: d:/local.git/be.ems/restagent/database diff --git a/sshsvc/etc/sshsvc.yaml b/sshsvc/etc/sshsvc.yaml index 5e8cb358..9c5dada8 100644 --- a/sshsvc/etc/sshsvc.yaml +++ b/sshsvc/etc/sshsvc.yaml @@ -36,7 +36,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True omc: diff --git a/tools/loadcmxls/loadcmxls.yaml b/tools/loadcmxls/loadcmxls.yaml index 8b58a362..1e15a1eb 100644 --- a/tools/loadcmxls/loadcmxls.yaml +++ b/tools/loadcmxls/loadcmxls.yaml @@ -12,6 +12,6 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db cmfiledir: ../../config/cm diff --git a/tools/loadmconf/loadmconf.yaml b/tools/loadmconf/loadmconf.yaml index 8b937345..9e6ee268 100644 --- a/tools/loadmconf/loadmconf.yaml +++ b/tools/loadmconf/loadmconf.yaml @@ -12,7 +12,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db mml: filedir: ../../config/mml/subscriber diff --git a/tools/loadpconf/loadpconf.yaml b/tools/loadpconf/loadpconf.yaml index f0b038e6..ece03d4b 100644 --- a/tools/loadpconf/loadpconf.yaml +++ b/tools/loadpconf/loadpconf.yaml @@ -12,6 +12,6 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db paramfiledir: ../../config/param diff --git a/tools/loadpmxls/loadpmxls.yaml b/tools/loadpmxls/loadpmxls.yaml index e6e221dd..574f8cd9 100644 --- a/tools/loadpmxls/loadpmxls.yaml +++ b/tools/loadpmxls/loadpmxls.yaml @@ -12,6 +12,6 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db pmfiledir: ../../config/pm diff --git a/tools/websocket/tt.yaml b/tools/websocket/tt.yaml index 07b5a159..9662b3dd 100644 --- a/tools/websocket/tt.yaml +++ b/tools/websocket/tt.yaml @@ -12,4 +12,4 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db