diff --git a/config/etc/default/tasks.yaml b/config/etc/default/tasks.yaml index 3db4153d..f3008cf8 100644 --- a/config/etc/default/tasks.yaml +++ b/config/etc/default/tasks.yaml @@ -27,6 +27,13 @@ tasks: unit: Days at: 00:10:00 do: TaskDeleteExpiredRecord + - name: clear expired history gold_kpi + uri: /api/rest/databaseManagement/v1/omc_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 params: WHERE=now()+>+ADDDATE(update_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='keepPMCKpi')+day)+and+status='Deleted' diff --git a/crontask/etc/tasks.yaml b/crontask/etc/tasks.yaml index 0e8e5b0b..6881891d 100644 --- a/crontask/etc/tasks.yaml +++ b/crontask/etc/tasks.yaml @@ -27,6 +27,13 @@ tasks: unit: Days at: 00:10:00 do: TaskDeleteExpiredRecord + - name: clear expired history gold_kpi + uri: /api/rest/databaseManagement/v1/omc_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: 18:11:00 + do: TaskDeleteExpiredRecord - name: clear deleted custom pm kpi uri: /api/rest/databaseManagement/v1/omc_db/pm_custom_title params: WHERE=now()+>+ADDDATE(update_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='keepPMCKpi')+day)+and+status='Deleted' diff --git a/crontask/tasks.go b/crontask/tasks.go index 8242f21b..528be1b1 100644 --- a/crontask/tasks.go +++ b/crontask/tasks.go @@ -280,7 +280,7 @@ func (t *TaskFunc) TaskDBBackupCSVGetBySQL(uri, params, body string) { var response *resty.Response tableName := t.GetTableNameFromUri(uri) - filePath := fmt.Sprintf("/tmp/%s-%s.csv", GetYamlConfig().Database.Backup, tableName, time.Now().Local().Format(global.DateData)) + filePath := fmt.Sprintf("/tmp/%s-%s.csv", tableName, time.Now().Local().Format(global.DateData)) pa := fmt.Sprintf(params, filePath) requestURI := fmt.Sprintf("%s?%s", uri, pa) requestURL := fmt.Sprintf("%s%s", yamlConfig.OMC.HostUri, requestURI)