Page MenuHomeVyOS Platform
Files F119063125

No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/op_mode/sflow.py b/src/op_mode/sflow.py
index 1ff006274..ddb8bf44d 100755
--- a/src/op_mode/sflow.py
+++ b/src/op_mode/sflow.py
@@ -1,102 +1,105 @@
#!/usr/bin/env python3
#
# Copyright (C) 2023 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import dbus
import sys
from tabulate import tabulate
from vyos.configquery import ConfigTreeQuery
from vyos.util import cmd
import vyos.opmode
def _get_raw_sflow():
bus = dbus.SystemBus()
config = ConfigTreeQuery()
interfaces = config.values('system sflow interface')
servers = config.list_nodes('system sflow server')
sflow = bus.get_object('net.sflow.hsflowd', '/net/sflow/hsflowd')
sflow_telemetry = dbus.Interface(
sflow, dbus_interface='net.sflow.hsflowd.telemetry')
agent_address = sflow_telemetry.GetAgent()
samples_dropped = int(sflow_telemetry.Get('dropped_samples'))
+ samples_drop_events_sent = int(sflow_telemetry.Get('event_samples'))
samples_packet_sent = int(sflow_telemetry.Get('flow_samples'))
samples_counter_sent = int(sflow_telemetry.Get('counter_samples'))
datagrams_sent = int(sflow_telemetry.Get('datagrams'))
rtmetric_samples = int(sflow_telemetry.Get('rtmetric_samples'))
samples_suppressed = int(sflow_telemetry.Get('flow_samples_suppressed'))
counter_samples_suppressed = int(
sflow_telemetry.Get("counter_samples_suppressed"))
version = sflow_telemetry.GetVersion()
sflow_dict = {
'agent_address': agent_address,
'sflow_interfaces': interfaces,
'sflow_servers': servers,
'counter_samples_sent': samples_counter_sent,
'datagrams_sent': datagrams_sent,
+ 'samples_drop_events_sent': samples_drop_events_sent,
'packet_samples_dropped': samples_dropped,
'packet_samples_sent': samples_packet_sent,
'rtmetric_samples': rtmetric_samples,
'flow_samples_suppressed': samples_suppressed,
'counter_samples_suppressed': counter_samples_suppressed,
'hsflowd_version': version
}
return sflow_dict
def _get_formatted_sflow(data):
table = [
['Agent address', f'{data.get("agent_address")}'],
['sFlow interfaces', f'{data.get("sflow_interfaces", "n/a")}'],
['sFlow servers', f'{data.get("sflow_servers", "n/a")}'],
+ ['Counter samples sent', f'{data.get("counter_samples_sent")}'],
['Datagrams sent', f'{data.get("datagrams_sent")}'],
['Packet samples sent', f'{data.get("packet_samples_sent")}'],
['Packet samples dropped', f'{data.get("packet_samples_dropped")}'],
- ['Counter samples sent', f'{data.get("counter_samples_sent")}'],
+ ['Samples drop events sent', f'{data.get("samples_drop_events_sent")}'],
['Flow samples suppressed', f'{data.get("flow_samples_suppressed")}'],
['Counter samples suppressed', f'{data.get("counter_samples_suppressed")}']
]
return tabulate(table)
def show(raw: bool):
config = ConfigTreeQuery()
if not config.exists('system sflow'):
raise vyos.opmode.UnconfiguredSubsystem(
'"system sflow" is not configured!')
sflow_data = _get_raw_sflow()
if raw:
return sflow_data
else:
return _get_formatted_sflow(sflow_data)
if __name__ == '__main__':
try:
res = vyos.opmode.run(sys.modules[__name__])
if res:
print(res)
except (ValueError, vyos.opmode.Error) as e:
print(e)
sys.exit(1)

File Metadata

Mime Type
text/x-diff
Expires
Fri, Nov 6, 8:00 AM (1 d, 20 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4653307
Default Alt Text
(4 KB)

Event Timeline