Proxy filtered metadata request

5 files changed, 77 insertions, 3 deletions

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
index 26497a0434a..a71fd812de9 100644
--- 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
@@ -27,7 +27,7 @@
      },
      {
       "type": "TagValueRegex",
-      "filter": "(tenant2|tenant3)\\..*",
+      "filter": "^(tenant2|tenant3)\\..*",
       "tagKey": "applicationId"
      }
     ]
diff --git a/controller-server/src/test/resources/horizon/filters-complex.expected.json b/controller-server/src/test/resources/horizon/filters-complex.expected.json
index 68ccb7895de..b3416f8a410 100644
--- a/controller-server/src/test/resources/horizon/filters-complex.expected.json
+++ b/controller-server/src/test/resources/horizon/filters-complex.expected.json
@@ -35,7 +35,7 @@
      },
      {
       "type": "TagValueRegex",
-      "filter": "(tenant2)\\..*",
+      "filter": "^(tenant2)\\..*",
       "tagKey": "applicationId"
      }
     ]
diff --git a/controller-server/src/test/resources/horizon/filters-meta-query.json b/controller-server/src/test/resources/horizon/filters-meta-query.json
new file mode 100644
index 00000000000..0a9429fd833
--- /dev/null
+++ b/controller-server/src/test/resources/horizon/filters-meta-query.json
@@ -0,0 +1,45 @@
+{
+ "from": 0,
+ "to": 1,
+ "order": "ASCENDING",
+ "type": "TAG_KEYS_AND_VALUES",
+ "source": "",
+ "aggregationSize": 1000,
+ "queries": [
+  {
+   "id": "id-0",
+   "namespace": "Vespa",
+   "filter": {
+    "type": "Chain",
+    "op": "AND",
+    "filters": [
+     {
+      "type": "Chain",
+      "filters": [
+       {
+        "type": "TagValueRegex",
+        "filter": ".*",
+        "tagKey": "applicationId"
+       },
+       {
+        "type": "MetricLiteral",
+        "metric": "vespa.distributor.vds.distributor.docsstored.average|vespa.searchnode.content.proton.resource_usage.disk.average|vespa.searchnode.content.proton.resource_usage.memory.average|vespa.container.peak_qps.max"
+       }
+      ]
+     },
+     {
+      "type": "TagValueLiteralOr",
+      "filter": "public",
+      "tagKey": "system"
+     },
+     {
+      "type": "TagValueRegex",
+      "filter": "^(tenant2|tenant3)\\..*",
+      "tagKey": "applicationId"
+     }
+    ]
+   }
+  }
+ ],
+ "aggregationField": "applicationId"
+}
diff --git a/controller-server/src/test/resources/horizon/meta-query.json b/controller-server/src/test/resources/horizon/meta-query.json
new file mode 100644
index 00000000000..ed59bef5eaa
--- /dev/null
+++ b/controller-server/src/test/resources/horizon/meta-query.json
@@ -0,0 +1,29 @@
+{
+  "from": 0,
+  "to": 1,
+  "order": "ASCENDING",
+  "type": "TAG_KEYS_AND_VALUES",
+  "source": "",
+  "aggregationSize": 1000,
+  "queries": [
+    {
+      "id": "id-0",
+      "namespace": "Vespa",
+      "filter": {
+        "type": "Chain",
+        "filters": [
+          {
+            "type": "TagValueRegex",
+            "filter": ".*",
+            "tagKey": "applicationId"
+          },
+          {
+            "type": "MetricLiteral",
+            "metric": "vespa.distributor.vds.distributor.docsstored.average|vespa.searchnode.content.proton.resource_usage.disk.average|vespa.searchnode.content.proton.resource_usage.memory.average|vespa.container.peak_qps.max"
+          }
+        ]
+      }
+    }
+  ],
+  "aggregationField": "applicationId"
+}
\ No newline at end of file
diff --git a/controller-server/src/test/resources/horizon/no-filters.expected.json b/controller-server/src/test/resources/horizon/no-filters.expected.json
index ab26885b839..35decea21db 100644
--- a/controller-server/src/test/resources/horizon/no-filters.expected.json
+++ b/controller-server/src/test/resources/horizon/no-filters.expected.json
@@ -22,7 +22,7 @@
      },
      {
       "type": "TagValueRegex",
-      "filter": "(tenant2|tenant3)\\..*",
+      "filter": "^(tenant2|tenant3)\\..*",
       "tagKey": "applicationId"
      }
     ]