From bf6a756b28d83217196a6b4e3f05197c4f9555d8 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Wed, 19 Jun 2024 11:44:45 +0800 Subject: [PATCH] change db to tenants_db --- build/usr/local/omc/etc/default/crontask.yaml | 2 +- build/usr/local/omc/etc/default/restconf.yaml | 2 +- build/usr/local/omc/etc/default/sshsvc.yaml | 2 +- build/usr/local/omc/etc/default/tasks.yaml | 16 +++++++------- .../local/omc/static/agt.d/db/customized.sql | 22 +++++++++---------- .../local/omc/static/ba.d/db/customized.sql | 22 +++++++++---------- .../usr/local/omc/etc/default/restconf.yaml | 2 +- .../usr/local/omc/etc/default/restconf.yaml | 2 +- 8 files changed, 35 insertions(+), 35 deletions(-) diff --git a/build/usr/local/omc/etc/default/crontask.yaml b/build/usr/local/omc/etc/default/crontask.yaml index f98d5f8..5c2a60a 100644 --- a/build/usr/local/omc/etc/default/crontask.yaml +++ b/build/usr/local/omc/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 backup: /usr/local/omc/database # northbound interface, cm/pm diff --git a/build/usr/local/omc/etc/default/restconf.yaml b/build/usr/local/omc/etc/default/restconf.yaml index a758e11..18cdc82 100644 --- a/build/usr/local/omc/etc/default/restconf.yaml +++ b/build/usr/local/omc/etc/default/restconf.yaml @@ -24,7 +24,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db backup: /usr/loal/omc/database mml: diff --git a/build/usr/local/omc/etc/default/sshsvc.yaml b/build/usr/local/omc/etc/default/sshsvc.yaml index 0b3e6f9..28b994b 100644 --- a/build/usr/local/omc/etc/default/sshsvc.yaml +++ b/build/usr/local/omc/etc/default/sshsvc.yaml @@ -35,7 +35,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db omc: httpUri: http://127.0.0.1:3030 diff --git a/build/usr/local/omc/etc/default/tasks.yaml b/build/usr/local/omc/etc/default/tasks.yaml index f0e6561..311666b 100644 --- a/build/usr/local/omc/etc/default/tasks.yaml +++ b/build/usr/local/omc/etc/default/tasks.yaml @@ -21,21 +21,21 @@ tasks: at: 00:10:00 # do at time such as xx:xx:xx when unit such as Day/Days/Mondays... do: TaskHelloWorld # (Do what: callback function) - 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 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: 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 @@ -50,28 +50,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 @@ -132,7 +132,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/build/usr/local/omc/static/agt.d/db/customized.sql b/build/usr/local/omc/static/agt.d/db/customized.sql index 3fdf897..f7b70e6 100644 --- a/build/usr/local/omc/static/agt.d/db/customized.sql +++ b/build/usr/local/omc/static/agt.d/db/customized.sql @@ -1,7 +1,7 @@ SET FOREIGN_KEY_CHECKS = 0; REPLACE - INTO `omc_db`.`sys_config` ( + INTO `sys_config` ( `config_id`, `config_name`, `config_key`, @@ -27,7 +27,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_config` ( + INTO `sys_config` ( `config_id`, `config_name`, `config_key`, @@ -53,7 +53,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_config` ( + INTO `sys_config` ( `config_id`, `config_name`, `config_key`, @@ -79,7 +79,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_config` ( + INTO `sys_config` ( `config_id`, `config_name`, `config_key`, @@ -105,7 +105,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_config` ( + INTO `sys_config` ( `config_id`, `config_name`, `config_key`, @@ -131,7 +131,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_dict_data` ( + INTO `sys_dict_data` ( `dict_code`, `dict_sort`, `dict_label`, @@ -163,7 +163,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_dict_data` ( + INTO `sys_dict_data` ( `dict_code`, `dict_sort`, `dict_label`, @@ -195,7 +195,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_dict_data` ( + INTO `sys_dict_data` ( `dict_code`, `dict_sort`, `dict_label`, @@ -227,7 +227,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_dict_data` ( + INTO `sys_dict_data` ( `dict_code`, `dict_sort`, `dict_label`, @@ -260,9 +260,9 @@ VALUES ( -- set internationalization switching to ON -- REPLACE --- INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) +-- INTO `sys_role_menu` (`role_id`, `menu_id`) -- VALUES (2, 2122); -UPDATE `omc_db`.`sys_menu` +UPDATE `sys_menu` SET `status` = '1' WHERE diff --git a/build/usr/local/omc/static/ba.d/db/customized.sql b/build/usr/local/omc/static/ba.d/db/customized.sql index 3572248..c133f94 100644 --- a/build/usr/local/omc/static/ba.d/db/customized.sql +++ b/build/usr/local/omc/static/ba.d/db/customized.sql @@ -1,7 +1,7 @@ SET FOREIGN_KEY_CHECKS = 0; REPLACE - INTO `omc_db`.`sys_config` ( + INTO `sys_config` ( `config_id`, `config_name`, `config_key`, @@ -27,7 +27,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_config` ( + INTO `sys_config` ( `config_id`, `config_name`, `config_key`, @@ -53,7 +53,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_config` ( + INTO `sys_config` ( `config_id`, `config_name`, `config_key`, @@ -79,7 +79,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_config` ( + INTO `sys_config` ( `config_id`, `config_name`, `config_key`, @@ -105,7 +105,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_config` ( + INTO `sys_config` ( `config_id`, `config_name`, `config_key`, @@ -131,7 +131,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_dict_data` ( + INTO `sys_dict_data` ( `dict_code`, `dict_sort`, `dict_label`, @@ -163,7 +163,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_dict_data` ( + INTO `sys_dict_data` ( `dict_code`, `dict_sort`, `dict_label`, @@ -195,7 +195,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_dict_data` ( + INTO `sys_dict_data` ( `dict_code`, `dict_sort`, `dict_label`, @@ -227,7 +227,7 @@ VALUES ( ); REPLACE - INTO `omc_db`.`sys_dict_data` ( + INTO `sys_dict_data` ( `dict_code`, `dict_sort`, `dict_label`, @@ -259,8 +259,8 @@ VALUES ( ); -- set internationalization switching to OFF --- DELETE FROM `omc_db`.`sys_role_menu` WHERE `menu_id` = 2122; -UPDATE `omc_db`.`sys_menu` +-- DELETE FROM `sys_role_menu` WHERE `menu_id` = 2122; +UPDATE `sys_menu` SET `status` = '0' WHERE diff --git a/debbuild/22.04/usr/local/omc/etc/default/restconf.yaml b/debbuild/22.04/usr/local/omc/etc/default/restconf.yaml index 8adf264..94bfe3d 100644 --- a/debbuild/22.04/usr/local/omc/etc/default/restconf.yaml +++ b/debbuild/22.04/usr/local/omc/etc/default/restconf.yaml @@ -40,7 +40,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db backup: /usr/local/omc/database # Redis 缓存数据，数据源声明全小写 diff --git a/debbuild/usr/local/omc/etc/default/restconf.yaml b/debbuild/usr/local/omc/etc/default/restconf.yaml index 8adf264..94bfe3d 100644 --- a/debbuild/usr/local/omc/etc/default/restconf.yaml +++ b/debbuild/usr/local/omc/etc/default/restconf.yaml @@ -40,7 +40,7 @@ database: password: 1000omc@kp! host: 127.0.0.1 port: 33066 - name: omc_db + name: tenants_db backup: /usr/local/omc/database # Redis 缓存数据，数据源声明全小写