lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Interfaces / Diagnostics: add bpf,memory and netisr stats, cleanup template while here as well. for https://github.com/opnsense/core/issues/4013

Browse Source
This commit is contained in:
Ad Schellevis 2020-04-05 14:29:00 +02:00
parent c4bc519e9a
commit 2cd73a5a2d
4 changed files with 98 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/Api/InterfaceController.php
View File

@ -266,4 +266,32 @@ class InterfaceController extends ApiControllerBase
return ['statistics' => $stats];
}
/**
* retrieve statistics recorded by the memory management routines
* @return mixed
*/
public function getMemoryStatisticsAction()
{
return json_decode((new Backend())->configdRun('interface show memory'), true);
}
/**
* retrieve bpf(4) peers statistics
* @return mixed
*/
public function getBpfStatisticsAction()
{
return json_decode((new Backend())->configdRun('interface show bpf'), true);
}
/**
* retrieve netisr(9) statistics
* @return mixed
*/
public function getNetisrStatisticsAction()
{
return json_decode((new Backend())->configdRun('interface show netisr'), true);
}
}

32
src/opnsense/mvc/app/controllers/OPNsense/Diagnostics/InterfaceController.php
View File

@ -67,6 +67,38 @@ class InterfaceController extends IndexController
*/
public function netstatAction()
{
$this->view->tabs = [
[
"name" => "bpf",
"caption" => gettext("Bpf"),
"endpoint" => "/api/diagnostics/interface/getBpfStatistics"
],
[
"name" => "interfaces",
"caption" => gettext("Interfaces"),
"endpoint" => "/api/diagnostics/interface/getInterfaceStatistics"
],
[
"name" => "memory",
"caption" => gettext("Memory"),
"endpoint" => "/api/diagnostics/interface/getMemoryStatistics"
],
[
"name" => "netisr",
"caption" => gettext("Netisr"),
"endpoint" => "/api/diagnostics/interface/getNetisrStatistics"
],
[
"name" => "protocol",
"caption" => gettext("Protocol"),
"endpoint" => "/api/diagnostics/interface/getProtocolStatistics"
],
[
"name" => "sockets",
"caption" => gettext("Sockets"),
"endpoint" => "/api/diagnostics/interface/getSocketStatistics"
]
];
$this->view->pick('OPNsense/Diagnostics/netstat');
}
}

59
src/opnsense/mvc/app/views/OPNsense/Diagnostics/netstat.volt
View File

@ -32,6 +32,8 @@
* https://mbraak.github.io/jqTree/#general
*/
function dict_to_tree(node, path) {
// some entries are lists, try use a name for the nodes in that case
let node_name_keys = ['name', 'interface-name'];
let result = [];
if ( path === undefined) {
path = "";
@ -44,8 +46,15 @@
}
let item_path = path + key;
if (node[key] instanceof Object) {
let node_name = key;
for (idx=0; idx < node_name_keys.length; ++idx) {
if (/^(0|[1-9]\d*)$/.test(node_name) && node[key][node_name_keys[idx]] !== undefined) {
node_name = node[key][node_name_keys[idx]];
break;
}
}
result.push({
name: key,
name: node_name,
id: item_path,
children: dict_to_tree(node[key], item_path)
});
@ -126,54 +135,26 @@
<script src="{{ cache_safe('/ui/js/tree.jquery.min.js') }}"></script>
<ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
{% for tab in tabs %}
<li>
<a data-toggle="tab" href="#interfaces" id="interfaces_tab"
data-tree-target="interfacesTree"
data-tree-endpoint="/api/diagnostics/interface/getInterfaceStatistics">
{{ lang._('Interfaces') }} <i class="fa tab-icon "></i>
</a>
</li>
<li>
<a data-toggle="tab" href="#protocol" id="protocol_tab"
data-tree-target="protocolTree"
data-tree-endpoint="/api/diagnostics/interface/getProtocolStatistics">
{{ lang._('Protocol') }} <i class="fa tab-icon "></i>
</a>
</li>
<li>
<a data-toggle="tab" href="#sockets" id="sockets_tab"
data-tree-target="socketsTree"
data-tree-endpoint="/api/diagnostics/interface/getSocketStatistics">
{{ lang._('Sockets') }} <i class="fa tab-icon "></i>
<a data-toggle="tab" href="#{{tab['name']}}" id="{{tab['name']}}_tab"
data-tree-target="{{tab['name']}}Tree"
data-tree-endpoint="{{tab['endpoint']}}">
{{tab['caption']}} <i class="fa tab-icon "></i>
</a>
</li>
{% endfor %}
</ul>
<div class="tab-content content-box">
<div id="interfaces" class="tab-pane fade in active">
{% for tab in tabs %}
<div id="{{tab['name']}}" class="tab-pane fade in active">
<div class="row">
<section class="col-xs-12">
<div class="content-box">
<div style="padding: 5px; overflow-y: scroll; height:400px;" id="interfacesTree"></div>
</div>
</section>
</div>
</div>
<div id="protocol" class="tab-pane fade in active">
<div class="row">
<section class="col-xs-12">
<div class="content-box">
<div style="padding: 5px; overflow-y: scroll; height:400px;" id="protocolTree"></div>
</div>
</section>
</div>
</div>
<div id="sockets" class="tab-pane fade in active">
<div class="row">
<section class="col-xs-12">
<div class="content-box">
<div style="padding: 5px; overflow-y: scroll; height:400px;" id="socketsTree"></div>
<div style="padding: 5px; overflow-y: scroll; height:400px;" id="{{tab['name']}}Tree"></div>
</div>
</section>
</div>
</div>
{% endfor %}
</div>

18
src/opnsense/service/conf/actions.d/actions_interface.conf
View File

@ -126,3 +126,21 @@ command:/usr/local/opnsense/scripts/interfaces/list_sockstat.py
parameters:
type:script_output
message:dump sockstat
[show.memory]
command:/usr/bin/netstat -m --libxo json
parameters:
type:script_output
message:Show statistics recorded by the memory management routines
[show.bpf]
command:/usr/bin/netstat -B --libxo json
parameters:
type:script_output
message:Show bpf(4) peers statistics
[show.netisr]
command:/usr/bin/netstat -Q --libxo json
parameters:
type:script_output
message:Show netisr(9) statistics