Skip to content

Save network usage processed data as List object #2577 #2583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 7, 2023
Merged

Save network usage processed data as List object #2577 #2583

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75ac3e1
NetworkWidget: save data as a List object #2577
FroggyFlox Jun 6, 2023
5cdb301
Style formatting #2577
FroggyFlox Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions src/rockstor/smart_manager/data_collector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Copyright (c) 2012-2021 RockStor, Inc. <http://rockstor.com>
Copyright (c) 2012-2023 RockStor, Inc. <https://rockstor.com>
This file is part of RockStor.

RockStor is free software; you can redistribute it and/or modify
Expand All @@ -13,7 +13,7 @@
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/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.
"""

# TODO: Let's deprecate gevent in favor of django channels and we won't need
Expand Down Expand Up @@ -44,6 +44,7 @@
# https://docs.djangoproject.com/en/1.11/topics/settings/#calling-django-setup-is-required-for-standalone-django-usage
import django
from django.conf import settings # noqa E402

django.setup()

from system.pinmanager import (
Expand Down Expand Up @@ -729,8 +730,8 @@ def retrieve_network_stats(prev_stats):
with open("/proc/net/dev") as sfo:
sfo.readline()
sfo.readline()
for l in sfo.readlines():
fields = l.split()
for line in sfo.readlines():
fields = line.split()
if fields[0][:-1] not in interfaces:
continue
cur_stats[fields[0][:-1]] = fields[1:]
Expand All @@ -739,12 +740,14 @@ def retrieve_network_stats(prev_stats):
results = []
for interface in cur_stats.keys():
if interface in prev_stats:
data = map(
lambda x, y: float(x) / interval
if x < y
else (float(x) - float(y)) / interval,
cur_stats[interface],
prev_stats[interface],
data = list(
map(
lambda x, y: float(x) / interval
if x < y
else (float(x) - float(y)) / interval,
cur_stats[interface],
prev_stats[interface],
)
)
results.append(
{
Expand Down