Fix dashboard errors: replace HTML entities in macros, fix row_number function, and correct mstats syntax

Author: devinslick

default/data/ui/views/dashboard_leaderboard.xml

@@ -205,7 +205,7 @@
       <title>Average Load Time Trend (Last 7 Days)</title>
       <chart>
         <search>
-          <query>| mstats avg(avg_load_time) as avg_load WHERE index=caca_metrics AND metric_name="dashboard.load_time" span=1d
+          <query>| mstats avg(_value) as avg_load WHERE index=caca_metrics AND metric_name="dashboard.load_time" span=1d
 | timechart avg(avg_load) as "Avg Load Time (ms)" span=1d</query>
           <earliest>-7d@h</earliest>
           <latest>now</latest>

default/macros.conf

@@ -64,7 +64,7 @@ definition = mstats sum(_value) as metric_value WHERE index=caca_metrics AND met
 | stats sum(metric_value) as total by pretty_name, app \
 | sort -total \
 | head 10 \
-| eval rank=row_number() \
+| streamstats count as rank \
 | eval metric_type="$metric_type$"
 iseval = 0
 
@@ -73,22 +73,22 @@ args = dashboard_name
 definition = mstats avg(_value) as avg_load_time WHERE index=caca_metrics AND pretty_name="$dashboard_name$" AND metric_name="dashboard.load_time" BY pretty_name span=1h \
 | eval avg_load_time=round(avg_load_time, 2) \
 | eval performance_rating=case(\
-    avg_load_time < 1000, "Excellent",\
-    avg_load_time < 3000, "Good",\
-    avg_load_time < 5000, "Fair",\
+    avg_load_time < 1000, "Excellent",\
+    avg_load_time < 3000, "Good",\
+    avg_load_time < 5000, "Fair",\
     1=1, "Poor")
 iseval = 0
 
 [get_slow_dashboards]
 definition = mstats avg(_value) as avg_load_time WHERE index=caca_metrics AND metric_name="dashboard.load_time" BY pretty_name, app span=1d \
 | where _time >= relative_time(now(), "-7d") \
 | stats avg(avg_load_time) as avg_load_time_7d by pretty_name, app \
-| where avg_load_time_7d &gt; 3000 \
+| where avg_load_time_7d > 3000 \
 | eval avg_load_time_7d=round(avg_load_time_7d, 0) \
 | eval performance_status=case(\
-    avg_load_time_7d &gt; 10000, "Critical",\
-    avg_load_time_7d &gt; 5000, "Poor",\
-    avg_load_time_7d &gt; 3000, "Fair",\
+    avg_load_time_7d > 10000, "Critical",\
+    avg_load_time_7d > 5000, "Poor",\
+    avg_load_time_7d > 3000, "Fair",\
     1=1, "Good") \
 | sort -avg_load_time_7d
 iseval = 0
@@ -100,25 +100,25 @@ definition = mstats sum(_value) as error_count WHERE index=caca_metrics AND metr
 | eval {severity}=total_errors \
 | stats sum(error) as errors sum(warn) as warnings values(error) as has_errors values(warn) as has_warns sum(total_errors) as total_issues by pretty_name, app \
 | fillnull value=0 errors warnings \
-| where total_issues &gt; 0 \
+| where total_issues > 0 \
 | eval health_status=case(\
-    errors &gt; 50, "Critical",\
-    errors &gt; 10, "High",\
-    errors &gt; 0, "Medium",\
-    warnings &gt; 20, "Medium",\
+    errors > 50, "Critical",\
+    errors > 10, "High",\
+    errors > 0, "Medium",\
+    warnings > 20, "Medium",\
     1=1, "Low") \
 | sort -errors -warnings
 iseval = 0
 
 [get_problematic_dashboards]
 definition = `get_all_dashboards_summary` \
-| where health_status="critical" OR health_status="warning" OR avg_load_time_7d &gt; 5000 \
+| where health_status="critical" OR health_status="warning" OR avg_load_time_7d > 5000 \
 | eval issue_type=case(\
-    health_status="critical" AND avg_load_time_7d &gt; 5000, "Health + Performance",\
+    health_status="critical" AND avg_load_time_7d > 5000, "Health + Performance",\
     health_status="critical", "Health Issues",\
-    health_status="warning" AND avg_load_time_7d &gt; 5000, "Health + Performance",\
+    health_status="warning" AND avg_load_time_7d > 5000, "Health + Performance",\
     health_status="warning", "Health Issues",\
-    avg_load_time_7d &gt; 5000, "Performance Issues",\
+    avg_load_time_7d > 5000, "Performance Issues",\
     1=1, "Other") \
 | table pretty_name app views_7d errors_7d avg_load_time_7d health_status issue_type \
 | sort -errors_7d -avg_load_time_7d