diff --git a/build/usr/local/omc/etc/default/crontask.yaml b/build/usr/local/omc/etc/default/crontask.yaml deleted file mode 100644 index 4c22e98..0000000 --- a/build/usr/local/omc/etc/default/crontask.yaml +++ /dev/null @@ -1,44 +0,0 @@ -# file: log file name -# level: /trace/debug/info/warn/error/fatal, default: debug -# duration: saved days, default is 30 days -logger: - file: /usr/local/omc/log/crontask.log - level: warn - duration: 24 - count: 90 - -omc: - name: OMC01 - hosturi: http://127.0.0.1:33030 - hostno: A001 - province: "" - netabbr: HX - vendor: "" - -tasks: - file: /usr/local/omc/etc/tasks.yaml - -database: - type: mysql - user: root - password: 1000omc@kp! - host: 127.0.0.1 - port: 33066 - name: omc_db - connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True - -# northbound interface, cm/pm -# duration(day): saved days -# zipPeriods(day): periods of zip pm data file -nbi: - cm: - cfgfiledir: /usr/local/omc/etc/cm - xmlfiledir: /opt/omc/ftp - version: V1.0.1 - duration: 30 - pm: - cfgfiledir: /usr/local/omc/etc/pm - xmlfiledir: /opt/omc/ftp - version: V1.0.1 - duration: 30 - zipPeriods: 1 diff --git a/build/usr/local/omc/etc/default/tasks.yaml b/build/usr/local/omc/etc/default/tasks.yaml deleted file mode 100644 index b49618a..0000000 --- a/build/usr/local/omc/etc/default/tasks.yaml +++ /dev/null @@ -1,183 +0,0 @@ -# example: -# tasks: -# - name: test # task comment -# uri: # restful uri -# params: # params of url -# interval: 30 # do sometion in the interval -# unit: Seconds #Seconds/Minutes/Hours/Days/Weeks, Monday/Tuesday/.../Sunday, -# at: 00:10:00 # do at time such as xx:xx:xx -# do: HelloWorldTask # (Do what: callback function) -# -# Attention: must restart crontask after modified this file -# -tasks: - - name: test # task comment - status: Active #active/inactive - uri: # restful uri - params: # params of http url - body: # body of http request - interval: 60 # do sometion in the interval - unit: Seconds #Seconds/Minutes/Hours/Days/Weeks, Monday/Tuesday/.../Sunday, - 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 - status: Inactive - uri: /api/rest/databaseManagement/v1/omc_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 - status: Inactive - 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' - interval: 1 - unit: Days - at: 00:15:00 - do: TaskDeleteExpiredRecord - - name: update expired user session - status: Inactive - uri: /api/rest/databaseManagement/v1/omc_db/session - params: WHERE=NOW()+>+ADDDATE(shake_time,+interval+expires+second)+and+status='online' - body: '{"session":{"status":"offline"}}' - interval: 30 - unit: Seconds - at: - do: TaskUpdateTable - - name: clear expired log - status: Inactive - uri: - params: - interval: 1 - unit: Days - at: 00:50:00 - do: TaskDeleteExpiredRecord - - name: Backup measure data - uri: /api/rest/databaseManagement/v1/omc_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 - 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 - 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 - 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 - at: 00:30:00 - do: TaskDBBackupCSVGetBySQL - - name: handshake to NF - status: Active - uri: /api/rest/systemManagement/v1/elementType/%s/objectType/systemState - params: - interval: 10 - unit: Seconds - at: - do: TaskHandShakeToNF - - name: Export CM from NF - status: Inactive - uri: /api/rest/systemManagement/v1/elementType/%s/objectType/cm - params: ne_id=%s - interval: 1 - unit: Days - at: 00:15 - do: TaskExportCmFromNF - - name: Generate NRM xml file - uri: - params: - interval: 1 - unit: Day - at: 00:00,06:00,12:00,18:00 - do: GenCmXmlFile - - name: Task of Generate measure threshold alarm - status: Active - uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms - params: 10200 - interval: 10 - unit: Seconds - at: - do: TaskGenMeasureThresholdAlarm - - name: Task of Generate license alarm - status: Inactive - uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms - params: 10100 #alarm_code - interval: 1 - unit: Days - at: 00:30 - do: TaskGenLicenseAlarm - - name: Task of Generate NE system state alarm - status: Inactive - uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms - params: 10000 - interval: 5 - unit: Seconds - at: - do: TaskGenNeStateAlarm - - name: Task of Generate Measure Report Timeout - status: Active - uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms - params: 10201 - interval: 10 - unit: Seconds - at: - do: TaskGenMeasureReportTimeoutAlarm - - name: Monitor proces list and write system log - uri: /api/rest/databaseManagement/v1/omc_db/system_log - params: - body: - interval: 10 - unit: Seconds - at: - do: TaskWriteSystemLog - - name: Copy log to /opt/omc/ftp/log - uri: - params: cp -rf /usr/local/omc/database/*.csv /opt/omc/ftp/log - interval: 10 - unit: Minutes - at: - do: TaskRunShellCommand -# - name: Import CM to NF -# uri: /api/rest/systemManagement/v1/elementType/udm/objectType/cm -# params: ne_id=SZ_01 -# interval: 15 -# unit: Seconds -# at: -# do: TaskImportCmToNF -crontab: -# - name: 每隔1分钟执行 -# tab: 0 */1 * * * ? // crontab: rule like linux crontab -# do: CronHelloWorldTask // function name to call -# params: - - name: Generate PM xml file - status: Active - tab: 5,20,35,50 * * * * - do: GenPmXmlFile - uri: this is uri - params: Generating PM xml file -# - name: Import CM to NF -# tab: 0 * * * * * -# do: TaskImportCmToNF -# uri: /api/rest/systemManagement/v1/elementType/udm/objectType/cm -# params: ne_id=SZ_01 \ No newline at end of file diff --git a/debbuild/22.04/DEBIAN/postinst b/debbuild/22.04/DEBIAN/postinst index bf6f4da..87ca049 100755 --- a/debbuild/22.04/DEBIAN/postinst +++ b/debbuild/22.04/DEBIAN/postinst @@ -4,36 +4,23 @@ OMCRootDir=/usr/local/omc SystemdRootDir=/lib/systemd/system OMCEtcDir=${OMCRootDir}/etc FERootDir=${OMCRootDir}/htdocs/front -X86Lib64Dir=/lib/x86_64-linux-gnu OmcBinDir=${OMCRootDir}/bin OMCStaticDir=${OMCRootDir}/static UsrLocalBinDir=/usr/local/bin OmcDaemon=omcd NginxEtcDir=/etc/nginx NginxConfDir=${NginxEtcDir}/conf.d -CFileList="restconf.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml omc.conf" +CFileList="restconf.yaml sshsvc.yaml omc.conf" LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png" echo "" echo "* To start/stop/restart/status omc service, please run:" echo " sudo systemctl start/stop/restart/status restagent.service" -echo " sudo systemctl start/stop/restart/status crontask.service" echo " sudo systemctl start/stop/restart/status sshsvc.service" -echo " sudo systemctl start/stop/restart/status captrace.service" echo " or run: " echo " sudo /usr/local/omc/bin/omcsvc.sh start/stop/restart/status" echo "" -cd ${X86Lib64Dir} -chmod +rx libwireshark.so.15.0.12 -if [ ! -e libwireshark.so.15 ]; then ln -s libwireshark.so.15.0.12 libwireshark.so.15; fi -if [ ! -e libwireshark.so ]; then ln -s libwireshark.so.15.0.12 libwireshark.so; fi -chmod +rx libwiretap.so.12.0.12 -if [ ! -e libwiretap.so.12 ]; then ln -s libwiretap.so.12.0.12 libwiretap.so.12; fi -if [ ! -e libwiretap.so ]; then ln -s libwiretap.so.12.0.12 libwiretap.so; fi -chmod +rx libwsutil.so.13.1.0 -if [ ! -e libwsutil.so.13 ]; then ln -s libwsutil.so.13.1.0 libwsutil.so.13; fi -if [ ! -e libwsutil.so ]; then ln -s libwsutil.so.13.1.0 libwsutil.so; fi cd ${UsrLocalBinDir} if [ ! -e ${OmcDaemon} ]; then ln -s ${OmcBinDir}/omcsvc.sh ${OmcDaemon}; fi @@ -82,9 +69,7 @@ systemctl daemon-reload systemctl disable --now unattended-upgrades systemctl enable restagent.service -systemctl enable crontask.service systemctl enable sshsvc.service -systemctl enable captrace.service systemctl daemon-reload @@ -105,8 +90,6 @@ if [ "$M_PARAM" = "install" -o "$M_PARAM" = "upgrade" ]; then fi echo -n "Starting OMC service ... " -systemctl start crontask.service systemctl start sshsvc.service -systemctl start captrace.service systemctl start restagent.service echo "done" diff --git a/debbuild/22.04/DEBIAN/postrm b/debbuild/22.04/DEBIAN/postrm index d3020a8..87c42a9 100755 --- a/debbuild/22.04/DEBIAN/postrm +++ b/debbuild/22.04/DEBIAN/postrm @@ -1,13 +1,5 @@ # !/bin/bash -X86Lib64Dir=/lib/x86_64-linux-gnu -rm -rf ${X86Lib64Dir}/libwireshark.so.15 -rm -rf ${X86Lib64Dir}/libwireshark.so -rm -rf ${X86Lib64Dir}/libwiretap.so.12 -rm -rf ${X86Lib64Dir}/libwiretap.so -rm -rf ${X86Lib64Dir}/libwsutil.so.13 -rm -rf ${X86Lib64Dir}/libwsutil.so - #rm -rf /usr/local/omc rm -rf /etc/nginx/conf.d/omc.conf rm -f /usr/local/bin/omcd @@ -17,15 +9,11 @@ systemctl daemon-reload if systemctl list-units --type=service --all | grep -q 'restagent.service'; then echo -n "Stopping OMC service ... " systemctl stop restagent.service - systemctl stop crontask.service systemctl stop sshsvc.service - systemctl stop captrace.service echo "done" fi systemctl disable restagent.service -systemctl disable crontask.service systemctl disable sshsvc.service -systemctl disable captrace.service systemctl daemon-reload diff --git a/debbuild/22.04/DEBIAN/preinst b/debbuild/22.04/DEBIAN/preinst index eb6b33e..d9a5cb1 100755 --- a/debbuild/22.04/DEBIAN/preinst +++ b/debbuild/22.04/DEBIAN/preinst @@ -4,9 +4,7 @@ systemctl daemon-reload if systemctl list-units --type=service --all | grep -q 'restagent.service'; then echo -n "Stopping OMC service ... " systemctl stop restagent.service - systemctl stop crontask.service systemctl stop sshsvc.service - systemctl stop captrace.service echo "done" fi diff --git a/debbuild/DEBIAN/postinst b/debbuild/DEBIAN/postinst index 51bcb7f..4a84ef8 100644 --- a/debbuild/DEBIAN/postinst +++ b/debbuild/DEBIAN/postinst @@ -4,36 +4,23 @@ OMCRootDir=/usr/local/omc SystemdRootDir=/lib/systemd/system OMCEtcDir=${OMCRootDir}/etc FERootDir=${OMCRootDir}/htdocs/front -X86Lib64Dir=/lib/x86_64-linux-gnu OmcBinDir=${OMCRootDir}/bin OMCStaticDir=${OMCRootDir}/static UsrLocalBinDir=/usr/local/bin OmcDaemon=omcd NginxEtcDir=/etc/nginx NginxConfDir=${NginxEtcDir}/conf.d -CFileList="restconf.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml omc.conf" +CFileList="restconf.yaml sshsvc.yaml omc.conf" LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png" echo "" echo "* To start/stop/restart/status omc service, please run:" echo " sudo systemctl start/stop/restart/status restagent.service" -echo " sudo systemctl start/stop/restart/status crontask.service" echo " sudo systemctl start/stop/restart/status sshsvc.service" -echo " sudo systemctl start/stop/restart/status captrace.service" echo " or run: " echo " sudo /usr/local/omc/bin/omcsvc.sh start/stop/restart/status" echo "" -cd ${X86Lib64Dir} -chmod +rx libwireshark.so.15.0.12 -if [ ! -e libwireshark.so.15 ]; then ln -s libwireshark.so.15.0.12 libwireshark.so.15; fi -if [ ! -e libwireshark.so ]; then ln -s libwireshark.so.15.0.12 libwireshark.so; fi -chmod +rx libwiretap.so.12.0.12 -if [ ! -e libwiretap.so.12 ]; then ln -s libwiretap.so.12.0.12 libwiretap.so.12; fi -if [ ! -e libwiretap.so ]; then ln -s libwiretap.so.12.0.12 libwiretap.so; fi -chmod +rx libwsutil.so.13.1.0 -if [ ! -e libwsutil.so.13 ]; then ln -s libwsutil.so.13.1.0 libwsutil.so.13; fi -if [ ! -e libwsutil.so ]; then ln -s libwsutil.so.13.1.0 libwsutil.so; fi cd ${UsrLocalBinDir} if [ ! -e ${OmcDaemon} ]; then ln -s ${OmcBinDir}/omcsvc.sh ${OmcDaemon}; fi @@ -82,9 +69,7 @@ systemctl daemon-reload systemctl disable --now unattended-upgrades systemctl enable restagent.service -systemctl enable crontask.service systemctl enable sshsvc.service -systemctl enable captrace.service systemctl daemon-reload @@ -105,8 +90,6 @@ if [ "$M_PARAM" = "install" -o "$M_PARAM" = "upgrade" ]; then fi echo -n "Starting OMC service ... " -systemctl start crontask.service systemctl start sshsvc.service -systemctl start captrace.service systemctl start restagent.service echo "done" diff --git a/debbuild/DEBIAN/postrm b/debbuild/DEBIAN/postrm index d3020a8..87c42a9 100644 --- a/debbuild/DEBIAN/postrm +++ b/debbuild/DEBIAN/postrm @@ -1,13 +1,5 @@ # !/bin/bash -X86Lib64Dir=/lib/x86_64-linux-gnu -rm -rf ${X86Lib64Dir}/libwireshark.so.15 -rm -rf ${X86Lib64Dir}/libwireshark.so -rm -rf ${X86Lib64Dir}/libwiretap.so.12 -rm -rf ${X86Lib64Dir}/libwiretap.so -rm -rf ${X86Lib64Dir}/libwsutil.so.13 -rm -rf ${X86Lib64Dir}/libwsutil.so - #rm -rf /usr/local/omc rm -rf /etc/nginx/conf.d/omc.conf rm -f /usr/local/bin/omcd @@ -17,15 +9,11 @@ systemctl daemon-reload if systemctl list-units --type=service --all | grep -q 'restagent.service'; then echo -n "Stopping OMC service ... " systemctl stop restagent.service - systemctl stop crontask.service systemctl stop sshsvc.service - systemctl stop captrace.service echo "done" fi systemctl disable restagent.service -systemctl disable crontask.service systemctl disable sshsvc.service -systemctl disable captrace.service systemctl daemon-reload diff --git a/debbuild/DEBIAN/preinst b/debbuild/DEBIAN/preinst index eb6b33e..d9a5cb1 100644 --- a/debbuild/DEBIAN/preinst +++ b/debbuild/DEBIAN/preinst @@ -4,9 +4,7 @@ systemctl daemon-reload if systemctl list-units --type=service --all | grep -q 'restagent.service'; then echo -n "Stopping OMC service ... " systemctl stop restagent.service - systemctl stop crontask.service systemctl stop sshsvc.service - systemctl stop captrace.service echo "done" fi diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec index b077da5..221a00b 100644 --- a/rpmbuild/SPECS/omc.spec +++ b/rpmbuild/SPECS/omc.spec @@ -33,20 +33,17 @@ chmod +rx ${RPM_BUILD_ROOT}/usr/lib64/* OMCRootDir=/usr/local/omc OMCEtcDir=${OMCRootDir}/etc FERootDir=${OMCRootDir}/htdocs/front -UsrLib64Dir=/usr/lib64 OMCBinDir=${OMCRootDir}/bin OMCStaticDir=${OMCRootDir}/static UsrLocalBinDir=/usr/local/bin OMCDaemon=omcd NginxEtcDir=/etc/nginx -CFileList="restconf.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml omc.conf" +CFileList="restconf.yaml sshsvc.yaml omc.conf" LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png" echo -n "Stopping OMC service ... " systemctl stop restagent.service -systemctl stop crontask.service systemctl stop sshsvc.service -systemctl stop captrace.service echo "done" for CFile in ${CFileList}; do @@ -70,13 +67,6 @@ done if ! id -u omc >/dev/null 2>&1 ; then useradd -d /opt/omc -m -s /bin/bash -p1000ftp@kp omc; else echo "user omc exist"; fi mkdir -p /opt/omc/ftp mkdir -p /opt/omc/ftp/log -cd ${UsrLib64Dir} -if [ ! -e libwireshark.so.15 ]; then ln -s libwireshark.so.15.0.12 libwireshark.so.15; fi -if [ ! -e libwireshark.so ]; then ln -s libwireshark.so.15.0.12 libwireshark.so; fi -if [ ! -e libwiretap.so.12 ]; then ln -s libwiretap.so.12.0.12 libwiretap.so.12; fi -if [ ! -e libwiretap.so ]; then ln -s libwiretap.so.12.0.12 libwiretap.so; fi -if [ ! -e libwsutil.so.13 ]; then ln -s libwsutil.so.13.1.0 libwsutil.so.13; fi -if [ ! -e libwsutil.so ]; then ln -s libwsutil.so.13.1.0 libwsutil.so; fi cd ${UsrLocalBinDir} if [ ! -e ${OMCDaemon} ]; then ln -s ${OMCBinDir}/omcsvc.sh ${OMCDaemon}; fi @@ -89,9 +79,7 @@ firewall-cmd --reload systemctl daemon-reload systemctl enable restagent.service -systemctl enable crontask.service systemctl enable sshsvc.service -systemctl enable captrace.service # read environment parameter and to do if [ "$M_PARAM" = "install" -o "$M_PARAM" = "upgrade" ]; then @@ -110,23 +98,13 @@ if [ "$M_PARAM" = "install" -o "$M_PARAM" = "upgrade" ]; then fi echo -n "Starting OMC service ... " -systemctl start captrace.service systemctl start sshsvc.service -systemctl start crontask.service systemctl start restagent.service echo "done" # 卸载时执行 %postun UsrLocalBinDir=/usr/local/bin -UsrLib64Dir=/usr/lib64 -cd ${UsrLib64Dir} -rm libwireshark.so.15 -rm libwireshark.so -rm libwiretap.so.12 -rm libwiretap.so -rm libwsutil.so.13 -rm libwsutil.so rm -f ${UsrLocalBinDir}/omcd # setting firewall @@ -138,25 +116,17 @@ firewall-cmd --reload if [ "$1" = "0" ] ; then sudo systemctl stop restagent.service - sudo systemctl stop crontask.service sudo systemctl stop sshsvc.service - sudo systemctl stop captrace.service #rm -rf /usr/local/omc rm -rf /etc/nginx/conf.d/omc.conf sudo systemctl disable restagent.service - sudo systemctl disable crontask.service sudo systemctl disable sshsvc.service - sudo systemctl disable captrace.service sudo systemctl daemon-reload else sudo systemctl daemon-reload sudo systemctl stop restagent.service - sudo systemctl stop crontask.service sudo systemctl stop sshsvc.service - sudo systemctl stop captrace.service - sudo systemctl start crontask.service sudo systemctl start sshsvc.service - sudo systemctl start captrace.service sudo systemctl start restagent.service fi @@ -179,8 +149,7 @@ fi /usr/local/omc/static #/etc/nginx/conf.d/omc.conf /lib/systemd/system/restagent.service -/lib/systemd/system/crontask.service /lib/systemd/system/sshsvc.service -/lib/systemd/system/captrace.service +