<p>ipse has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18093">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stats: Export connected OML/RSL links count per BTS and BSC.<br><br>Change-Id: I88c8025940a0eecb034b1c70f76ea17937fa0325<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/bsc_init.c<br>M src/osmo-bsc/bts_ipaccess_nanobts.c<br>M src/osmo-bsc/gsm_data.c<br>4 files changed, 16 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/93/18093/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index e85796c..9a8e002 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1464,6 +1464,8 @@</span><br><span>     BTS_STAT_T3122,</span><br><span>      BTS_STAT_RACH_BUSY,</span><br><span>  BTS_STAT_RACH_ACCESS,</span><br><span style="color: hsl(120, 100%, 40%);">+ BTS_STAT_NUM_OML_CONNECTED,</span><br><span style="color: hsl(120, 100%, 40%);">+   BTS_STAT_NUM_RSL_CONNECTED,</span><br><span> };</span><br><span> </span><br><span> enum {</span><br><span>@@ -1556,6 +1558,8 @@</span><br><span> </span><br><span> enum {</span><br><span>        BSC_STAT_MSC_LINK,</span><br><span style="color: hsl(120, 100%, 40%);">+    BSC_STAT_NUM_BTS_CONNECTED,</span><br><span style="color: hsl(120, 100%, 40%);">+   BSC_STAT_NUM_TRX_CONNECTED,</span><br><span> };</span><br><span> </span><br><span> struct gsm_tz {</span><br><span>diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c</span><br><span>index 9d0ee86..0d58296 100644</span><br><span>--- a/src/osmo-bsc/bsc_init.c</span><br><span>+++ b/src/osmo-bsc/bsc_init.c</span><br><span>@@ -46,6 +46,8 @@</span><br><span> </span><br><span> static const struct osmo_stat_item_desc bsc_stat_desc[] = {</span><br><span>     { "msc_link", "MSC link status.", "", 16, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+  { "num_bts_connected", "Number of currently connected BTS (OML links).", "", 16, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+   { "num_trx_connected", "Number of currently connected TRX (RSL links).", "", 16, 0 },</span><br><span> };</span><br><span> </span><br><span> static const struct osmo_stat_item_group_desc bsc_statg_desc = {</span><br><span>diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>index a5e697b..8b24857 100644</span><br><span>--- a/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>+++ b/src/osmo-bsc/bts_ipaccess_nanobts.c</span><br><span>@@ -397,6 +397,8 @@</span><br><span>     LOG_TRX(trx, DLINP, LOGL_NOTICE, "Dropping RSL link: %s\n", reason);</span><br><span>       e1inp_sign_link_destroy(trx->rsl_link);</span><br><span>   trx->rsl_link = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+      osmo_stat_item_set(trx->bts->bts_statg->items[BTS_STAT_NUM_RSL_CONNECTED], 0);</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_stat_item_dec(trx->bts->network->bsc_statg->items[BSC_STAT_NUM_TRX_CONNECTED], 1);</span><br><span> </span><br><span>      if (trx->bts->c0 == trx)</span><br><span>               paging_flush_bts(trx->bts, NULL);</span><br><span>@@ -417,6 +419,8 @@</span><br><span>   e1inp_sign_link_destroy(bts->oml_link);</span><br><span>   bts->oml_link = NULL;</span><br><span>     bts->uptime = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+   osmo_stat_item_set(bts->bts_statg->items[BTS_STAT_NUM_OML_CONNECTED], 0);</span><br><span style="color: hsl(120, 100%, 40%);">+       osmo_stat_item_dec(bts->network->bsc_statg->items[BSC_STAT_NUM_BTS_CONNECTED], 1);</span><br><span> </span><br><span>      /* we have issues reconnecting RSL, drop everything. */</span><br><span>      llist_for_each_entry(trx, &bts->trx_list, list)</span><br><span>@@ -558,6 +562,8 @@</span><br><span>                                         sign_link->tei, sign_link->sapi);</span><br><span>                      sign_link->trx->bts->ip_access.flags |= OML_UP;</span><br><span>             }</span><br><span style="color: hsl(120, 100%, 40%);">+             osmo_stat_item_set(bts->bts_statg->items[BTS_STAT_NUM_OML_CONNECTED], 1);</span><br><span style="color: hsl(120, 100%, 40%);">+               osmo_stat_item_inc(bts->network->bsc_statg->items[BSC_STAT_NUM_BTS_CONNECTED], 1);</span><br><span>          break;</span><br><span>       case E1INP_SIGN_RSL: {</span><br><span>               struct e1inp_ts *ts;</span><br><span>@@ -585,6 +591,8 @@</span><br><span>                   sign_link->trx->bts->ip_access.flags |=</span><br><span>                                     (RSL_UP << sign_link->trx->nr);</span><br><span>          }</span><br><span style="color: hsl(120, 100%, 40%);">+             osmo_stat_item_set(bts->bts_statg->items[BTS_STAT_NUM_RSL_CONNECTED], 1);</span><br><span style="color: hsl(120, 100%, 40%);">+               osmo_stat_item_inc(bts->network->bsc_statg->items[BSC_STAT_NUM_TRX_CONNECTED], 1);             </span><br><span>             break;</span><br><span>       }</span><br><span>    default:</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index f61335f..fd90e3a 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -390,6 +390,8 @@</span><br><span>      { "T3122", "T3122 IMMEDIATE ASSIGNMENT REJECT wait indicator.", "s", 16, GSM_T3122_DEFAULT },</span><br><span>  { "rach_busy", "RACH slots with signal above threshold", "%", 16, 0 },</span><br><span>         { "rach_access", "RACH slots with access bursts in them", "%", 16, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "num_oml_connected", "Number of OML links connected", "", 16, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+    { "num_rsl_connected", "Number of RSL links connected", "", 16, 0 },</span><br><span> };</span><br><span> </span><br><span> static const struct osmo_stat_item_group_desc bts_statg_desc = {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/18093">change 18093</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/18093"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I88c8025940a0eecb034b1c70f76ea17937fa0325 </div>
<div style="display:none"> Gerrit-Change-Number: 18093 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: ipse <Alexander.Chemeris@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>