Fix mstats macros: add metric_name filter to WHERE clause

Author: devinslick

default/macros.conf

@@ -6,7 +6,7 @@
 
 [get_dashboard_stats(1)]
 args = dashboard_name
-definition = mstats sum(_value) as metric_value WHERE index=caca_metrics AND pretty_name="$dashboard_name$" BY pretty_name, metric_name, activity_type, app span=1h \
+definition = mstats sum(_value) as metric_value WHERE index=caca_metrics AND metric_name="dashboard.*" AND pretty_name="$dashboard_name$" BY pretty_name, metric_name, activity_type, app span=1h \
 | eval metric_display=case(\
     metric_name=="dashboard.views", "Views",\
     metric_name=="dashboard.edits", "Edits",\
@@ -18,7 +18,7 @@ iseval = 0
 
 [get_dashboard_stats_timerange(2)]
 args = dashboard_name, timerange
-definition = mstats sum(_value) as metric_value WHERE index=caca_metrics AND pretty_name="$dashboard_name$" BY pretty_name, metric_name, activity_type, app span=1h \
+definition = mstats sum(_value) as metric_value WHERE index=caca_metrics AND metric_name="dashboard.*" AND pretty_name="$dashboard_name$" BY pretty_name, metric_name, activity_type, app span=1h \
 | where _time >= relative_time(now(), "$timerange$") \
 | eval metric_display=case(\
     metric_name=="dashboard.views", "Views",\
@@ -31,7 +31,7 @@ definition = mstats sum(_value) as metric_value WHERE index=caca_metrics AND pre
 iseval = 0
 
 [get_all_dashboards_summary]
-definition = mstats sum(_value) as metric_value WHERE index=caca_metrics BY pretty_name, metric_name, app span=1d \
+definition = mstats sum(_value) as metric_value WHERE index=caca_metrics AND metric_name="dashboard.*" BY pretty_name, metric_name, app span=1d \
 | where _time >= relative_time(now(), "-7d") \
 | stats sum(metric_value) as total_value by pretty_name, metric_name, app \
 | eval metric_type=case(\