Change in osmo-bsc[master]: add stat items bsc.0.num_msc:connected, .num_msc:total

[neels]

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/25226 )


Change subject: add stat items bsc.0.num_msc:connected, .num_msc:total
......................................................................

add stat items bsc.0.num_msc:connected, .num_msc:total

We already have MSC connection stat items, but for hysterical raisins
there are separate such stats for each MSC. Hence we have N connection
counters, each being either 0 or 1, for a single MSC.

Add a new stat counting the *overall* MSCs that are connected,
and one indicating the total number of configured MSCs.

Related: SYS#5542
Related: I178dcf4516606aa561d47b06061b8a416d3c40cf (osmo-ttcn3-hacks)
Change-Id: If76bbf9b3adb64c68d5c31c6b526fa71a99996ae
---
M include/osmocom/bsc/gsm_data.h
M src/osmo-bsc/a_reset.c
M src/osmo-bsc/bsc_init.c
3 files changed, 7 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/26/25226/1

diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index d6c06de..3b9d489 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1260,6 +1260,8 @@
 /* Constants for the BSC stats */
 enum {
 	BSC_STAT_NUM_BTS_TOTAL,
+	BSC_STAT_NUM_MSC_CONNECTED,
+	BSC_STAT_NUM_MSC_TOTAL,
 };
 
 /* BTS counter index if a BTS could not be found
diff --git a/src/osmo-bsc/a_reset.c b/src/osmo-bsc/a_reset.c
index 0befd72..d0ca3d1 100644
--- a/src/osmo-bsc/a_reset.c
+++ b/src/osmo-bsc/a_reset.c
@@ -43,6 +43,7 @@
 	struct bsc_msc_data *msc = data;
 	LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP assocation is up\n", msc->nr);
 	osmo_stat_item_inc(osmo_stat_item_group_get_item(msc->msc_statg, MSC_STAT_MSC_LINKS_ACTIVE), 1);
+	osmo_stat_item_inc(osmo_stat_item_group_get_item(msc->network->bsc_statg, BSC_STAT_NUM_MSC_CONNECTED), 1);
 	osmo_signal_dispatch(SS_MSC, S_MSC_CONNECTED, msc);
 }
 
@@ -51,6 +52,7 @@
 	struct bsc_msc_data *msc = data;
 	LOGP(DMSC, LOGL_NOTICE, "(msc%d) BSSMAP assocation is down\n", msc->nr);
 	osmo_stat_item_dec(osmo_stat_item_group_get_item(msc->msc_statg, MSC_STAT_MSC_LINKS_ACTIVE), 1);
+	osmo_stat_item_dec(osmo_stat_item_group_get_item(msc->network->bsc_statg, BSC_STAT_NUM_MSC_CONNECTED), 1);
 	osmo_signal_dispatch(SS_MSC, S_MSC_LOST, msc);
 	osmo_bsc_sigtran_reset(msc);
 }
@@ -76,6 +78,7 @@
 	}
 
 	msc->a.bssmap_reset = bssmap_reset_alloc(msc, name, &cfg);
+	osmo_stat_item_inc(osmo_stat_item_group_get_item(msc->network->bsc_statg, BSC_STAT_NUM_MSC_TOTAL), 1);
 }
 
 /* Confirm that we successfully received a reset acknowledge message */
diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c
index 42acbbc..bd1724f 100644
--- a/src/osmo-bsc/bsc_init.c
+++ b/src/osmo-bsc/bsc_init.c
@@ -48,6 +48,8 @@
 
 static const struct osmo_stat_item_desc bsc_stat_desc[] = {
 	[BSC_STAT_NUM_BTS_TOTAL] = { "num_bts:total", "Number of configured BTS for this BSC", "", 16, 0 },
+	[BSC_STAT_NUM_MSC_CONNECTED] = { "num_msc:connected", "Number of actively connected MSCs", "", 16, 0 },
+	[BSC_STAT_NUM_MSC_TOTAL] = { "num_msc:total", "Number of configured MSCs, not necessarily connected", "", 1, 0 },
 };
 
 static const struct osmo_stat_item_group_desc bsc_statg_desc = {

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/25226
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: If76bbf9b3adb64c68d5c31c6b526fa71a99996ae
Gerrit-Change-Number: 25226
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210823/fe541d0b/attachment.htm>