Add TSDB query rewriter

8 files changed, 295 insertions, 0 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/horizon/TsdbQueryRewriterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/horizon/TsdbQueryRewriterTest.java
new file mode 100644
index 00000000000..937b0e95440
--- /dev/null
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/horizon/TsdbQueryRewriterTest.java
@@ -0,0 +1,55 @@
+package com.yahoo.vespa.hosted.controller.restapi.horizon;
+
+import com.yahoo.config.provision.SystemName;
+import com.yahoo.config.provision.TenantName;
+import com.yahoo.slime.JsonFormat;
+import com.yahoo.slime.SlimeUtils;
+import com.yahoo.vespa.hosted.controller.api.role.Role;
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author valerijf
+ */
+public class TsdbQueryRewriterTest {
+
+    @Test
+    public void rewrites_query() throws IOException {
+        assertRewrite("filters-complex.json", "filters-complex.expected.json", Role.reader(TenantName.from("tenant2")));
+
+        assertRewrite("filter-in-execution-graph.json",
+                "filter-in-execution-graph.expected.json",
+                Role.reader(TenantName.from("tenant2")), Role.athenzTenantAdmin(TenantName.from("tenant3")));
+
+        assertRewrite("filter-in-execution-graph.json",
+                "filter-in-execution-graph.expected.operator.json",
+                Role.reader(TenantName.from("tenant2")), Role.athenzTenantAdmin(TenantName.from("tenant3")), Role.hostedOperator());
+
+        assertRewrite("no-filters.json",
+                "no-filters.expected.json",
+                Role.reader(TenantName.from("tenant2")), Role.athenzTenantAdmin(TenantName.from("tenant3")));
+    }
+
+    @Test(expected = TsdbQueryRewriter.UnauthorizedException.class)
+    public void throws_if_no_roles() throws IOException {
+        assertRewrite("filters-complex.json", "filters-complex.expected.json");
+    }
+
+    private static void assertRewrite(String initialFilename, String expectedFilename, Role... roles) throws IOException {
+        byte[] data = Files.readAllBytes(Paths.get("src/test/resources/horizon", initialFilename));
+        data = TsdbQueryRewriter.rewrite(data, Set.of(roles), SystemName.Public);
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        new JsonFormat(false).encode(baos, SlimeUtils.jsonToSlime(data));
+        String expectedJson = Files.readString(Paths.get("src/test/resources/horizon", expectedFilename));
+
+        assertEquals(expectedJson, baos.toString());
+    }
+}
\ No newline at end of file
diff --git a/controller-server/src/test/resources/horizon/filter-in-execution-graph.expected.json b/controller-server/src/test/resources/horizon/filter-in-execution-graph.expected.json
new file mode 100644
index 00000000000..7c279442f1d
--- /dev/null
+++ b/controller-server/src/test/resources/horizon/filter-in-execution-graph.expected.json
@@ -0,0 +1,37 @@
+{
+ "start": 1619301600000,
+ "end": 1623161217471,
+ "executionGraph": [
+  {
+   "id": "q1_m1",
+   "type": "TimeSeriesDataSource",
+   "metric": {
+    "type": "MetricLiteral",
+    "metric": "Vespa.vespa.distributor.vds.distributor.docsstored.average"
+   },
+   "sourceId": null,
+   "fetchLast": false,
+   "filter": {
+    "type": "Chain",
+    "op": "AND",
+    "filters": [
+     {
+      "type": "TagValueLiteralOr",
+      "filter": "tenant1.application1.instance1",
+      "tagKey": "applicationId"
+     },
+     {
+      "type": "TagValueLiteralOr",
+      "filter": "Public",
+      "tagKey": "system"
+     },
+     {
+      "type": "TagValueRegex",
+      "filter": "(tenant2|tenant3)\\..*",
+      "tagKey": "applicationId"
+     }
+    ]
+   }
+  }
+ ]
+}
diff --git a/controller-server/src/test/resources/horizon/filter-in-execution-graph.expected.operator.json b/controller-server/src/test/resources/horizon/filter-in-execution-graph.expected.operator.json
new file mode 100644
index 00000000000..5eb5b403b2f
--- /dev/null
+++ b/controller-server/src/test/resources/horizon/filter-in-execution-graph.expected.operator.json
@@ -0,0 +1,32 @@
+{
+ "start": 1619301600000,
+ "end": 1623161217471,
+ "executionGraph": [
+  {
+   "id": "q1_m1",
+   "type": "TimeSeriesDataSource",
+   "metric": {
+    "type": "MetricLiteral",
+    "metric": "Vespa.vespa.distributor.vds.distributor.docsstored.average"
+   },
+   "sourceId": null,
+   "fetchLast": false,
+   "filter": {
+    "type": "Chain",
+    "op": "AND",
+    "filters": [
+     {
+      "type": "TagValueLiteralOr",
+      "filter": "tenant1.application1.instance1",
+      "tagKey": "applicationId"
+     },
+     {
+      "type": "TagValueLiteralOr",
+      "filter": "Public",
+      "tagKey": "system"
+     }
+    ]
+   }
+  }
+ ]
+}
diff --git a/controller-server/src/test/resources/horizon/filter-in-execution-graph.json b/controller-server/src/test/resources/horizon/filter-in-execution-graph.json
new file mode 100644
index 00000000000..6a2512c3642
--- /dev/null
+++ b/controller-server/src/test/resources/horizon/filter-in-execution-graph.json
@@ -0,0 +1,21 @@
+{
+  "start": 1619301600000,
+  "end": 1623161217471,
+  "executionGraph": [
+    {
+      "id": "q1_m1",
+      "type": "TimeSeriesDataSource",
+      "metric": {
+        "type": "MetricLiteral",
+        "metric": "Vespa.vespa.distributor.vds.distributor.docsstored.average"
+      },
+      "sourceId": null,
+      "fetchLast": false,
+      "filter": {
+        "type": "TagValueLiteralOr",
+        "filter": "tenant1.application1.instance1",
+        "tagKey": "applicationId"
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/controller-server/src/test/resources/horizon/filters-complex.expected.json b/controller-server/src/test/resources/horizon/filters-complex.expected.json
new file mode 100644
index 00000000000..333e79150e4
--- /dev/null
+++ b/controller-server/src/test/resources/horizon/filters-complex.expected.json
@@ -0,0 +1,56 @@
+{
+ "start": 1623080040000,
+ "end": 1623166440000,
+ "executionGraph": [
+  {
+   "id": "q1_m1",
+   "type": "TimeSeriesDataSource",
+   "metric": {
+    "type": "MetricLiteral",
+    "metric": "Vespa.vespa.qrserver.documents_covered.count"
+   },
+   "sourceId": null,
+   "fetchLast": false,
+   "filterId": "filter-ni8"
+  }
+ ],
+ "filters": [
+  {
+   "filter": {
+    "type": "Chain",
+    "op": "AND",
+    "filters": [
+     {
+      "type": "NOT",
+      "filter": {
+       "type": "TagValueLiteralOr",
+       "filter": "tenant1.app1.instance1",
+       "tagKey": "applicationId"
+      }
+     },
+     {
+      "type": "TagValueLiteralOr",
+      "filter": "Public",
+      "tagKey": "system"
+     },
+     {
+      "type": "TagValueRegex",
+      "filter": "(tenant2)\\..*",
+      "tagKey": "applicationId"
+     }
+    ]
+   },
+   "id": "filter-ni8"
+  }
+ ],
+ "serdesConfigs": [
+  {
+   "id": "JsonV3QuerySerdes",
+   "filter": [
+    "summarizer"
+   ]
+  }
+ ],
+ "logLevel": "ERROR",
+ "cacheMode": null
+}
diff --git a/controller-server/src/test/resources/horizon/filters-complex.json b/controller-server/src/test/resources/horizon/filters-complex.json
new file mode 100644
index 00000000000..3acc7fe5044
--- /dev/null
+++ b/controller-server/src/test/resources/horizon/filters-complex.json
@@ -0,0 +1,46 @@
+{
+  "start": 1623080040000,
+  "end": 1623166440000,
+  "executionGraph": [
+    {
+      "id": "q1_m1",
+      "type": "TimeSeriesDataSource",
+      "metric": {
+        "type": "MetricLiteral",
+        "metric": "Vespa.vespa.qrserver.documents_covered.count"
+      },
+      "sourceId": null,
+      "fetchLast": false,
+      "filterId": "filter-ni8"
+    }
+  ],
+  "filters": [
+    {
+      "filter": {
+        "type": "Chain",
+        "op": "AND",
+        "filters": [
+          {
+            "type": "NOT",
+            "filter": {
+              "type": "TagValueLiteralOr",
+              "filter": "tenant1.app1.instance1",
+              "tagKey": "applicationId"
+            }
+          }
+        ]
+      },
+      "id": "filter-ni8"
+    }
+  ],
+  "serdesConfigs": [
+    {
+      "id": "JsonV3QuerySerdes",
+      "filter": [
+        "summarizer"
+      ]
+    }
+  ],
+  "logLevel": "ERROR",
+  "cacheMode": null
+}
diff --git a/controller-server/src/test/resources/horizon/no-filters.expected.json b/controller-server/src/test/resources/horizon/no-filters.expected.json
new file mode 100644
index 00000000000..d2d6407e6b4
--- /dev/null
+++ b/controller-server/src/test/resources/horizon/no-filters.expected.json
@@ -0,0 +1,32 @@
+{
+ "start": 1619301600000,
+ "end": 1623161217471,
+ "executionGraph": [
+  {
+   "id": "q1_m1",
+   "type": "TimeSeriesDataSource",
+   "metric": {
+    "type": "MetricLiteral",
+    "metric": "Vespa.vespa.distributor.vds.distributor.docsstored.average"
+   },
+   "sourceId": null,
+   "fetchLast": false,
+   "filter": {
+    "type": "Chain",
+    "op": "AND",
+    "filters": [
+     {
+      "type": "TagValueLiteralOr",
+      "filter": "Public",
+      "tagKey": "system"
+     },
+     {
+      "type": "TagValueRegex",
+      "filter": "(tenant2|tenant3)\\..*",
+      "tagKey": "applicationId"
+     }
+    ]
+   }
+  }
+ ]
+}
diff --git a/controller-server/src/test/resources/horizon/no-filters.json b/controller-server/src/test/resources/horizon/no-filters.json
new file mode 100644
index 00000000000..3ff80feba02
--- /dev/null
+++ b/controller-server/src/test/resources/horizon/no-filters.json
@@ -0,0 +1,16 @@
+{
+  "start": 1619301600000,
+  "end": 1623161217471,
+  "executionGraph": [
+    {
+      "id": "q1_m1",
+      "type": "TimeSeriesDataSource",
+      "metric": {
+        "type": "MetricLiteral",
+        "metric": "Vespa.vespa.distributor.vds.distributor.docsstored.average"
+      },
+      "sourceId": null,
+      "fetchLast": false
+    }
+  ]
+}
\ No newline at end of file