From 39059eff7cac5b251a31f83788d1f5b3efe0b943 Mon Sep 17 00:00:00 2001
From: Owen Diehl <ow.diehl@gmail.com>
Date: Fri, 4 Dec 2020 14:04:01 -0500
Subject: [PATCH] uses $__rate_interval in ruler dashboard queries
 Signed-off-by: Owen Diehl <ow.diehl@gmail.com>

---
 cortex-mixin/dashboards/ruler.libsonnet | 33 ++++++++++++-------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/cortex-mixin/dashboards/ruler.libsonnet b/cortex-mixin/dashboards/ruler.libsonnet
index 9c81e822..6f19d61d 100644
--- a/cortex-mixin/dashboards/ruler.libsonnet
+++ b/cortex-mixin/dashboards/ruler.libsonnet
@@ -6,54 +6,53 @@ local utils = import 'mixin-utils/utils.libsonnet';
     ruleEvaluations: {
       success:
         |||
-          sum(rate(cortex_prometheus_rule_evaluations_total{%s}[$__interval]))
+          sum(rate(cortex_prometheus_rule_evaluations_total{%s}[$__rate_interval]))
           -
-          sum(rate(cortex_prometheus_rule_evaluation_failures_total{%s}[$__interval]))
+          sum(rate(cortex_prometheus_rule_evaluation_failures_total{%s}[$__rate_interval]))
         |||,
-      failure: 'sum(rate(cortex_prometheus_rule_evaluation_failures_total{%s}[$__interval]))',
+      failure: 'sum(rate(cortex_prometheus_rule_evaluation_failures_total{%s}[$__rate_interval]))',
       latency:
         |||
-          sum (rate(cortex_prometheus_rule_evaluation_duration_seconds_sum{%s}[$__interval]))
+          sum (rate(cortex_prometheus_rule_evaluation_duration_seconds_sum{%s}[$__rate_interval]))
             /
-          sum (rate(cortex_prometheus_rule_evaluation_duration_seconds_count{%s}[$__interval]))
+          sum (rate(cortex_prometheus_rule_evaluation_duration_seconds_count{%s}[$__rate_interval]))
         |||,
     },
     perUserPerGroupEvaluations: {
-      failure: 'sum by(rule_group) (rate(cortex_prometheus_rule_evaluation_failures_total{%s}[$__interval])) > 0',
+      failure: 'sum by(rule_group) (rate(cortex_prometheus_rule_evaluation_failures_total{%s}[$__rate_interval])) > 0',
       latency:
         |||
-          sum by(user) (rate(cortex_prometheus_rule_evaluation_duration_seconds_sum{%s}[$__interval]))
+          sum by(user) (rate(cortex_prometheus_rule_evaluation_duration_seconds_sum{%s}[$__rate_interval]))
             /
-          sum by(user) (rate(cortex_prometheus_rule_evaluation_duration_seconds_count{%s}[$__interval]))
+          sum by(user) (rate(cortex_prometheus_rule_evaluation_duration_seconds_count{%s}[$__rate_interval]))
         |||,
     },
     groupEvaluations: {
-      missedIterations: 'sum by(user) (rate(cortex_prometheus_rule_group_iterations_missed_total{%s}[$__interval])) > 0',
+      missedIterations: 'sum by(user) (rate(cortex_prometheus_rule_group_iterations_missed_total{%s}[$__rate_interval])) > 0',
       latency:
         |||
-          rate(cortex_prometheus_rule_group_duration_seconds_sum{%s}[$__interval])
+          rate(cortex_prometheus_rule_group_duration_seconds_sum{%s}[$__rate_interval])
             /
-          rate(cortex_prometheus_rule_group_duration_seconds_count{%s}[$__interval])
+          rate(cortex_prometheus_rule_group_duration_seconds_count{%s}[$__rate_interval])
         |||,
     },
     notifications: {
       failure:
         |||
-          sum by(user) (rate(cortex_prometheus_notifications_errors_total{%s}[$__interval]))
+          sum by(user) (rate(cortex_prometheus_notifications_errors_total{%s}[$__rate_interval]))
             /
-          sum by(user) (rate(cortex_prometheus_notifications_sent_total{%s}[$__interval]))
+          sum by(user) (rate(cortex_prometheus_notifications_sent_total{%s}[$__rate_interval]))
           > 0
         |||,
       queue:
         |||
-          sum by(user) (rate(cortex_prometheus_notifications_queue_length{%s}[$__interval]))
+          sum by(user) (rate(cortex_prometheus_notifications_queue_length{%s}[$__rate_interval]))
             /
-          sum by(user) (rate(cortex_prometheus_notifications_queue_capacity{%s}[$__interval]))  
-          > 0
+          sum by(user) (rate(cortex_prometheus_notifications_queue_capacity{%s}[$__rate_interval])) > 0
         |||,
       dropped:
         |||
-          sum by (user) (increase(cortex_prometheus_notifications_dropped_total{%s}[$__interval])) > 0
+          sum by (user) (increase(cortex_prometheus_notifications_dropped_total{%s}[$__rate_interval])) > 0
         |||,
     },
   },