From 28c3793b4b178a8b549cfc0f6a7e6f6939c70ddc Mon Sep 17 00:00:00 2001
From: Sergey Sidorov <sergey.sidorov@elastic.co>
Date: Fri, 19 Dec 2025 12:36:44 +0000
Subject: [PATCH] throw validation error for instant queries until we support
 them properly

---
 .../xpack/esql/plan/logical/promql/PromqlCommand.java      | 4 ++++
 .../xpack/esql/analysis/promql/PromqlVerifierTests.java    | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/promql/PromqlCommand.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/promql/PromqlCommand.java
index 491fa9dbdcbac..93334826a38e7 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/promql/PromqlCommand.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/promql/PromqlCommand.java
@@ -257,6 +257,10 @@ public String nodeString() {
     @Override
     public void postAnalysisVerification(Failures failures) {
         LogicalPlan p = promqlPlan();
+        if (isInstantQuery()) {
+            failures.add(fail(p, "instant queries are not supported at this time [{}]", sourceText()));
+            return;
+        }
         if (p instanceof AcrossSeriesAggregate == false) {
             failures.add(fail(p, "only aggregations across timeseries are supported at this time (found [{}])", p.sourceText()));
         }
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/promql/PromqlVerifierTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/promql/PromqlVerifierTests.java
index d9fed698913ad..9ad0d6f3955db 100644
--- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/promql/PromqlVerifierTests.java
+++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/promql/PromqlVerifierTests.java
@@ -38,6 +38,13 @@ public void testPromqlMissingAcrossSeriesAggregation() {
         );
     }
 
+    public void testPromqlInstantQuery() {
+        assertThat(
+            error("PROMQL index=test time=\"2025-10-31T00:00:00Z\" (avg(foo))", tsdb),
+            equalTo("1:48: instant queries are not supported at this time [PROMQL index=test time=\"2025-10-31T00:00:00Z\" (avg(foo))]")
+        );
+    }
+
     public void testPromqlStepAndRangeMisaligned() {
         assertThat(
             error("""