Skip to content

Commit ac45c67

Browse files
committed
Fix macros: remove leading pipes to prevent duplicate pipe errors when macros are invoked
1 parent 035b869 commit ac45c67

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

default/macros.conf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
[get_dashboard_stats(1)]
88
args = dashboard_name
9-
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 \
9+
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 \
1010
| eval metric_display=case(\
1111
metric_name=="dashboard.views", "Views",\
1212
metric_name=="dashboard.edits", "Edits",\
@@ -18,7 +18,7 @@ iseval = 0
1818

1919
[get_dashboard_stats_timerange(2)]
2020
args = dashboard_name, timerange
21-
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 \
21+
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 \
2222
| where _time >= relative_time(now(), "$timerange$") \
2323
| eval metric_display=case(\
2424
metric_name=="dashboard.views", "Views",\
@@ -31,7 +31,7 @@ definition = | mstats sum(_value) as metric_value WHERE index=caca_metrics AND p
3131
iseval = 0
3232

3333
[get_all_dashboards_summary]
34-
definition = | mstats sum(_value) as metric_value WHERE index=caca_metrics BY pretty_name, metric_name, app span=1d \
34+
definition = mstats sum(_value) as metric_value WHERE index=caca_metrics BY pretty_name, metric_name, app span=1d \
3535
| where _time >= relative_time(now(), "-7d") \
3636
| stats sum(metric_value) as total_value by pretty_name, metric_name, app \
3737
| eval metric_type=case(\
@@ -52,14 +52,14 @@ iseval = 0
5252

5353
[get_dashboard_last_viewed(1)]
5454
args = dashboard_name
55-
definition = | mstats latest(_value) as last_view WHERE index=caca_metrics AND pretty_name="$dashboard_name$" AND metric_name="dashboard.views" BY pretty_name \
55+
definition = mstats latest(_value) as last_view WHERE index=caca_metrics AND pretty_name="$dashboard_name$" AND metric_name="dashboard.views" BY pretty_name \
5656
| eval last_viewed=strftime(_time, "%Y-%m-%d %H:%M:%S") \
5757
| eval days_since_view=round((now()-_time)/86400, 1)
5858
iseval = 0
5959

6060
[get_top_dashboards(1)]
6161
args = metric_type
62-
definition = | mstats sum(_value) as metric_value WHERE index=caca_metrics AND metric_name="dashboard.$metric_type$" BY pretty_name, app span=1d \
62+
definition = mstats sum(_value) as metric_value WHERE index=caca_metrics AND metric_name="dashboard.$metric_type$" BY pretty_name, app span=1d \
6363
| where _time >= relative_time(now(), "-7d") \
6464
| stats sum(metric_value) as total by pretty_name, app \
6565
| sort -total \
@@ -70,7 +70,7 @@ iseval = 0
7070

7171
[get_dashboard_performance(1)]
7272
args = dashboard_name
73-
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 \
73+
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 \
7474
| eval avg_load_time=round(avg_load_time, 2) \
7575
| eval performance_rating=case(\
7676
avg_load_time < 1000, "Excellent",\
@@ -80,7 +80,7 @@ definition = | mstats avg(_value) as avg_load_time WHERE index=caca_metrics AND
8080
iseval = 0
8181

8282
[get_slow_dashboards]
83-
definition = | mstats avg(_value) as avg_load_time WHERE index=caca_metrics AND metric_name="dashboard.load_time" BY pretty_name, app span=1d \
83+
definition = mstats avg(_value) as avg_load_time WHERE index=caca_metrics AND metric_name="dashboard.load_time" BY pretty_name, app span=1d \
8484
| where _time >= relative_time(now(), "-7d") \
8585
| stats avg(avg_load_time) as avg_load_time_7d by pretty_name, app \
8686
| where avg_load_time_7d > 3000 \
@@ -94,7 +94,7 @@ definition = | mstats avg(_value) as avg_load_time WHERE index=caca_metrics AND
9494
iseval = 0
9595

9696
[get_dashboards_with_errors]
97-
definition = | mstats sum(_value) as error_count WHERE index=caca_metrics AND metric_name="dashboard.errors" BY pretty_name, severity, app span=1d \
97+
definition = mstats sum(_value) as error_count WHERE index=caca_metrics AND metric_name="dashboard.errors" BY pretty_name, severity, app span=1d \
9898
| where _time >= relative_time(now(), "-7d") \
9999
| stats sum(error_count) as total_errors by pretty_name, severity, app \
100100
| eval {severity}=total_errors \

0 commit comments

Comments
 (0)