From 33152169c9f853db5ce70f00b5262817b0f04254 Mon Sep 17 00:00:00 2001
From: Bartek Plotka <bwplotka@gmail.com>
Date: Mon, 25 Nov 2019 01:55:00 +0000
Subject: [PATCH] Added rule test against regression.

Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
---
 CHANGELOG.md          |  1 +
 cmd/thanos/rule.go    |  1 +
 pkg/rule/rule_test.go | 71 +++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0312950027b..0da6b3a7eaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel
 is now exposed by new metric: `thanos_compact_group_compaction_runs_started_total` and `thanos_compact_group_compaction_runs_completed_total` which counts compaction runs overall.
 - [#1748](https://github.com/thanos-io/thanos/pull/1748) Updated all dependencies.
 - [#1694](https://github.com/thanos-io/thanos/pull/1694) `prober_ready` and `prober_healthy` metrics are removed, for sake of `status`. Now `status` exposes same metric with a label, `check`. `check` can have "healty" or "ready" depending on status of the probe.
+- [#1790](https://github.com/thanos-io/thanos/pull/1790) Fixes subqueries support for ruler. 
 
 ## [v0.8.1](https://github.com/thanos-io/thanos/releases/tag/v0.8.1) - 2019.10.14
 
diff --git a/cmd/thanos/rule.go b/cmd/thanos/rule.go
index 676ccfa5465..b3f3db72ef4 100644
--- a/cmd/thanos/rule.go
+++ b/cmd/thanos/rule.go
@@ -326,6 +326,7 @@ func runRule(
 			ResendDelay: resendDelay,
 		}
 
+		// TODO(bwplotka): Hide this behind thanos rules.Manager.
 		for _, strategy := range storepb.PartialResponseStrategy_value {
 			s := storepb.PartialResponseStrategy(strategy)
 
diff --git a/pkg/rule/rule_test.go b/pkg/rule/rule_test.go
index 8b9864a17e0..c0dd351e653 100644
--- a/pkg/rule/rule_test.go
+++ b/pkg/rule/rule_test.go
@@ -1,23 +1,88 @@
 package thanosrule
 
 import (
+	"context"
 	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
 	"sort"
 	"strings"
+	"sync"
 	"testing"
 	"time"
 
+	"github.com/prometheus/prometheus/pkg/labels"
+	"github.com/prometheus/prometheus/promql"
+	"github.com/prometheus/prometheus/storage"
+
 	"github.com/go-kit/kit/log"
 	"github.com/prometheus/prometheus/pkg/rulefmt"
 	"github.com/prometheus/prometheus/rules"
 	"github.com/thanos-io/thanos/pkg/store/storepb"
 	"github.com/thanos-io/thanos/pkg/testutil"
-	yaml "gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v2"
 )
 
+type nopAppendable struct{}
+
+func (n nopAppendable) Add(l labels.Labels, t int64, v float64) (uint64, error)       { return 0, nil }
+func (n nopAppendable) AddFast(l labels.Labels, ref uint64, t int64, v float64) error { return nil }
+func (n nopAppendable) Commit() error                                                 { return nil }
+func (n nopAppendable) Rollback() error                                               { return nil }
+func (n nopAppendable) Appender() (storage.Appender, error)                           { return n, nil }
+
+// Regression test against https://github.com/thanos-io/thanos/issues/1779.
+func TestRun(t *testing.T) {
+	dir, err := ioutil.TempDir("", "test_rule_run")
+	testutil.Ok(t, err)
+	defer func() { testutil.Ok(t, os.RemoveAll(dir)) }()
+
+	testutil.Ok(t, ioutil.WriteFile(path.Join(dir, "rule.yaml"), []byte(`
+groups:
+- name: "rule with subquery"
+  partial_response_strategy: "warn"
+  rules:
+  - record: "test"
+    expr: "rate(some_metric[1h:5m] offset 1d)"
+`), os.ModePerm))
+
+	var (
+		queryDone = make(chan struct{})
+		queryOnce sync.Once
+		query     string
+	)
+	opts := rules.ManagerOptions{
+		Logger:  log.NewLogfmtLogger(os.Stderr),
+		Context: context.Background(),
+		QueryFunc: func(ctx context.Context, q string, t time.Time) (vectors promql.Vector, e error) {
+			queryOnce.Do(func() {
+				query = q
+				close(queryDone)
+			})
+			return promql.Vector{}, nil
+		},
+		Appendable: nopAppendable{},
+	}
+	thanosRuleMgr := NewManager(dir)
+	ruleMgr := rules.NewManager(&opts)
+	thanosRuleMgr.SetRuleManager(storepb.PartialResponseStrategy_ABORT, ruleMgr)
+	thanosRuleMgr.SetRuleManager(storepb.PartialResponseStrategy_WARN, ruleMgr)
+
+	testutil.Ok(t, thanosRuleMgr.Update(10*time.Second, []string{path.Join(dir, "rule.yaml")}))
+
+	ruleMgr.Run()
+	defer ruleMgr.Stop()
+
+	select {
+	case <-time.After(2 * time.Minute):
+		t.Fatal("timeout while waiting on rule manager query evaluation")
+	case <-queryDone:
+	}
+
+	testutil.Equals(t, "rate(some_metric[1h:5m] offset 1d)", query)
+}
+
 func TestUpdate(t *testing.T) {
 	dir, err := ioutil.TempDir("", "test_rule_rule_groups")
 	testutil.Ok(t, err)
@@ -152,7 +217,7 @@ func TestRuleGroupMarshalYAML(t *testing.T) {
 - name: something2
   rules:
   - alert: some
-    expr: up
+    expr: rate(some_metric[1h:5m] offset 1d)
   partial_response_strategy: ABORT
 `
 
@@ -176,7 +241,7 @@ func TestRuleGroupMarshalYAML(t *testing.T) {
 					Rules: []rulefmt.Rule{
 						{
 							Alert: "some",
-							Expr:  "up",
+							Expr:  "rate(some_metric[1h:5m] offset 1d)",
 						},
 					},
 				},