#186

autogole-api/packaging/files/etc/rtmon.yaml

@@ -25,6 +25,14 @@ grafana_dev:
 # image_flask_port:
 # Default image debug is False (mainly used for development)
 #image_debug:
+
+
+# Default debug is False (mainly used for development), If set to True Dashboard will be generated with Memaid and Debug Info 
+# Debug:
+
+# Default topdiagrams is Diagrams (mainly used for development)
+#topdiagrams: 
+# Choices -> Diagrams | Mermaid 
 # ==================================
 
 # Template path and tags. If tag updated - it will force update all templates
@@ -65,4 +73,3 @@ external_service:
 # HostCert and HostKey location (needed for SiteRM communications). Cert mush be authorized in all Frontends.
 hostcert: '/etc/grid-security/hostcert.pem'
 hostkey: '/etc/grid-security/hostkey.pem'
-

autogole-api/src/python/RTMonLibs/Template.py

@@ -454,7 +454,7 @@ def t_createDashboard(self, *args, **kwargs):
         out["uid"] = args[0]["intents"][0]["id"]
         return out
 
-    def t_createHostFlow(self, sitehost, *args):
+    def t_createHostFlow(self, sitehost, num, *args):
         """Create Host Flow Template"""
         out = []
         interfaces = self.m_groups['Hosts'].get(sitehost, "")
@@ -464,7 +464,7 @@ def t_createHostFlow(self, sitehost, *args):
         sitename = sitehost.split(":")[0]
         hostname = sitehost.split(":")[1]
         intfline = "|".join(interfaces.keys())
-        row = self.t_addRow(*args, title=f"Host Flow Summary: {sitehost}")
+        row = self.t_addRow(*args, title=f"{num}. Host Flow Summary: {sitehost}")
         panels = dumpJson(self._t_loadTemplate("hostflow.json"), self.logger)
         panels = panels.replace("REPLACEME_DATASOURCE", str(self.t_dsourceuid))
         panels = panels.replace("REPLACEME_SITENAME", sitename)
@@ -474,7 +474,7 @@ def t_createHostFlow(self, sitehost, *args):
         out += self.addRowPanel(row, panels, True)
         return out
 
-    def t_createSwitchFlow(self, sitehost, *args):
+    def t_createSwitchFlow(self, sitehost, num, *args):
         """Create Switch Flow Template"""
         def findIntf(interfaces):
             """Find Interface"""
@@ -519,7 +519,7 @@ def findIntf(interfaces):
         sitename = sitehost.split(":")[0]
         hostname = sitehost.split(":")[1]
         intfline = findIntf(interfaces)
-        row = self.t_addRow(*args, title=f"Switch Flow Summary: {sitehost}")
+        row = self.t_addRow(*args, title=f"{num}. Switch Flow Summary: {sitehost}")
         panels = dumpJson(self._t_loadTemplate("switchflow.json"), self.logger)
         panels = panels.replace("REPLACEME_DATASOURCE", str(self.t_dsourceuid))
         panels = panels.replace("REPLACEME_SITENAME", sitename)
@@ -721,21 +721,25 @@ def t_createTemplate(self, *args, **kwargs):
 
         # Add Links on top of the page
         self.generated['links'] = self.t_addLinks(*args, **kwargs)
-        # Add Debug Info (manifest, instance)
-        self.generated['panels'] += self.t_addDebug(*args)
         added = []
-        for item in self.orderlist:
-            if item['Type'] == 'Host' and item['Name'] not in added:
-                self.generated['panels'] += self.t_createHostFlow(item["Name"], *args)
-                added.append(item['Name'])
-            elif item['Type'] == 'Switch' and item['Node'] not in added:
-                self.generated['panels'] += self.t_createSwitchFlow(item["Node"], *args)
-                added.append(item['Node'])
+        for idx, item in enumerate(self.orderlist, start=1):
+            if item['Type'] == 'Host':
+                # Check if this host name hasn't been processed already
+                if item['Name'] not in added:
+                    self.generated['panels'] += self.t_createHostFlow(item["Name"], idx, *args)
+                    added.append(item['Name'])
+            elif item['Type'] == 'Switch':
+                # Check if this switch node hasn't been processed already
+                if item['Node'] not in added:
+                    self.generated['panels'] += self.t_createSwitchFlow(item["Node"], idx, *args)
+                    added.append(item['Node'])
             else:
                 self.logger.error(f"Unknown Type: {item['Type']}. Skipping... {item}")
         # Add L2 Debugging
         self.generated['panels'] += self.t_addL2Debugging(*args)
-
-        if len(diagrams) > 1:
-            self.generated['panels'] += diagrams[1]
+        if self.config.get('Debug', True):
+            if len(diagrams) > 1:
+                self.generated['panels'] += diagrams[1]
+            # Add Debug Info (manifest, instance)
+            self.generated['panels'] += self.t_addDebug(*args)
         return {"dashboard": self.generated}, {"uid": self.generated['uid'], "annotation_panels": self.annotationids}

autogole-api/src/templates/hostflow.json

@@ -1,65 +1,4 @@
 [
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "REPLACEME_DATASOURCE"
-      },
-      "description": "Network Address Information indicates what address  is visible on interface (this comes out from Prometheus output)",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "options": {
-        "displayMode": "gradient",
-        "minVizHeight": 10,
-        "minVizWidth": 0,
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "showUnfilled": true
-      },
-      "pluginVersion": "8.5.27",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "REPLACEME_DATASOURCE"
-          },
-          "editorMode": "code",
-          "expr": "node_network_address_info{instance=~\"REPLACEME_HOSTNAME.*\",sitename=\"REPLACEME_SITENAME\", device=~\"REPLACEME_INTERFACE\"}",
-          "interval": "",
-          "legendFormat": "{{address}} {{device}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Network Address Information",
-      "transformations": [],
-      "type": "bargauge"
-    },
     {
       "datasource": {
         "type": "prometheus",

autogole-api/src/templates/row.json

@@ -1,5 +1,5 @@
 {
-  "collapsed": false,
+  "collapsed": true,
   "datasource": {
     "type": "prometheus",
     "uid": "bdlb788gxxcsge"