analytics: Update connection tracking graphs

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/westferry/handlers/analytics.py b/src/westferry/handlers/analytics.py
index a8fff16ec03ba07ec2ec6ee6c73ff22150da5992..1660cec99ceb4f419b2591c17936df7f36e5a4db 100644 (file)
--- a/src/westferry/handlers/analytics.py
+++ b/src/westferry/handlers/analytics.py
@@ -72,7 +72,7 @@ class AnalyticsNetworkBaseHandler(AnalyticsBaseHandler):
                m.add_handler(AnalyticsNetworkOverviewHandler, title=_("Overview"))
 
                # Connections
-               m.add_handler(AnalyticsNetworkConnectionsOverviewHandler)
+               m.add_handler(AnalyticsNetworkConnectionsHandler)
 
                # Fragmentation
                m.add_handler(AnalyticsNetworkIPFragmentationHandler)
@@ -88,80 +88,15 @@ class AnalyticsNetworkOverviewHandler(AnalyticsNetworkBaseHandler):
                self.render("base.html")
 
 
-class AnalyticsNetworkConnectionsBaseHandler(AnalyticsBaseHandler):
-       @property
-       def menu(self):
-               _ = self.locale.translate
-
-               m = ui.menu.Menu(self, _("Connections"))
-
-               # Back...
-               m.add_handler(AnalyticsNetworkOverviewHandler, title=_("Back..."))
-
-               # Overview
-               m.add_handler(AnalyticsNetworkConnectionsOverviewHandler, title=_("Overview"))
-
-               # Protocol States
-               s = m.add_menu(_("Procotol States"))
-               s.add_handler(AnalyticsNetworkConnectionsStatesTCPHandler)
-               s.add_handler(AnalyticsNetworkConnectionsStatesSCTPHandler)
-               s.add_handler(AnalyticsNetworkConnectionsStatesDCCPHandler)
-
-               return m
-
-
-class AnalyticsNetworkConnectionsOverviewHandler(AnalyticsNetworkConnectionsBaseHandler):
-       url = r"/analytics/network/connections"
+class AnalyticsNetworkConnectionsHandler(AnalyticsNetworkBaseHandler):
+       url = r"/analytics/connections"
        title = N_("Connections")
 
        def get(self):
                _ = self.locale.translate
 
                graphs = [
-                       ui.graphs.Graph(self, "conntrack-layer3-protocols"),
-                       ui.graphs.Graph(self, "conntrack-layer4-protocols"),
-               ]
-
-               self.render_graphs(graphs)
-
-
-class AnalyticsNetworkConnectionsStatesTCPHandler(AnalyticsNetworkConnectionsBaseHandler):
-       url = r"/analytics/network/connections/states/tcp"
-       title = N_("TCP")
-
-       def get(self):
-               _ = self.locale.translate
-
-               graphs = [
-                       ui.graphs.Graph(self, "conntrack-protocol-states", "tcp"),
-               ]
-
-               self.render_graphs(graphs)
-
-
-class AnalyticsNetworkConnectionsStatesSCTPHandler(AnalyticsNetworkConnectionsBaseHandler):
-       url = r"/analytics/network/connections/states/sctp"
-       title = N_("SCTP")
-
-       def get(self):
-               _ = self.locale.translate
-
-               graphs = [
-                       ui.graphs.Graph(self, "conntrack-protocol-states", "sctp"),
-               ]
-
-               self.render_graphs(graphs)
-
-
-class AnalyticsNetworkConnectionsStatesDCCPHandler(AnalyticsNetworkConnectionsBaseHandler):
-       url = r"/analytics/network/connections/states/dccp"
-       title = N_("DCCP")
-
-       def get(self):
-               _ = self.locale.translate
-
-               graphs = [
-                       ui.graphs.Graph(self, "conntrack-protocol-states", "dccp"),
+                       ui.graphs.Graph(self, "conntrack"),
                ]
 
                self.render_graphs(graphs)