Merge branch 'master' of https://git2.simplico.net/tum/network_report_server

app/backend/views.py

@@ -12,7 +12,7 @@ from django.contrib import messages
 exfo = Exfo("administrator", "exf0w0rxC@t4dm!n")
 exfo.login()
 
-from datetime import datetime
+from datetime import datetime, timedelta
 from dateutil import tz
 
 mkt = Mikrotik()
@@ -314,30 +314,59 @@ def gen_report_notebook():
     to_zone = tz.gettz('Asia/Bangkok')
     
     c = db['fixed_results'].find()
+    c2  = db['ip_address']
+
     data = []
     for i in c:
         #pprint(i['header'])
         res = dict(zip(i['header'], i['results']))
         utc = datetime.fromtimestamp(int(i['ids']['time_stamp'])/1000000000)
         utc = utc.replace(tzinfo=from_zone)
+        yest = utc - timedelta(minutes=4)
         dt = utc.astimezone(to_zone)
 
         d = {'header': i['header'], 'results': i['results'], 'output': res, 'params': i['parameters'], 'ts': i['ids']['time_stamp'], 
              'dt': str(dt), 'test_type_name': i['ids']['fixed_results_url']}
+
+                
+
         d.update(i['names'])
+        if not d['sla_name']:
+            continue 
+
+        sla_splt = d['sla_name'].split('-')
+        if len(sla_splt) > 1:
+            reg_cond = f'(?=^pppoe-out)(?=.*{sla_splt[0]})(?=.*{sla_splt[-1]})'
+
+            pprint(reg_cond)
+            temp_addr = list(c2.find({'ts': {'$lte': utc, '$gte': yest }, 'interface': {'$regex': reg_cond,  '$not': { '$regex': '^pppoe-out5'}, '$options': 'i' }, 'invalid': 'false'}).sort("ts", -1))
+            pprint("temp addr")
+            pprint(d['sla_name'])
+            # //pprint(temp_addr)
+            target_address = None
+            if temp_addr:
+                target_address = temp_addr[0]
+
+            if target_address:
+                pprint("Found Target")
+                pprint(target_address)
+                d.update(target_address)
+ 
         #res.update(i['ids'])
         #res.update(i[])
         #pprint(d)
         data.append(d)
+
     df0 = pd.DataFrame(data)
     df0 = df0.explode(["header", "results"])
-    df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name"]]
+    df1 = df0[["header", "results", "dt", "sla_name", "test_display_name", "verifier_name", "network", "address", "interface"]]
     df1 = df1.query('sla_name == sla_name')
     #pprint(df1['sla_name'].unique())
     
     #df1['results_text'] = df1['results'].apply(con_human)
     df1['results_text'] = df1.apply(con_human, axis=1)
-    table = df1.pivot(index=['sla_name', 'dt', 'verifier_name'],columns=['test_display_name','header'], values='results_text').sort_values(by=['sla_name', 'dt'], ascending=[True, False])
+    df1['network_str'] = df1['network'] + " / " + df1['interface'] 
+    table = df1.pivot(index=['sla_name', 'dt', 'verifier_name', 'network_str'],columns=['test_display_name','header'], values='results_text').sort_values(by=['sla_name', 'dt'], ascending=[True, False])
     table = table.dropna(how='all', axis=0)
     return (table,df1)
 
@@ -367,6 +396,9 @@ def gen_report(request):
         vr_filter = ", ".join(f"'{w}'" for w in vr_name)
         table = table.query(f"verifier_name in ({vr_filter})")
     
+    table = table.dropna(how='all', axis=0)
+    table = table.dropna(how='all', axis=1)
+
     gen_report = request.GET.get('genReport', None)
     
     report_link = None

app/network_report/settings.py

@@ -57,7 +57,7 @@ INSTALLED_APPS = [
     'django.contrib.postgres',
     'crispy_forms',
     "crispy_bootstrap5",
-    "django_browser_reload",
+    # "django_browser_reload",
     'widget_tweaks',
     'django_bootstrap_breadcrumbs',
     'django_filters',
@@ -73,7 +73,7 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    "django_browser_reload.middleware.BrowserReloadMiddleware",
+    # "django_browser_reload.middleware.BrowserReloadMiddleware",
 ]
 
 ROOT_URLCONF = 'network_report.urls'

app/network_report/urls.py

@@ -22,7 +22,7 @@ from django.views.generic.base import RedirectView
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('backend/', include('backend.urls')),
-    path("__reload__/", include("django_browser_reload.urls")),
+    # path("__reload__/", include("django_browser_reload.urls")),
     path('', RedirectView.as_view(pattern_name='backend:index', permanent=True)),
 ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)