PR feedback

elastic · Dec 15, 2022 · 6893e1f · 6893e1f
1 parent ab851c8
commit 6893e1f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/docs/user/alerting/images/rule-types-es-query-query-type.png b/docs/user/alerting/images/rule-types-es-query-query-type.png
diff --git a/docs/user/alerting/rule-types/es-query.asciidoc b/docs/user/alerting/rule-types/es-query.asciidoc
@@ -10,16 +10,7 @@ threshold condition is met.
 === Create the rule
 
 Fill in the <<defining-rules-general-details, rule details>>, then select 
-*{es} query*.
-
-[float]
-=== Select the query type
-
-{es} query rule can be defined using KQL/Lucene or Query DSL.
-
-[role="screenshot"]
-image::user/alerting/images/rule-types-es-query-query-type.png[Select KQL or DSL query type]
-
+*{es} query*. {es} query rule can be defined using KQL/Lucene or Query DSL.
 
 [float]
 === Define the conditions

diff --git a/x-pack/plugins/stack_alerts/server/rule_types/es_query/executor.ts b/x-pack/plugins/stack_alerts/server/rule_types/es_query/executor.ts
@@ -116,7 +116,7 @@ export async function executor(core: CoreSetup, options: ExecutorOptions<EsQuery
  ...(isGroupAgg ? { group: alertId } : {}),
  });
  const alert = alertFactory.create(
- alertId === UngroupedGroupId ? ConditionMetAlertInstanceId : alertId
+ alertId === UngroupedGroupId && !isGroupAgg ? ConditionMetAlertInstanceId : alertId
  );
  alert
  // store the params we would need to recreate the query that led to this alert instance