sysmocom
/
open5gs
forked from acouzens/open5gs
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[AMF] Expose more metrics 

[ETSI TS 128 552 V16.9.0](https://www.etsi.org/deliver/etsi_ts/128500_128599/128552/16.09.00_60/ts_128552v160900p.pdf)

5.2.2 Registration procedure related measurements

SNSSAI labels are not provided.

- Number of registration requests received by the AMF is
exposed for each registration type.
```
fivegs_amffunction_rm_reginitreq 1
fivegs_amffunction_rm_regmobreq 0
fivegs_amffunction_rm_regperiodreq 0
fivegs_amffunction_rm_regemergreq 0
```

- Number of successful initial registrations at the AMF is
exposed for each registration type.
```
fivegs_amffunction_rm_reginitsucc 1
fivegs_amffunction_rm_regmobsucc 0
fivegs_amffunction_rm_regperiodsucc 0
fivegs_amffunction_rm_regemergsucc 0
```

- The existing counter of failed registrations at the AMF
is exposed separately for each registration type.
```
fivegs_amffunction_rm_reginitfail
fivegs_amffunction_rm_regmobfail
fivegs_amffunction_rm_regperiodfail
fivegs_amffunction_rm_regemergfail
```

5.2.5.2 Measurements for 5G paging

Number of 5G paging procedures initiated at the AMF:
```
fivegs_amffunction_mm_paging5greq 1
```
Number of successful 5G paging procedures initiated at the AMF:
```
fivegs_amffunction_mm_paging5gsucc 1
```

5.2.11 Authentication procedure related measurements

Number of authentication requests:
```
fivegs_amffunction_amf_authreq 2
```
Number of authentication rejections:
```
fivegs_amffunction_amf_authreject 1
```
Number of failed authentications due to parameter error:
```
fivegs_amffunction_amf_authfail{cause="21"} 1
```

5.2.8 UE Configuration Update procedure related measurements

Number of UE Configuration Update commands requested by the AMF:
```
fivegs_amffunction_mm_confupdate 2
```
Number of UE Configuration Update complete messages received by the AMF:
```
fivegs_amffunction_mm_confupdatesucc 1
```
This commit is contained in:
Gaber Stare 2023-02-06 07:46:28 +00:00 committed by Sukchan Lee
parent e41afff7ac
commit e6ba84bbef
6 changed files with 182 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/amf/gmm-handler.c
View File

@ -522,6 +522,9 @@ ogs_nas_5gmm_cause_t gmm_handle_service_request(amf_ue_t *amf_ue,
ngksi = &service_request->ngksi;
ogs_assert(ngksi);
if (ngksi->type == OGS_NAS_SERVICE_TYPE_MOBILE_TERMINATED_SERVICES)
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_MM_PAGING_5G_SUCC);
/*
* TS24.501
* Ch 4.4.6 Protection of initial NAS signalling messages

44
src/amf/gmm-sm.c
View File

@ -463,7 +463,7 @@ void gmm_state_registered(ogs_fsm_t *s, amf_event_t *e)
for (i = 0; i < amf_ue->num_of_slice; i++) {
amf_metrics_inst_by_slice_add(&amf_ue->nr_tai.plmn_id,
&amf_ue->slice[i].s_nssai,
AMF_METR_GAUGE_RM_REGISTEREDSUBNBR, 1);
AMF_METR_GAUGE_RM_REGISTERED_SUB_NBR, 1);
}
break;
case OGS_FSM_EXIT_SIG:
@ -471,7 +471,7 @@ void gmm_state_registered(ogs_fsm_t *s, amf_event_t *e)
for (i = 0; i < amf_ue->num_of_slice; i++) {
amf_metrics_inst_by_slice_add(&amf_ue->nr_tai.plmn_id,
&amf_ue->slice[i].s_nssai,
AMF_METR_GAUGE_RM_REGISTEREDSUBNBR, -1);
AMF_METR_GAUGE_RM_REGISTERED_SUB_NBR, -1);
}
break;
@ -986,6 +986,24 @@ static void common_register_state(ogs_fsm_t *s, amf_event_t *e,
gmm_cause = gmm_handle_registration_request(
amf_ue, h, e->ngap.code,
&nas_message->gmm.registration_request);
switch (amf_ue->nas.registration.value) {
case OGS_NAS_5GS_REGISTRATION_TYPE_INITIAL:
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_RM_REG_INIT_REQ);
break;
case OGS_NAS_5GS_REGISTRATION_TYPE_MOBILITY_UPDATING:
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_RM_REG_MOB_REQ);
break;
case OGS_NAS_5GS_REGISTRATION_TYPE_PERIODIC_UPDATING:
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_RM_REG_PERIOD_REQ);
break;
case OGS_NAS_5GS_REGISTRATION_TYPE_EMERGENCY:
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_RM_REG_EMERG_REQ);
break;
default:
ogs_error("Unknown reg_type[%d]", amf_ue->nas.registration.value);
}
if (gmm_cause != OGS_5GMM_CAUSE_REQUEST_ACCEPTED) {
ogs_error("gmm_handle_registration_request() failed [%d]",
gmm_cause);
@ -1195,6 +1213,8 @@ static void common_register_state(ogs_fsm_t *s, amf_event_t *e,
case OGS_NAS_5GS_CONFIGURATION_UPDATE_COMPLETE:
ogs_debug("[%s] Configuration update complete", amf_ue->supi);
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_MM_CONF_UPDATE_SUCC);
/*
* TS24.501
* 5.3.3 Temporary identities
@ -1317,6 +1337,9 @@ void gmm_state_authentication(ogs_fsm_t *s, amf_event_t *e)
ogs_debug("[%s] Authentication failure [%d]", amf_ue->suci,
authentication_failure->gmm_cause);
amf_metrics_inst_by_cause_add(authentication_failure->gmm_cause,
AMF_METR_CTR_AMF_AUTH_FAIL, 1);
CLEAR_AMF_UE_TIMER(amf_ue->t3560);
switch (authentication_failure->gmm_cause) {
@ -1951,6 +1974,23 @@ void gmm_state_initial_context_setup(ogs_fsm_t *s, amf_event_t *e)
ogs_expect(r == OGS_OK);
ogs_assert(r != OGS_ERROR);
switch (amf_ue->nas.registration.value) {
case OGS_NAS_5GS_REGISTRATION_TYPE_INITIAL:
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_RM_REG_INIT_SUCC);
break;
case OGS_NAS_5GS_REGISTRATION_TYPE_MOBILITY_UPDATING:
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_RM_REG_MOB_SUCC);
break;
case OGS_NAS_5GS_REGISTRATION_TYPE_PERIODIC_UPDATING:
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_RM_REG_PERIOD_SUCC);
break;
case OGS_NAS_5GS_REGISTRATION_TYPE_EMERGENCY:
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_RM_REG_EMERG_SUCC);
break;
default:
ogs_error("Unknown reg_type[%d]",
amf_ue->nas.registration.value);
}
OGS_FSM_TRAN(s, &gmm_state_registered);
break;

90
src/amf/metrics.c
View File

@ -65,6 +65,76 @@ amf_metrics_spec_def_t amf_metrics_spec_def_global[_AMF_METR_GLOB_MAX] = {
.description = "gNodeBs",
},
/* Global Counters: */
[AMF_METR_GLOB_CTR_RM_REG_INIT_REQ] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_rm_reginitreq",
.description = "Number of initial registration requests received by the AMF",
},
[AMF_METR_GLOB_CTR_RM_REG_INIT_SUCC] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_rm_reginitsucc",
.description = "Number of successful initial registrations at the AMF",
},
[AMF_METR_GLOB_CTR_RM_REG_MOB_REQ] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_rm_regmobreq",
.description = "Number of mobility registration update requests received by the AMF",
},
[AMF_METR_GLOB_CTR_RM_REG_MOB_SUCC] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_rm_regmobsucc",
.description = "Number of successful mobility registration updates at the AMF",
},
[AMF_METR_GLOB_CTR_RM_REG_PERIOD_REQ] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_rm_regperiodreq",
.description = "Number of periodic registration update requests received by the AMF",
},
[AMF_METR_GLOB_CTR_RM_REG_PERIOD_SUCC] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_rm_regperiodsucc",
.description = "Number of successful periodic registration update requests at the AMF",
},
[AMF_METR_GLOB_CTR_RM_REG_EMERG_REQ] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_rm_regemergreq",
.description = "Number of emergency registration requests received by the AMF",
},
[AMF_METR_GLOB_CTR_RM_REG_EMERG_SUCC] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_rm_regemergsucc",
.description = "Number of successful emergency registrations at the AMF",
},
[AMF_METR_GLOB_CTR_MM_PAGING_5G_REQ] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_mm_paging5greq",
.description = "Number of 5G paging procedures initiated at the AMF",
},
[AMF_METR_GLOB_CTR_MM_PAGING_5G_SUCC] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_mm_paging5gsucc",
.description = "Number of successful 5G paging procedures initiated at the AMF",
},
[AMF_METR_GLOB_CTR_AMF_AUTH_REQ] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_amf_authreq",
.description = "Number of authentication requests sent by the AMF",
},
[AMF_METR_GLOB_CTR_AMF_AUTH_REJECT] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_amf_authreject",
.description = "Number of authentication rejections sent by the AMF",
},
[AMF_METR_GLOB_CTR_MM_CONF_UPDATE] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_mm_confupdate",
.description = "Number of UE Configuration Update commands requested by the AMF",
},
[AMF_METR_GLOB_CTR_MM_CONF_UPDATE_SUCC] = {
.type = OGS_METRICS_METRIC_TYPE_COUNTER,
.name = "fivegs_amffunction_mm_confupdatesucc",
.description = "Number of UE Configuration Update complete messages received by the AMF",
},
};
int amf_metrics_init_inst_global(void)
{
@ -95,7 +165,7 @@ ogs_hash_t *metrics_hash_by_slice = NULL; /* hash table for SLICE labels */
amf_metrics_spec_def_t amf_metrics_spec_def_by_slice[_AMF_METR_BY_SLICE_MAX] = {
/* Gauges: */
AMF_METR_BY_SLICE_GAUGE_ENTRY(
AMF_METR_GAUGE_RM_REGISTEREDSUBNBR,
AMF_METR_GAUGE_RM_REGISTERED_SUB_NBR,
"fivegs_amffunction_rm_registeredsubnbr",
"Number of registered state subscribers per AMF")
};
@ -192,9 +262,25 @@ ogs_hash_t *metrics_hash_by_cause = NULL; /* hash table for CAUSE labels */
amf_metrics_spec_def_t amf_metrics_spec_def_by_cause[_AMF_METR_BY_CAUSE_MAX] = {
/* Counters: */
AMF_METR_BY_CAUSE_CTR_ENTRY(
AMF_METR_CTR_RM_REG_INITFAIL,
AMF_METR_CTR_RM_REG_INIT_FAIL,
"fivegs_amffunction_rm_reginitfail",
"Number of failed initial registrations at the AMF")
AMF_METR_BY_CAUSE_CTR_ENTRY(
AMF_METR_CTR_RM_REG_MOB_FAIL,
"fivegs_amffunction_rm_regmobfail",
"Number of failed mobility registration updates at the AMF")
AMF_METR_BY_CAUSE_CTR_ENTRY(
AMF_METR_CTR_RM_REG_PERIOD_FAIL,
"fivegs_amffunction_rm_regperiodfail",
"Number of failed periodic registration update requests at the AMF")
AMF_METR_BY_CAUSE_CTR_ENTRY(
AMF_METR_CTR_RM_REG_EMERG_FAIL,
"fivegs_amffunction_rm_regemergfail",
"Number of failed emergency registrations at the AMF")
AMF_METR_BY_CAUSE_CTR_ENTRY(
AMF_METR_CTR_AMF_AUTH_FAIL,
"fivegs_amffunction_amf_authfail",
"Number of authentication failure messages received by the AMF")
};
void amf_metrics_init_by_cause(void);
int amf_metrics_free_inst_by_cause(ogs_metrics_inst_t **inst);

22
src/amf/metrics.h
View File

@ -11,6 +11,20 @@ typedef enum amf_metric_type_global_s {
AMF_METR_GLOB_GAUGE_RAN_UE,
AMF_METR_GLOB_GAUGE_AMF_SESS,
AMF_METR_GLOB_GAUGE_GNB,
AMF_METR_GLOB_CTR_RM_REG_INIT_REQ,
AMF_METR_GLOB_CTR_RM_REG_INIT_SUCC,
AMF_METR_GLOB_CTR_RM_REG_MOB_REQ,
AMF_METR_GLOB_CTR_RM_REG_MOB_SUCC,
AMF_METR_GLOB_CTR_RM_REG_PERIOD_REQ,
AMF_METR_GLOB_CTR_RM_REG_PERIOD_SUCC,
AMF_METR_GLOB_CTR_RM_REG_EMERG_REQ,
AMF_METR_GLOB_CTR_RM_REG_EMERG_SUCC,
AMF_METR_GLOB_CTR_MM_PAGING_5G_REQ,
AMF_METR_GLOB_CTR_MM_PAGING_5G_SUCC,
AMF_METR_GLOB_CTR_AMF_AUTH_REQ,
AMF_METR_GLOB_CTR_AMF_AUTH_REJECT,
AMF_METR_GLOB_CTR_MM_CONF_UPDATE,
AMF_METR_GLOB_CTR_MM_CONF_UPDATE_SUCC,
_AMF_METR_GLOB_MAX,
} amf_metric_type_global_t;
extern ogs_metrics_inst_t *amf_metrics_inst_global[_AMF_METR_GLOB_MAX];
@ -29,7 +43,7 @@ static inline void amf_metrics_inst_global_dec(amf_metric_type_global_t t)
/* BY SLICE */
typedef enum amf_metric_type_by_slice_s {
AMF_METR_GAUGE_RM_REGISTEREDSUBNBR = 0,
AMF_METR_GAUGE_RM_REGISTERED_SUB_NBR = 0,
_AMF_METR_BY_SLICE_MAX,
} amf_metric_type_by_slice_t;
@ -39,7 +53,11 @@ void amf_metrics_inst_by_slice_add(
/* BY CAUSE */
typedef enum amf_metric_type_by_cause_s {
AMF_METR_CTR_RM_REG_INITFAIL = 0,
AMF_METR_CTR_RM_REG_INIT_FAIL = 0,
AMF_METR_CTR_RM_REG_MOB_FAIL,
AMF_METR_CTR_RM_REG_PERIOD_FAIL,
AMF_METR_CTR_RM_REG_EMERG_FAIL,
AMF_METR_CTR_AMF_AUTH_FAIL,
_AMF_METR_BY_CAUSE_MAX,
} amf_metric_type_by_cause_t;

30
src/amf/nas-path.c
View File

@ -194,7 +194,27 @@ int nas_5gs_send_registration_reject(
return OGS_NOTFOUND;
}
amf_metrics_inst_by_cause_add(gmm_cause, AMF_METR_CTR_RM_REG_INITFAIL, 1);
switch (amf_ue->nas.registration.value) {
case OGS_NAS_5GS_REGISTRATION_TYPE_INITIAL:
amf_metrics_inst_by_cause_add(gmm_cause,
AMF_METR_CTR_RM_REG_INIT_FAIL, 1);
break;
case OGS_NAS_5GS_REGISTRATION_TYPE_MOBILITY_UPDATING:
amf_metrics_inst_by_cause_add(gmm_cause,
AMF_METR_CTR_RM_REG_MOB_FAIL, 1);
break;
case OGS_NAS_5GS_REGISTRATION_TYPE_PERIODIC_UPDATING:
amf_metrics_inst_by_cause_add(gmm_cause,
AMF_METR_CTR_RM_REG_PERIOD_FAIL, 1);
break;
case OGS_NAS_5GS_REGISTRATION_TYPE_EMERGENCY:
amf_metrics_inst_by_cause_add(gmm_cause,
AMF_METR_CTR_RM_REG_EMERG_FAIL, 1);
break;
default:
ogs_error("Unknown reg_type[%d]",
amf_ue->nas.registration.value);
}
ogs_warn("[%s] Registration reject [%d]", amf_ue->suci, gmm_cause);
@ -492,6 +512,8 @@ int nas_5gs_send_authentication_request(amf_ue_t *amf_ue)
ogs_timer_start(amf_ue->t3560.timer,
amf_timer_cfg(AMF_TIMER_T3560)->duration);
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_AMF_AUTH_REQ);
rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
ogs_expect(rv == OGS_OK);
@ -513,8 +535,6 @@ int nas_5gs_send_authentication_reject(amf_ue_t *amf_ue)
return OGS_NOTFOUND;
}
amf_metrics_inst_by_cause_add(0, AMF_METR_CTR_RM_REG_INITFAIL, 1);
ogs_warn("[%s] Authentication reject", amf_ue->suci);
gmmbuf = gmm_build_authentication_reject();
@ -523,6 +543,8 @@ int nas_5gs_send_authentication_reject(amf_ue_t *amf_ue)
return OGS_ERROR;
}
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_AMF_AUTH_REJECT);
rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
ogs_expect(rv == OGS_OK);
@ -624,6 +646,8 @@ int nas_5gs_send_configuration_update_command(
}
}
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_MM_CONF_UPDATE);
rv = nas_5gs_send_to_downlink_nas_transport(amf_ue, gmmbuf);
ogs_expect(rv == OGS_OK);

2
src/amf/ngap-path.c
View File

@ -449,6 +449,8 @@ int ngap_send_paging(amf_ue_t *amf_ue)
return OGS_ERROR;
}
amf_metrics_inst_global_inc(AMF_METR_GLOB_CTR_MM_PAGING_5G_REQ);
rv = ngap_send_to_gnb(gnb, ngapbuf, NGAP_NON_UE_SIGNALLING);
if (rv != OGS_OK) {
ogs_error("ngap_send_to_gnb() failed");