OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

alarm_id

Browse Source
This commit is contained in:
simonzhangsz
2023-09-06 11:23:09 +08:00
parent f8b25ef39a
commit 1eed96e9b0
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/etc/default/tasks.yaml
View File

@@ -102,7 +102,7 @@ tasks:
- name: Task of Generate measure threshold alarm - name: Task of Generate measure threshold alarm
status: Active status: Active
uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
params: RJHXEMSPM10200 params: 10200
interval: 10 interval: 10
unit: Seconds unit: Seconds
at: at:
@@ -110,7 +110,7 @@ tasks:
- name: Task of Generate license alarm - name: Task of Generate license alarm
status: Inactive status: Inactive
uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
params: RJHXEMSCM10100 params: 10100 #alarm_code
interval: 1 interval: 1
unit: Days unit: Days
at: 00:30 at: 00:30
@@ -118,7 +118,7 @@ tasks:
- name: Task of Generate NE system state alarm - name: Task of Generate NE system state alarm
status: Active status: Active
uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
params: RJHXEMSSM10000 params: 10000
interval: 5 interval: 5
unit: Seconds unit: Seconds
at: at:
@@ -126,7 +126,7 @@ tasks:
- name: Task of Generate Measure Report Timeout - name: Task of Generate Measure Report Timeout
status: Active status: Active
uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
params: RJHXEMSPM10201 params: 10201
interval: 10 interval: 10
unit: Seconds unit: Seconds
at: at:

2
crontask/db.go
View File

@@ -253,7 +253,7 @@ type MeasureThreshold struct {
Threshold int64 `json:"threshold" xorm:"threshold"` Threshold int64 `json:"threshold" xorm:"threshold"`
Status string `json:"status" xorm:"Status"` Status string `json:"status" xorm:"Status"`
OrigSeverity string `json:"origSeverity" xorm:"orig_severity"` OrigSeverity string `json:"origSeverity" xorm:"orig_severity"`
AlarmId string `json:"alarmId" xorm:"alarm_id"` AlarmCode string `json:"alarmCode" xorm:"alarm_code"`
AlarmFlag bool `json:"alarmFlag" xorm:"alarm_flag"` AlarmFlag bool `json:"alarmFlag" xorm:"alarm_flag"`
} }

2
crontask/etc/tasks.yaml
View File

@@ -102,7 +102,7 @@ tasks:
- name: Task of Generate measure threshold alarm - name: Task of Generate measure threshold alarm
status: Inactive status: Inactive
uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
params: RJHXEMSPM10200 params: 10200
interval: 10 interval: 10
unit: Seconds unit: Seconds
at: at:

10
crontask/tasks.go
View File

@@ -538,7 +538,7 @@ func (t *TaskFunc) TaskGenMeasureThresholdAlarm(uri, params, body string) {
} }
log.Debug("measureData:", measureData) log.Debug("measureData:", measureData)
alarmDefine, err := XormGetAlarmDefine(m.AlarmId) alarmDefine, err := XormGetAlarmDefine(m.AlarmCode)
if err != nil { if err != nil {
log.Error("Failed to get alarm_define:", err) log.Error("Failed to get alarm_define:", err)
continue continue
@@ -585,7 +585,7 @@ func (t *TaskFunc) TaskGenMeasureThresholdAlarm(uri, params, body string) {
locationInfo := fmt.Sprintf("PM.%s: value=%v, threshold=%v", m.KpiSet, measureData.Value, m.Threshold) locationInfo := fmt.Sprintf("PM.%s: value=%v, threshold=%v", m.KpiSet, measureData.Value, m.Threshold)
alarmData := &Alarm{ alarmData := &Alarm{
AlarmSeq: alarmSeq, AlarmSeq: alarmSeq,
AlarmId: m.AlarmId, AlarmId: alarmDefine.AlarmId,
NeId: measureData.RmUid, NeId: measureData.RmUid,
NeType: m.NeType, NeType: m.NeType,
NeName: measureData.NeName, NeName: measureData.NeName,
@@ -663,7 +663,7 @@ func (t *TaskFunc) TaskGenMeasureThresholdAlarm(uri, params, body string) {
locationInfo := fmt.Sprintf("PM.%s: value=%v，threshold=%v", m.KpiSet, measureData.Value, m.Threshold) locationInfo := fmt.Sprintf("PM.%s: value=%v，threshold=%v", m.KpiSet, measureData.Value, m.Threshold)
alarmData := &Alarm{ alarmData := &Alarm{
AlarmSeq: alarmSeq, AlarmSeq: alarmSeq,
AlarmId: m.AlarmId, AlarmId: alarmDefine.AlarmId,
NeId: measureData.RmUid, NeId: measureData.RmUid,
NeType: m.NeType, NeType: m.NeType,
NeName: measureData.NeName, NeName: measureData.NeName,
@@ -834,7 +834,7 @@ func (t *TaskFunc) TaskGenMeasureReportTimeoutAlarm(uri, params, body string) {
alarmData := &Alarm{ alarmData := &Alarm{
AlarmSeq: alarmSeq, AlarmSeq: alarmSeq,
AlarmId: alarmId, AlarmId: alarmDefine.AlarmId,
NeId: neInfo.RmUID, NeId: neInfo.RmUID,
NeType: measureTask.NeType, NeType: measureTask.NeType,
NeName: neInfo.NeName, NeName: neInfo.NeName,
@@ -891,7 +891,7 @@ func (t *TaskFunc) TaskGenMeasureReportTimeoutAlarm(uri, params, body string) {
locationInfo := fmt.Sprintf("PM.taskId=%d: neType=%s, neId=%s", measureTask.Id, neInfo.NeType, neInfo.NeId) locationInfo := fmt.Sprintf("PM.taskId=%d: neType=%s, neId=%s", measureTask.Id, neInfo.NeType, neInfo.NeId)
alarmData := &Alarm{ alarmData := &Alarm{
AlarmSeq: alarmSeq, AlarmSeq: alarmSeq,
AlarmId: alarmId, AlarmId: alarmDefine.AlarmId,
NeId: neInfo.RmUID, NeId: neInfo.RmUID,
NeType: measureTask.NeType, NeType: measureTask.NeType,
NeName: neInfo.NeName, NeName: neInfo.NeName,