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

feat: support add redis queue with alarm/nbi_pm/nbi_kpi, support generate all nbi pm data

Browse Source
This commit is contained in:
simon
2025-08-11 17:10:13 +08:00
parent d4923d008c
commit 46ccc0ab83
26 changed files with 14059 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/etc/default/alarm_relation_rules.yaml Normal file
View File

@@ -0,0 +1,10 @@
# alarm relation rules
derived:
- parentCode: 10001
childCode: 10002
- parentCode: 20001
childCode: 20002
related:
- codes: [30005, 30006, 30007]
neType: "AMF"
timeWindow: 60 # 秒

4
config/etc/default/nbi_pm.yaml Normal file
View File

@@ -0,0 +1,4 @@
schemaPath: /usr/local/omc/etc/schema
randomMin: 1
randomMax: 100
mergeMode: merge # none: Merge Mode None/merge: Merge Mode Merge/schema: Merge Mode Schema

12
config/etc/default/restconf.yaml
View File

@@ -186,4 +186,14 @@ params:
testConfig: testConfig:
enabled: false enabled: false
file: /usr/local/omc/etc/testconfig.yaml file: /usr/local/omc/etc/testconfig.yaml
nbiConfig:
enabled: true
pmConfig:
enabled: true
file: /usr/local/omc/etc/nbi_pm.yaml
# alarm_relation_rules.yaml
relationRules:
enabled: true
file: /usr/local/omc/etc/alarm_relation_rules.yaml

1278
config/etc/schema/amf-nbi-pm-schema.json Normal file
View File

File diff suppressed because it is too large Load Diff

269
config/etc/schema/pcf-nbi-pm-schema.json Normal file
View File

@@ -0,0 +1,269 @@
[
{
"ObjectType": "PcfFunction",
"KPIs": [
{
"KPIID": "PCF.AmAssocNbrMean",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "PCF.AmAssocNbrMax",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.SmAssocNbrMean",
"KPIValues": [
{
"Name": "Total",
"Value": 7
}
]
},
{
"KPIID": "PCF.SmAssocNbrMax",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicyAmAssocCreateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "PCF.PolicyAmAssocCreateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.PolicyAmAssocUpdateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 7
}
]
},
{
"KPIID": "PCF.PolicyAmAssocUpdateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "PCF.PolicyAmAssocNotifReq",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "PCF.PolicyAmAssocNotifSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 12
}
]
},
{
"KPIID": "PCF.PolicyAmAssocDeleteReq",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicyAmAssocDeleteSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateFail",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateFail._Cause",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateFail",
"KPIValues": [
{
"Name": "Total",
"Value": 9
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateFail._Cause",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifReq",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifFail",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifFail._Cause",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "PCF.PolicySmAssocDeleteReq",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "PCF.PolicySmAssocDeleteSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
}
]
},
{
"ObjectType": "UdrFunction",
"KPIs": [
{
"KPIID": "UDR.PcfSubNbr",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
}
]
},
{
"ObjectType": "ManagedElement",
"KPIs": [
{
"KPIID": "ME.MeanMeLoad",
"KPIValues": [
{
"Name": "Total",
"Value": 13
}
]
}
]
}
]

1287
config/etc/schema/smf-nbi-pm-schema.json Normal file
View File

File diff suppressed because it is too large Load Diff

373
config/etc/schema/udm-nbi-pm-schema.json Normal file
View File

@@ -0,0 +1,373 @@
[
{
"ObjectType": "UdmFunction",
"KPIs": [
{
"KPIID": "UDM.AmfUecmRegReq",
"KPIValues": [
{
"Name": "Total",
"Value": 15
}
]
},
{
"KPIID": "UDM.AmfUecmRegSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.AmfUecmRegUpdateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 9
}
]
},
{
"KPIID": "UDM.AmfUecmRegUpdateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 9
}
]
},
{
"KPIID": "UDM.AmfUecmDeregReq",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.AmfUecmDeregSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 15
}
]
},
{
"KPIID": "UDM.SmfUecmRegReq",
"KPIValues": [
{
"Name": "Total",
"Value": 1
}
]
},
{
"KPIID": "UDM.SmfUecmRegSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.SmfUecmDeregReq",
"KPIValues": [
{
"Name": "Total",
"Value": 5
}
]
},
{
"KPIID": "UDM.SmfUecmDeregSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "UDM.SdmGetReq",
"KPIValues": [
{
"Name": "Total",
"Value": 16
}
]
},
{
"KPIID": "UDM.SdmGetSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDM.SdmNotif",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "UDM.SdmSubscrReq",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.SdmSubscrSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "UDM.SdmUnSubscrReq",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "UDM.SdmUnSubscrSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDM.UecmDeregNotif",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "UDM.SdmGetUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 7
}
]
},
{
"KPIID": "UDM.SdmGetDataNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 5
}
]
},
{
"KPIID": "UDM.AmfUecmRegUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDM.AmfUecmRegUnknownSub",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "UDM.AmfUecmRegNoPsSub",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.AmfUecmRegRoamNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "UDM.AmfUecmRegRatNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.AmfUecmRegContextNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.AmfUecmRegReAuth",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.SmfUecmRegUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 15
}
]
},
{
"KPIID": "UDM.SmfUecmRegUnknownSub",
"KPIValues": [
{
"Name": "Total",
"Value": 13
}
]
},
{
"KPIID": "UDM.SmfUecmRegRoamNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "UDM.SmfUecmRegDnnNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
}
]
},
{
"ObjectType": "UdrFunction",
"KPIs": [
{
"KPIID": "UDR.5gSupi",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "UDR.5gSub",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDR.5gActSub",
"KPIValues": [
{
"Name": "Total",
"Value": 16
}
]
}
]
},
{
"ObjectType": "AusfFunction",
"KPIs": [
{
"KPIID": "Ausf.UeAuthReq",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "Ausf.UeAuthAnsSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "Ausf.UeAuthAnsUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "Ausf.UeAuthAnsContextNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
}
]
},
{
"ObjectType": "ManagedElement",
"KPIs": [
{
"KPIID": "ME.MeanMeLoad",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
}
]
}
]

1257
config/etc/schema/upf-nbi-pm-schema.json Normal file
View File

File diff suppressed because it is too large Load Diff

1278
config/schema/amf-nbi-pm-schema.json Normal file
View File

File diff suppressed because it is too large Load Diff

269
config/schema/pcf-nbi-pm-schema.json Normal file
View File

@@ -0,0 +1,269 @@
[
{
"ObjectType": "PcfFunction",
"KPIs": [
{
"KPIID": "PCF.AmAssocNbrMean",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "PCF.AmAssocNbrMax",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.SmAssocNbrMean",
"KPIValues": [
{
"Name": "Total",
"Value": 7
}
]
},
{
"KPIID": "PCF.SmAssocNbrMax",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicyAmAssocCreateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "PCF.PolicyAmAssocCreateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.PolicyAmAssocUpdateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 7
}
]
},
{
"KPIID": "PCF.PolicyAmAssocUpdateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "PCF.PolicyAmAssocNotifReq",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "PCF.PolicyAmAssocNotifSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 12
}
]
},
{
"KPIID": "PCF.PolicyAmAssocDeleteReq",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicyAmAssocDeleteSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateFail",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateFail._Cause",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateFail",
"KPIValues": [
{
"Name": "Total",
"Value": 9
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateFail._Cause",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifReq",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifFail",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifFail._Cause",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "PCF.PolicySmAssocDeleteReq",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "PCF.PolicySmAssocDeleteSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
}
]
},
{
"ObjectType": "UdrFunction",
"KPIs": [
{
"KPIID": "UDR.PcfSubNbr",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
}
]
},
{
"ObjectType": "ManagedElement",
"KPIs": [
{
"KPIID": "ME.MeanMeLoad",
"KPIValues": [
{
"Name": "Total",
"Value": 13
}
]
}
]
}
]

1287
config/schema/smf-nbi-pm-schema.json Normal file
View File

File diff suppressed because it is too large Load Diff

373
config/schema/udm-nbi-pm-schema.json Normal file
View File

@@ -0,0 +1,373 @@
[
{
"ObjectType": "UdmFunction",
"KPIs": [
{
"KPIID": "UDM.AmfUecmRegReq",
"KPIValues": [
{
"Name": "Total",
"Value": 15
}
]
},
{
"KPIID": "UDM.AmfUecmRegSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.AmfUecmRegUpdateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 9
}
]
},
{
"KPIID": "UDM.AmfUecmRegUpdateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 9
}
]
},
{
"KPIID": "UDM.AmfUecmDeregReq",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.AmfUecmDeregSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 15
}
]
},
{
"KPIID": "UDM.SmfUecmRegReq",
"KPIValues": [
{
"Name": "Total",
"Value": 1
}
]
},
{
"KPIID": "UDM.SmfUecmRegSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.SmfUecmDeregReq",
"KPIValues": [
{
"Name": "Total",
"Value": 5
}
]
},
{
"KPIID": "UDM.SmfUecmDeregSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "UDM.SdmGetReq",
"KPIValues": [
{
"Name": "Total",
"Value": 16
}
]
},
{
"KPIID": "UDM.SdmGetSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDM.SdmNotif",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "UDM.SdmSubscrReq",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.SdmSubscrSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "UDM.SdmUnSubscrReq",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "UDM.SdmUnSubscrSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDM.UecmDeregNotif",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "UDM.SdmGetUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 7
}
]
},
{
"KPIID": "UDM.SdmGetDataNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 5
}
]
},
{
"KPIID": "UDM.AmfUecmRegUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDM.AmfUecmRegUnknownSub",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "UDM.AmfUecmRegNoPsSub",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.AmfUecmRegRoamNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "UDM.AmfUecmRegRatNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.AmfUecmRegContextNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.AmfUecmRegReAuth",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.SmfUecmRegUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 15
}
]
},
{
"KPIID": "UDM.SmfUecmRegUnknownSub",
"KPIValues": [
{
"Name": "Total",
"Value": 13
}
]
},
{
"KPIID": "UDM.SmfUecmRegRoamNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "UDM.SmfUecmRegDnnNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
}
]
},
{
"ObjectType": "UdrFunction",
"KPIs": [
{
"KPIID": "UDR.5gSupi",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "UDR.5gSub",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDR.5gActSub",
"KPIValues": [
{
"Name": "Total",
"Value": 16
}
]
}
]
},
{
"ObjectType": "AusfFunction",
"KPIs": [
{
"KPIID": "Ausf.UeAuthReq",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "Ausf.UeAuthAnsSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "Ausf.UeAuthAnsUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "Ausf.UeAuthAnsContextNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
}
]
},
{
"ObjectType": "ManagedElement",
"KPIs": [
{
"KPIID": "ME.MeanMeLoad",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
}
]
}
]

1257
config/schema/upf-nbi-pm-schema.json Normal file
View File

File diff suppressed because it is too large Load Diff

11
features/fm/alarm.go
View File

@@ -450,6 +450,12 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
services.ResponseInternalServerError500DatabaseOperationFailed(w) services.ResponseInternalServerError500DatabaseOperationFailed(w)
continue continue
} }
// 推送到 redis 队列, for NBI ARALM notification
err = redisqueue.AddAlarmQueue(alarmData.AlarmId)
if err != nil {
log.Warn("Failed to AddAlarmQueue:", err)
}
} }
alarmLog := new(AlarmLog) alarmLog := new(AlarmLog)
alarmLog.NeType = alarmData.NeType alarmLog.NeType = alarmData.NeType
@@ -779,6 +785,11 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
log.Error("Failed to insert alarm:", err) log.Error("Failed to insert alarm:", err)
continue continue
} }
// 推送到 redis 队列, for NBI ARALM notification
err = redisqueue.AddAlarmQueue(alarmData.AlarmId)
if err != nil {
log.Warn("Failed to AddAlarmQueue:", err)
}
} }
if err == nil && affected > 0 { if err == nil && affected > 0 {
alarmLog := new(AlarmLog) alarmLog := new(AlarmLog)

86
features/nbi/redisqueue/queue.go
View File

@@ -10,6 +10,20 @@ import (
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
) )
const (
// MaxMessages is the maximum number of messages to retain in each stream
// This is set to 2000 as per the original code
// It ensures that only the latest 2000 messages are kept in the stream
// This helps in managing memory and performance by not allowing the stream to grow indefinitely
// If you need to change this, make sure to update it in all relevant places
// across the codebase to maintain consistency
// and avoid unexpected behavior.
// Note: This value should be consistent with the XTRIM command used in the code
// to trim the stream.
// If you change this value, also update the XTRIM command accordingly.
maxMessages = 2000 // Maximum number of messages to retain in each stream
)
// 写入 alarm_relation 消息 // 写入 alarm_relation 消息
func AddAlarmRelationQueue(ids []string) error { func AddAlarmRelationQueue(ids []string) error {
payload := map[string][]string{"ids": ids} payload := map[string][]string{"ids": ids}
@@ -27,7 +41,29 @@ func AddAlarmRelationQueue(ids []string) error {
}).Result() }).Result()
// 只保留最新2000条消息 // 只保留最新2000条消息
client.XTrimMaxLen(context.Background(), "alarm_relation", 2000).Result() client.XTrimMaxLen(context.Background(), "alarm_relation", maxMessages).Result()
return err
}
// 写入 alarm 消息
func AddAlarmQueue(id string) error {
payload := map[string]string{"id": id}
payloadBytes, err := json.Marshal(payload)
if err != nil {
return err
}
values := map[string]interface{}{
"payload": string(payloadBytes),
}
_, err = client.XAdd(ctx, &redis.XAddArgs{
Stream: "alarm",
Values: values,
}).Result()
// 只保留最新2000条消息
client.XTrimMaxLen(context.Background(), "alarm", maxMessages).Result()
return err return err
} }
@@ -48,13 +84,34 @@ func AddNbiCMQueue(ids []string) error {
}).Result() }).Result()
// 只保留最新2000条消息 // 只保留最新2000条消息
client.XTrimMaxLen(context.Background(), "nbi_cm", 2000).Result() client.XTrimMaxLen(context.Background(), "nbi_cm", maxMessages).Result()
return err
}
// 写入 kpi_report_xxx 消息
func AddNbiKpiQueue(neType, id string) error {
payload := map[string]string{"neType": neType, "id": id}
payloadBytes, err := json.Marshal(payload)
if err != nil {
return err
}
values := map[string]interface{}{
"payload": string(payloadBytes),
}
_, err = client.XAdd(ctx, &redis.XAddArgs{
Stream: "nbi_kpi",
Values: values,
}).Result()
// 只保留最新2000条消息
client.XTrimMaxLen(context.Background(), "nbi_kpi", maxMessages).Result()
return err return err
} }
// 写入 nbi_pm 消息 // 写入 nbi_pm 消息
func AddNbiPMQueue(neType, id string) error { func AddNbiPMQueueOrg(neType, id string) error {
payload := map[string]string{"neType": neType, "id": id} payload := map[string]string{"neType": neType, "id": id}
payloadBytes, err := json.Marshal(payload) payloadBytes, err := json.Marshal(payload)
if err != nil { if err != nil {
@@ -69,7 +126,28 @@ func AddNbiPMQueue(neType, id string) error {
}).Result() }).Result()
// 只保留最新2000条消息 // 只保留最新2000条消息
client.XTrimMaxLen(context.Background(), "nbi_pm", 2000).Result() client.XTrimMaxLen(context.Background(), "nbi_pm", maxMessages).Result()
return err
}
// 写入 nbi_pm 消息
func AddNbiPMQueue(id string) error {
payload := map[string]string{"id": id}
payloadBytes, err := json.Marshal(payload)
if err != nil {
return err
}
values := map[string]interface{}{
"payload": string(payloadBytes),
}
_, err = client.XAdd(ctx, &redis.XAddArgs{
Stream: "nbi_pm",
Values: values,
}).Result()
// 只保留最新2000条消息
client.XTrimMaxLen(context.Background(), "nbi_pm", maxMessages).Result()
return err return err
} }

507
features/pm/performance.go
View File

@@ -5,7 +5,10 @@ import (
"fmt" "fmt"
"io" "io"
"math" "math"
"math/rand"
"net/http" "net/http"
"os"
"path/filepath"
"strconv" "strconv"
"strings" "strings"
"time" "time"
@@ -340,9 +343,9 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
} }
// 推送到redis队列 // 推送到redis队列
err = redisqueue.AddNbiPMQueue(kpiData.NEType, strconv.Itoa(kpiData.ID)) err = redisqueue.AddNbiKpiQueue(kpiData.NEType, strconv.Itoa(kpiData.ID))
if err != nil { if err != nil {
log.Warn("Failed to AddNbiPMQueue:", err) log.Warn("Failed to AddNbiKpiQueue:", err)
} }
services.ResponseStatusOK204NoContent(w) services.ResponseStatusOK204NoContent(w)
@@ -933,37 +936,449 @@ func PatchMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
} }
type Measurement struct { type Measurement struct {
Id int `json:"-" xorm:"pk 'id' autoincr"` // Date is the measurement date in YYYY-MM-DD format (internal use only, omitted from JSON).
Date string `json:"-" xorm:"date"` Date string `json:"-" xorm:"date"`
Index int `json:"Index"` // 1天中测量时间粒度(如15分钟)的切片索引: 0~95 Index int `json:"Index"` // Index of 15-minute intervals (time granularity) in a day, range: 0~95
Timestamp string `json:"TimeStamp" xorm:"-"` // Timestamp represents the measurement time in Unix milliseconds, populated from measurement time.
NeName string `json:"NeName"` // UserLabel NeName string `json:"NeName"` // 网元用户标签（UserLabel），用于显示和唯一标识网元名称
RmUID string `json:"RmUID" xorm:"rm_uid"` // RmUID is the unique identifier for the network element (unique per NE, used for database joins).
NeType string `json:"NeType"` // 网元类型 RmUID string `json:"RmUID" xorm:"rm_uid"`
PmVersion string `json:"PmVersion"` // 性能数据版本号 // Dn is the Network Element Distinguished Name (DN), uniquely identifies the network element.
Dn string `json:"Dn"` // (???)网元标识, 如:RJN-CMZJ-TZ,SubNetwork=5GC88,ManagedElement=SMF53456,SmfFunction=53456 // Format example: "RJN-CMZJ-TZ,SubNetwork=5GC88,ManagedElement=SMF53456,SmfFunction=53456"
Period string `json:"Period"` // 测量时间粒度选项：5/15/30/60 // Dn为网元唯一标识(DN)，格式示例："RJN-CMZJ-TZ,SubNetwork=5GC88,ManagedElement=SMF53456,SmfFunction=53456"
Dn string `json:"Dn" xorm:"dn"`
// TimeZone specifies the time zone for the measurement, e.g., "Asia/Shanghai" or "+08:00".
TimeZone string `json:"TimeZone"` TimeZone string `json:"TimeZone"`
NeType string `json:"NeType"` // 网元类型
StartTime string `json:"StartTime"` StartTime string `json:"StartTime"`
// List of KPIs grouped by ObjectType.
Datas []Data `json:"Datas"` Datas []Data `json:"Datas"`
} }
type KPIValue struct { type KPIValue struct {
Name string `json:"Name"` // 单个的写"Total", 或者指标项有多个测量项，如Dnn的名称写对应的Dnn"cmnet"/"ims" Name string `json:"Name"` // "Total" is used for aggregate values; other names (e.g., "cmnet", "ims") are used for specific measurement items such as DNN names.
Value int64 `json:"Value"` Value int64 `json:"Value"`
} }
type KPI struct { type KPI struct {
KPIID string `json:"KPIID"` // 指标项, 如： SMF.AttCreatePduSession._Dnn KPIID string `json:"KPIID"`
KPIValues []KPIValue `json:"KPIValues"` KPIValues []KPIValue `json:"KPIValues"`
} }
type Data struct { type Data struct {
ObjectType string `json:"ObjectType"` // 网络资源类别名称, Pm指标项列表中为空间粒度 如：SmfFunction ObjectType string `json:"ObjectType"` // 网络资源类别名称, Pm指标项列表中为空间粒度 如：SmfFunction
KPIs []KPI `json:"KPIs"` // 指标项, 如： SMF.AttCreatePduSession._Dnn KPIs []KPI `json:"KPIs"` // 指标项, 如： SMF.AttCreatePduSession._Dnn
} }
// 添加配置结构体
// type PMConfig struct {
// SchemaPath string `json:"schemaPath"` // schema文件路径
// RandomMin int `json:"randomMin"` // 随机数最小值
// RandomMax int `json:"randomMax"` // 随机数最大值
// MergeMode string `json:"mergeMode"` // 合并模式: "merge"(合并), "none"(不合并), "schema"(仅schema随机值)
// }
// 定义合并模式常量
const (
MergeModeNone = "none" // 不合并，仅使用网元发送的数据
MergeModeMerge = "merge" // 合并模式，优先使用网元数据，缺失部分用随机值补充
MergeModeSchema = "schema" // 仅使用schema数据，全部用随机值
)
// 全局配置
// SchemaPath should be configured per environment; by default, it uses "/home/simon/omc.git/be.ems/config/schema".
// You can override this by setting the environment variable EMS_PM_SCHEMA_PATH.
// var pmConfig = PMConfig{
// SchemaPath: func() string {
// if envPath := os.Getenv("EMS_PM_SCHEMA_PATH"); envPath != "" {
// return envPath
// }
// return "/home/simon/omc.git/be.ems/config/schema"
// }(),
// RandomMin: 1,
// RandomMax: 16,
// MergeMode: MergeModeSchema,
// }
// var pmConfig = PMConfig{
// SchemaPath: config.GetNbiPmConfig().SchemaPath,
// RandomMin: config.GetNbiPmConfig().RandomMin,
// RandomMax: config.GetNbiPmConfig().RandomMax,
// MergeMode: config.GetNbiPmConfig().MergeMode,
// }
// schema数据结构
type SchemaKPIValue struct {
Name string `json:"Name"`
Value int `json:"Value"`
}
type SchemaKPI struct {
KPIID string `json:"KPIID"`
KPIValues []SchemaKPIValue `json:"KPIValues"`
}
type SchemaObject struct {
ObjectType string `json:"ObjectType"`
KPIs []SchemaKPI `json:"KPIs"`
}
type SchemaData []SchemaObject
// 读取schema文件
func loadSchemaData(neType string) (*SchemaData, error) {
schemaFile := filepath.Join(config.GetNbiPmConfig().SchemaPath, strings.ToLower(neType)+"-nbi-pm-schema.json")
if _, err := os.Stat(schemaFile); os.IsNotExist(err) {
log.Warnf("Schema file not found: %s", schemaFile)
return nil, nil // 文件不存在时返回 nil，不是错误
}
data, err := os.ReadFile(schemaFile)
if err != nil {
return nil, fmt.Errorf("failed to read schema file: %v", err)
}
var schema SchemaData
if err := json.Unmarshal(data, &schema); err != nil {
return nil, fmt.Errorf("failed to parse schema file: %v", err)
}
return &schema, nil
}
// 生成随机值
func generateRandomKPIValue() int64 {
return int64(rand.Intn(config.GetNbiPmConfig().RandomMax-config.GetNbiPmConfig().RandomMin+1) +
config.GetNbiPmConfig().RandomMin)
}
// 合并网元数据和schema数据
func mergeWithSchema(measurement *dborm.NorthboundPm, schema *SchemaData) {
if schema == nil {
return
}
switch config.GetNbiPmConfig().MergeMode {
case MergeModeNone:
// 不合并，直接返回
log.Debug("Merge mode is 'none', skipping schema merge")
return
case MergeModeSchema:
// 仅使用schema数据，清空原有数据，全部用随机值
log.Debug("Merge mode is 'schema', replacing all data with schema random values")
measurement.Datas = nil
generateSchemaOnlyData(measurement, schema)
return
case MergeModeMerge:
// 合并模式，优先使用网元数据，缺失部分用随机值补充
log.Debug("Merge mode is 'merge', merging NE data with schema")
mergeNeDataWithSchema(measurement, schema)
return
default:
log.Warnf("Unknown merge mode: %s, using default merge mode", config.GetNbiPmConfig().MergeMode)
mergeNeDataWithSchema(measurement, schema)
}
}
// 仅使用schema数据生成随机值
func generateSchemaOnlyData(measurement *dborm.NorthboundPm, schema *SchemaData) {
for _, schemaObj := range *schema {
newData := struct {
ObjectType string `json:"ObjectType" xorm:"object_type"`
PmDatas []struct {
PmName string `json:"KPIID" xorm:"pm_name"`
SubDatas []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
} `json:"KPIValues" xorm:"sub_datas"`
} `json:"KPIs" xorm:"pm_datas"`
}{
ObjectType: schemaObj.ObjectType,
PmDatas: []struct {
PmName string `json:"KPIID" xorm:"pm_name"`
SubDatas []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
} `json:"KPIValues" xorm:"sub_datas"`
}{},
}
// 遍历schema中的KPI
for _, schemaKPI := range schemaObj.KPIs {
newKPI := struct {
PmName string `json:"KPIID" xorm:"pm_name"`
SubDatas []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
} `json:"KPIValues" xorm:"sub_datas"`
}{
PmName: schemaKPI.KPIID,
SubDatas: []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
}{},
}
// 为每个KPI值生成随机数
for _, schemaValue := range schemaKPI.KPIValues {
randomValue := generateRandomKPIValue()
newSubData := struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
}{
SN: schemaValue.Name,
SV: randomValue,
}
newKPI.SubDatas = append(newKPI.SubDatas, newSubData)
log.Debugf("Generated schema random value for %s.%s: %d",
schemaKPI.KPIID, schemaValue.Name, randomValue)
}
if len(newKPI.SubDatas) > 0 {
newData.PmDatas = append(newData.PmDatas, newKPI)
}
}
if len(newData.PmDatas) > 0 {
measurement.Datas = append(measurement.Datas, newData)
log.Debugf("Created ObjectType with schema data: %s (%d KPIs)",
schemaObj.ObjectType, len(newData.PmDatas))
}
}
log.Debugf("Schema-only mode: generated %d object types", len(measurement.Datas))
}
// 合并网元数据和schema数据（原有逻辑）
func mergeNeDataWithSchema(measurement *dborm.NorthboundPm, schema *SchemaData) {
// 创建网元已有数据的映射，用于快速查找
neDataMap := make(map[string]map[string]map[string]int64) // ObjectType -> KPIID -> Name -> Value
for _, data := range measurement.Datas {
if neDataMap[data.ObjectType] == nil {
neDataMap[data.ObjectType] = make(map[string]map[string]int64)
}
for _, pmData := range data.PmDatas {
if neDataMap[data.ObjectType][pmData.PmName] == nil {
neDataMap[data.ObjectType][pmData.PmName] = make(map[string]int64)
}
for _, subData := range pmData.SubDatas {
neDataMap[data.ObjectType][pmData.PmName][subData.SN] = subData.SV
}
}
}
log.Debugf("Original measurement data contains %d object types", len(measurement.Datas))
// 遍历schema，补充缺失的数据
for _, schemaObj := range *schema {
// 查找或创建对应的ObjectType
var targetData *struct {
ObjectType string `json:"ObjectType" xorm:"object_type"`
PmDatas []struct {
PmName string `json:"KPIID" xorm:"pm_name"`
SubDatas []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
} `json:"KPIValues" xorm:"sub_datas"`
} `json:"KPIs" xorm:"pm_datas"`
}
for i := range measurement.Datas {
if measurement.Datas[i].ObjectType == schemaObj.ObjectType {
targetData = &measurement.Datas[i]
break
}
}
// 如果没找到对应的ObjectType，创建新的
if targetData == nil {
newData := struct {
ObjectType string `json:"ObjectType" xorm:"object_type"`
PmDatas []struct {
PmName string `json:"KPIID" xorm:"pm_name"`
SubDatas []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
} `json:"KPIValues" xorm:"sub_datas"`
} `json:"KPIs" xorm:"pm_datas"`
}{
ObjectType: schemaObj.ObjectType,
PmDatas: []struct {
PmName string `json:"KPIID" xorm:"pm_name"`
SubDatas []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
} `json:"KPIValues" xorm:"sub_datas"`
}{},
}
measurement.Datas = append(measurement.Datas, newData)
targetData = &measurement.Datas[len(measurement.Datas)-1]
log.Debugf("Created new ObjectType: %s", schemaObj.ObjectType)
}
// 遍历schema中的KPI
for _, schemaKPI := range schemaObj.KPIs {
// 查找是否已存在该KPI
var targetKPI *struct {
PmName string `json:"KPIID" xorm:"pm_name"`
SubDatas []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
} `json:"KPIValues" xorm:"sub_datas"`
}
for i := range targetData.PmDatas {
if targetData.PmDatas[i].PmName == schemaKPI.KPIID {
targetKPI = &targetData.PmDatas[i]
break
}
}
// 如果没找到对应的KPI，创建新的
if targetKPI == nil {
newKPI := struct {
PmName string `json:"KPIID" xorm:"pm_name"`
SubDatas []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
} `json:"KPIValues" xorm:"sub_datas"`
}{
PmName: schemaKPI.KPIID,
SubDatas: []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
}{},
}
targetData.PmDatas = append(targetData.PmDatas, newKPI)
targetKPI = &targetData.PmDatas[len(targetData.PmDatas)-1]
log.Debugf("Created new KPI: %s", schemaKPI.KPIID)
}
// 遍历schema中的KPI值
for _, schemaValue := range schemaKPI.KPIValues {
// 检查是否已存在该值
exists := false
for i := range targetKPI.SubDatas {
if targetKPI.SubDatas[i].SN == schemaValue.Name {
exists = true
// 如果网元没有提供该值，使用随机值
if neDataMap[schemaObj.ObjectType] == nil ||
neDataMap[schemaObj.ObjectType][schemaKPI.KPIID] == nil ||
neDataMap[schemaObj.ObjectType][schemaKPI.KPIID][schemaValue.Name] == 0 {
targetKPI.SubDatas[i].SV = generateRandomKPIValue()
log.Debugf("Updated KPI %s.%s with random value: %d",
schemaKPI.KPIID, schemaValue.Name, targetKPI.SubDatas[i].SV)
}
break
}
}
// 如果不存在，添加新的值
if !exists {
var value int64
// 优先使用网元发送的值
if neDataMap[schemaObj.ObjectType] != nil &&
neDataMap[schemaObj.ObjectType][schemaKPI.KPIID] != nil &&
neDataMap[schemaObj.ObjectType][schemaKPI.KPIID][schemaValue.Name] != 0 {
value = neDataMap[schemaObj.ObjectType][schemaKPI.KPIID][schemaValue.Name]
log.Debugf("Using NE provided value for %s.%s: %d",
schemaKPI.KPIID, schemaValue.Name, value)
} else {
value = generateRandomKPIValue()
log.Debugf("Generated random value for %s.%s: %d",
schemaKPI.KPIID, schemaValue.Name, value)
}
newSubData := struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
}{
SN: schemaValue.Name,
SV: value,
}
targetKPI.SubDatas = append(targetKPI.SubDatas, newSubData)
}
}
}
}
}
// Add this function before mergeNeDataWithSchema
func mergeDuplicateObjectTypes(measurement *dborm.NorthboundPm) {
if len(measurement.Datas) <= 1 {
return
}
// Create a map to group data by ObjectType
objectTypeMap := make(map[string]*struct {
ObjectType string `json:"ObjectType" xorm:"object_type"`
PmDatas []struct {
PmName string `json:"KPIID" xorm:"pm_name"`
SubDatas []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
} `json:"KPIValues" xorm:"sub_datas"`
} `json:"KPIs" xorm:"pm_datas"`
})
// Group data by ObjectType
for _, data := range measurement.Datas {
if existingData, exists := objectTypeMap[data.ObjectType]; exists {
// Merge PmDatas - check for duplicate KPIs
kpiMap := make(map[string]*struct {
PmName string `json:"KPIID" xorm:"pm_name"`
SubDatas []struct {
SN string `json:"Name" xorm:"sn"`
SV int64 `json:"Value" xorm:"sv"`
} `json:"KPIValues" xorm:"sub_datas"`
})
// Index existing KPIs
for i := range existingData.PmDatas {
kpiMap[existingData.PmDatas[i].PmName] = &existingData.PmDatas[i]
}
// Merge new KPIs
for _, newPmData := range data.PmDatas {
if existingKpi, exists := kpiMap[newPmData.PmName]; exists {
// Merge SubDatas for existing KPI
subDataMap := make(map[string]bool)
for _, subData := range existingKpi.SubDatas {
subDataMap[subData.SN] = true
}
// Add new SubDatas that don't exist
for _, newSubData := range newPmData.SubDatas {
if !subDataMap[newSubData.SN] {
existingKpi.SubDatas = append(existingKpi.SubDatas, newSubData)
}
}
} else {
// Add new KPI
existingData.PmDatas = append(existingData.PmDatas, newPmData)
}
}
} else {
// Create new entry for this ObjectType
objectTypeMap[data.ObjectType] = &data
}
}
// Replace measurement.Datas with merged data
measurement.Datas = nil
for _, mergedData := range objectTypeMap {
measurement.Datas = append(measurement.Datas, *mergedData)
}
log.Debugf("Merged duplicate ObjectTypes: original count %d, merged count %d",
len(measurement.Datas), len(objectTypeMap))
}
// process measurement post message from NFs // process measurement post message from NFs
func PostMeasurementFromNF(w http.ResponseWriter, r *http.Request) { func PostMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
log.Debug("PostMeasurementFromNF processing... ") log.Debug("PostMeasurementFromNF processing... ")
@@ -983,11 +1398,12 @@ func PostMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
return return
} }
//log.Debug("Request body:", string(body)) //log.Debug("Request body:", string(body))
// measurement := new(dborm.NorthboundPm)
measurement := new(dborm.NorthboundPm) measurement := new(dborm.NorthboundPm)
_ = json.Unmarshal(body, &measurement) _ = json.Unmarshal(body, &measurement)
//log.Debug("measurement:", measurement)
//neInfo := new(dborm.NeInfo) // Merge duplicate ObjectTypes before processing
mergeDuplicateObjectTypes(measurement)
neInfo, err := dborm.XormGetNeInfoByRmUID(measurement.NeType, measurement.RmUID) neInfo, err := dborm.XormGetNeInfoByRmUID(measurement.NeType, measurement.RmUID)
if err != nil { if err != nil {
log.Error("dborm.XormGetNeInfo is failed:", err) log.Error("dborm.XormGetNeInfo is failed:", err)
@@ -1002,13 +1418,28 @@ func PostMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
measurement.NeName = neInfo.NeName measurement.NeName = neInfo.NeName
measurement.Dn = neInfo.Dn measurement.Dn = neInfo.Dn
session := dborm.DbClient.XEngine.NewSession() // 加载schema数据并进行合并
if config.GetNbiPmConfig().MergeMode != MergeModeNone {
log.Debugf("Loading schema for neType: %s (mode: %s)", measurement.NeType, config.GetNbiPmConfig().MergeMode)
schema, err := loadSchemaData(measurement.NeType)
if err != nil {
log.Warnf("Failed to load schema for %s: %v", measurement.NeType, err)
} else if schema != nil {
log.Debugf("Successfully loaded schema for %s, processing with mode: %s", measurement.NeType, config.GetNbiPmConfig().MergeMode)
mergeWithSchema(measurement, schema)
log.Debug("Data processing completed")
} else {
log.Debugf("No schema file found for %s, using original data", measurement.NeType)
}
}
session := xEngine.NewSession()
defer session.Close() defer session.Close()
// layout := global.DateTime
layout := time.RFC3339 layout := time.RFC3339
measurement.Date = GetDateFromTimeString(layout, measurement.StartTime) measurement.Date = GetDateFromTimeString(layout, measurement.StartTime)
measurement.StartTime = GetDateTimeFromTimeString(layout, measurement.StartTime) measurement.StartTime = GetDateTimeFromTimeString(layout, measurement.StartTime)
affected, err := session.Table("nbi_pm").Insert(measurement) affected, err := session.Table("nbi_pm").Insert(measurement)
if err != nil && affected <= 0 { if err != nil && affected <= 0 {
log.Error("Failed to insert nbi_pm:", err) log.Error("Failed to insert nbi_pm:", err)
@@ -1016,6 +1447,12 @@ func PostMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
return return
} }
// 推送到redis队列
err = redisqueue.AddNbiPMQueue(strconv.Itoa(measurement.Id))
if err != nil {
log.Warn("Failed to AddNbiPMQueue:", err)
}
services.ResponseStatusOK204NoContent(w) services.ResponseStatusOK204NoContent(w)
} }
@@ -1023,12 +1460,6 @@ func PostMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) { func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
log.Debug("GetMeasurementFromNF processing... ") log.Debug("GetMeasurementFromNF processing... ")
// _, err := services.CheckFrontValidRequest(w, r)
// if err != nil {
// log.Error("Request error:", err)
// return
// }
vars := mux.Vars(r) vars := mux.Vars(r)
apiVer := vars["apiVersion"] apiVer := vars["apiVersion"]
if apiVer != global.ApiVersionV1 { if apiVer != global.ApiVersionV1 {
@@ -1052,9 +1483,7 @@ func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
} }
log.Debugf("neType: %s neId:%s", neType, neIds) log.Debugf("neType: %s neId:%s", neType, neIds)
//var neInfo *dborm.NeInfo
neInfo := new(dborm.NeInfo) neInfo := new(dborm.NeInfo)
neInfo, err := dborm.XormGetNeInfo(neType, neIds[0]) neInfo, err := dborm.XormGetNeInfo(neType, neIds[0])
if err != nil { if err != nil {
log.Error("dborm.XormGetNeInfo is failed:", err) log.Error("dborm.XormGetNeInfo is failed:", err)
@@ -1081,10 +1510,26 @@ func GetMeasurementFromNF(w http.ResponseWriter, r *http.Request) {
switch response.StatusCode() { switch response.StatusCode() {
case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted: case http.StatusOK, http.StatusCreated, http.StatusNoContent, http.StatusAccepted:
log.Debug("response:", response) log.Debug("response:", response)
// measurement := new(dborm.NorthboundPm)
measurement := new(dborm.NorthboundPm) measurement := new(dborm.NorthboundPm)
_ = json.Unmarshal(response.Body(), &measurement) _ = json.Unmarshal(response.Body(), &measurement)
log.Debug("measurement:", measurement)
// Merge duplicate ObjectTypes before processing
mergeDuplicateObjectTypes(measurement)
// Load schema and merge if needed
if config.GetNbiPmConfig().MergeMode != MergeModeNone {
log.Debugf("Loading schema for neType: %s (mode: %s)", measurement.NeType, config.GetNbiPmConfig().MergeMode)
schema, err := loadSchemaData(measurement.NeType)
if err != nil {
log.Warnf("Failed to load schema for %s: %v", measurement.NeType, err)
} else if schema != nil {
log.Debugf("Successfully loaded schema for %s, processing with mode: %s", measurement.NeType, config.GetNbiPmConfig().MergeMode)
mergeWithSchema(measurement, schema)
log.Debug("Data processing completed")
} else {
log.Debugf("No schema file found for %s, using original data", measurement.NeType)
}
}
session := dborm.DbClient.XEngine.NewSession() session := dborm.DbClient.XEngine.NewSession()
defer session.Close() defer session.Close()

8
lib/config/alarm_relation_rules.go
View File

@@ -29,3 +29,11 @@ func LoadAlarmRelationRules(path string) error {
} }
return yaml.Unmarshal(data, &RelationRules) return yaml.Unmarshal(data, &RelationRules)
} }
func LoadNbiRelationRulesConfig(path string) error {
data, err := os.ReadFile(path)
if err != nil {
return err
}
return yaml.Unmarshal(data, &RelationRules)
}

23
lib/config/config.go
View File

@@ -126,6 +126,8 @@ type YamlConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
File string `yaml:"file"` File string `yaml:"file"`
} `yaml:"testConfig"` } `yaml:"testConfig"`
NbiConfig NbiConfig `yaml:"nbiConfig"`
} }
type RestParam struct { type RestParam struct {
@@ -187,6 +189,18 @@ type AlarmConfig struct {
} `yaml:"relatedRules"` } `yaml:"relatedRules"`
} }
type NbiConfig struct {
Enabled bool `yaml:"enabled"`
PmConfig struct {
Enabled bool `yaml:"enabled"`
File string `yaml:"file"`
} `yaml:"pmConfig"`
RelationRules struct {
Enabled bool `yaml:"enabled"`
File string `yaml:"file"`
} `yaml:"relationRules"`
}
type MMLParam struct { type MMLParam struct {
Sleep int64 `yaml:"sleep"` Sleep int64 `yaml:"sleep"`
DeadLine int64 `yaml:"deadLine"` DeadLine int64 `yaml:"deadLine"`
@@ -280,6 +294,15 @@ func ReadConfig(configFile string) {
if yamlConfig.Alarm.RelatedRules.Enabled { if yamlConfig.Alarm.RelatedRules.Enabled {
LoadAlarmRelationRules(yamlConfig.Alarm.RelatedRules.File) LoadAlarmRelationRules(yamlConfig.Alarm.RelatedRules.File)
} }
if yamlConfig.NbiConfig.Enabled {
if yamlConfig.NbiConfig.PmConfig.Enabled {
LoadNbiPmConfig(yamlConfig.NbiConfig.PmConfig.File)
}
if yamlConfig.NbiConfig.RelationRules.Enabled {
LoadNbiRelationRulesConfig(yamlConfig.NbiConfig.RelationRules.File)
}
}
} }
func ReadOriginalConfig(configFile string) { func ReadOriginalConfig(configFile string) {

28
lib/config/nbi_pm_config.go Normal file
View File

@@ -0,0 +1,28 @@
package config
import (
"os"
"gopkg.in/yaml.v2"
)
type NbiPmConfig struct {
SchemaPath string `yaml:"schemaPath"`
RandomMin int `yaml:"randomMin"`
RandomMax int `yaml:"randomMax"`
MergeMode string `yaml:"mergeMode"` // MergeModeNone/MergeModeMerge/MergeModeSchema
}
var nbiPmConfig NbiPmConfig
func GetNbiPmConfig() NbiPmConfig {
return nbiPmConfig
}
func LoadNbiPmConfig(path string) error {
data, err := os.ReadFile(path)
if err != nil {
return err
}
return yaml.Unmarshal(data, &nbiPmConfig)
}

4
restagent/etc/nbi_pm.yaml Normal file
View File

@@ -0,0 +1,4 @@
schemaPath: ./etc/schema
randomMin: 1
randomMax: 100
mergeMode: merge # none: Merge Mode None/merge: Merge Mode Merge/schema: Merge Mode Schema

15
restagent/etc/restconf.yaml
View File

@@ -159,11 +159,6 @@ alarm:
signName: xxx SMSC signName: xxx SMSC
templateCode: 1000 templateCode: 1000
smProxy: smsc smProxy: smsc
# alarm_relation_rules.yaml
relationRules:
enabled: true
file: ./etc/alarm_relation_rules.yaml
# User authorized information # User authorized information
# crypt: mysql/md5/bcrypt # crypt: mysql/md5/bcrypt
@@ -208,3 +203,13 @@ staticFile:
upload: upload:
prefix: "/upload" prefix: "/upload"
dir: "./upload" dir: "./upload"
nbiConfig:
enabled: true
pmConfig:
enabled: true
file: ./etc/nbi_pm.yaml
# alarm_relation_rules.yaml
relationRules:
enabled: true
file: ./etc/alarm_relation_rules.yaml

1278
restagent/etc/schema/amf-nbi-pm-schema.json Normal file
View File

File diff suppressed because it is too large Load Diff

269
restagent/etc/schema/pcf-nbi-pm-schema.json Normal file
View File

@@ -0,0 +1,269 @@
[
{
"ObjectType": "PcfFunction",
"KPIs": [
{
"KPIID": "PCF.AmAssocNbrMean",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "PCF.AmAssocNbrMax",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.SmAssocNbrMean",
"KPIValues": [
{
"Name": "Total",
"Value": 7
}
]
},
{
"KPIID": "PCF.SmAssocNbrMax",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicyAmAssocCreateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "PCF.PolicyAmAssocCreateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.PolicyAmAssocUpdateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 7
}
]
},
{
"KPIID": "PCF.PolicyAmAssocUpdateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "PCF.PolicyAmAssocNotifReq",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "PCF.PolicyAmAssocNotifSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 12
}
]
},
{
"KPIID": "PCF.PolicyAmAssocDeleteReq",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicyAmAssocDeleteSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateFail",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "PCF.PolicySmAssocCreateFail._Cause",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateFail",
"KPIValues": [
{
"Name": "Total",
"Value": 9
}
]
},
{
"KPIID": "PCF.PolicySmAssocUpdateFail._Cause",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifReq",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifFail",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "PCF.PolicySmAssocNotifFail._Cause",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "PCF.PolicySmAssocDeleteReq",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "PCF.PolicySmAssocDeleteSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
}
]
},
{
"ObjectType": "UdrFunction",
"KPIs": [
{
"KPIID": "UDR.PcfSubNbr",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
}
]
},
{
"ObjectType": "ManagedElement",
"KPIs": [
{
"KPIID": "ME.MeanMeLoad",
"KPIValues": [
{
"Name": "Total",
"Value": 13
}
]
}
]
}
]

1287
restagent/etc/schema/smf-nbi-pm-schema.json Normal file
View File

File diff suppressed because it is too large Load Diff

373
restagent/etc/schema/udm-nbi-pm-schema.json Normal file
View File

@@ -0,0 +1,373 @@
[
{
"ObjectType": "UdmFunction",
"KPIs": [
{
"KPIID": "UDM.AmfUecmRegReq",
"KPIValues": [
{
"Name": "Total",
"Value": 15
}
]
},
{
"KPIID": "UDM.AmfUecmRegSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.AmfUecmRegUpdateReq",
"KPIValues": [
{
"Name": "Total",
"Value": 9
}
]
},
{
"KPIID": "UDM.AmfUecmRegUpdateSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 9
}
]
},
{
"KPIID": "UDM.AmfUecmDeregReq",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.AmfUecmDeregSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 15
}
]
},
{
"KPIID": "UDM.SmfUecmRegReq",
"KPIValues": [
{
"Name": "Total",
"Value": 1
}
]
},
{
"KPIID": "UDM.SmfUecmRegSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.SmfUecmDeregReq",
"KPIValues": [
{
"Name": "Total",
"Value": 5
}
]
},
{
"KPIID": "UDM.SmfUecmDeregSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "UDM.SdmGetReq",
"KPIValues": [
{
"Name": "Total",
"Value": 16
}
]
},
{
"KPIID": "UDM.SdmGetSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDM.SdmNotif",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "UDM.SdmSubscrReq",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.SdmSubscrSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
},
{
"KPIID": "UDM.SdmUnSubscrReq",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "UDM.SdmUnSubscrSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDM.UecmDeregNotif",
"KPIValues": [
{
"Name": "Total",
"Value": 8
}
]
},
{
"KPIID": "UDM.SdmGetUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 7
}
]
},
{
"KPIID": "UDM.SdmGetDataNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 5
}
]
},
{
"KPIID": "UDM.AmfUecmRegUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDM.AmfUecmRegUnknownSub",
"KPIValues": [
{
"Name": "Total",
"Value": 2
}
]
},
{
"KPIID": "UDM.AmfUecmRegNoPsSub",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.AmfUecmRegRoamNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "UDM.AmfUecmRegRatNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.AmfUecmRegContextNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 3
}
]
},
{
"KPIID": "UDM.AmfUecmRegReAuth",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "UDM.SmfUecmRegUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 15
}
]
},
{
"KPIID": "UDM.SmfUecmRegUnknownSub",
"KPIValues": [
{
"Name": "Total",
"Value": 13
}
]
},
{
"KPIID": "UDM.SmfUecmRegRoamNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
},
{
"KPIID": "UDM.SmfUecmRegDnnNotAllowed",
"KPIValues": [
{
"Name": "Total",
"Value": 6
}
]
}
]
},
{
"ObjectType": "UdrFunction",
"KPIs": [
{
"KPIID": "UDR.5gSupi",
"KPIValues": [
{
"Name": "Total",
"Value": 10
}
]
},
{
"KPIID": "UDR.5gSub",
"KPIValues": [
{
"Name": "Total",
"Value": 14
}
]
},
{
"KPIID": "UDR.5gActSub",
"KPIValues": [
{
"Name": "Total",
"Value": 16
}
]
}
]
},
{
"ObjectType": "AusfFunction",
"KPIs": [
{
"KPIID": "Ausf.UeAuthReq",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "Ausf.UeAuthAnsSucc",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
},
{
"KPIID": "Ausf.UeAuthAnsUserNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 4
}
]
},
{
"KPIID": "Ausf.UeAuthAnsContextNotFound",
"KPIValues": [
{
"Name": "Total",
"Value": 0
}
]
}
]
},
{
"ObjectType": "ManagedElement",
"KPIs": [
{
"KPIID": "ME.MeanMeLoad",
"KPIValues": [
{
"Name": "Total",
"Value": 11
}
]
}
]
}
]

1257
restagent/etc/schema/upf-nbi-pm-schema.json Normal file
View File

File diff suppressed because it is too large Load Diff