fixes on grafana style

srl-labs · Apr 17, 2024 · 6bbd219 · 6bbd219
1 parent a194312
commit 6bbd219
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/clab2drawio.py b/clab2drawio.py
@@ -215,8 +215,8 @@ def add_ports(diagram, styles, verbose=True):
                 style=styles['connector_style']
             )
 
-            diagram.add_link(source=source_cID, target=midpoint_id, style=styles["link_style"], label='rate', link_id=f"{source_cID}")
-            diagram.add_link(source=target_cID, target=midpoint_id, style=styles["link_style"], label='rate', link_id=f"{target_cID}")
+            diagram.add_link(source=source_cID, target=midpoint_id, style=styles["link_style"], label='\u200B', link_id=f"{source_cID}")
+            diagram.add_link(source=target_cID, target=midpoint_id, style=styles["link_style"], label='\u200B', link_id=f"{target_cID}")
 
 
    # Create groups for each node and its connectors

diff --git a/lib/Grafana.py b/lib/Grafana.py
@@ -34,7 +34,7 @@ def create_dashboard(self):
                 "legend_format": 'oper_state:{{source}}:{{interface_name}}',
             },
             "EgressTraffic2": {
-                "rule_expr": "rate(port_ethernet_statistics_out_octets[10s])*8",
+                "rule_expr": "irate(port_ethernet_statistics_out_octets[$__rate_interval])*8",
                 "legend_format": '{{source}}:{{interface_name}}:out',
             },
         }

diff --git a/lib/templates/traffic_rule_template.json b/lib/templates/traffic_rule_template.json
@@ -27,7 +27,7 @@
     "decimals": 1,
     "gradient": false,
     "hidden": false,
-    "invert": false,
+    "invert": true,
     "mappingType": 1,
     "mapsDat": {
       "events": {
@@ -66,7 +66,7 @@
           {
             "hidden": false,
             "pattern": "",
-            "textOn": "wmd",
+            "textOn": "wc",
             "textPattern": "/.*/",
             "textReplace": "content"
           }
@@ -89,20 +89,20 @@
       {
         "color": "rgba(75, 221, 51, 1)",
         "comparator": "ge",
-        "level": 0,
-        "value": 500000
+        "value": 500000,
+        "level": 0
       },
       {
         "color": "rgba(255, 128, 0, 1)",
         "comparator": "gt",
-        "level": 0,
-        "value": 2000000
+        "value": 2000000,
+        "level": 0
       },
       {
         "color": "rgba(245, 54, 54, 0.9)",
         "comparator": "ge",
-        "level": 0,
-        "value": 5000000
+        "value": 5000000,
+        "level": 0
       }
     ],
     "order": 0,

diff --git a/styles/grafana_dark.yaml b/styles/grafana_dark.yaml
@@ -16,7 +16,7 @@ connector_width:  8
 connector_height: 8 
 
 # Style for links between nodes
-link_style: "rounded=0;orthogonalLoop=1;jettySize=auto;html=1;startSize=6;endArrow=classicThin;endFill=1;endSize=2;fontSize=8;strokeColor=#98A2AE;fontSize=6;fontColor=#FFFFFF;textOpacity=60;labelBackgroundColor=#4D5766;jumpStyle=gap;"
+link_style: "rounded=0;orthogonalLoop=1;html=1;startSize=6;endArrow=classicThin;endFill=1;endSize=2;fontSize=10;strokeColor=#98A2AE;fontColor=#FFFFFF;textOpacity=60;labelBackgroundColor=#4D5766;jumpStyle=gap;"
 
 # Styles for labels on the source and target ends of a link
 src_label_style: "edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=6;fontColor=#FFFFFF;textOpacity=60;labelBackgroundColor=#4D5766;"