address PR feedback and fixes checks

elastic · Oct 26, 2022 · f17ffca · f17ffca
1 parent 531bc6e
commit f17ffca
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/x-pack/plugins/apm/common/service_groups.ts b/x-pack/plugins/apm/common/service_groups.ts
@@ -59,7 +59,7 @@ export function validateServiceGroupKuery(kuery: string) {
         isValid: false,
         isParsingError: false,
         message: i18n.translate(
-          'xpack.apm.serviceGroups.selectServicesForm.title',
+          'xpack.apm.serviceGroups.invalidFields.message',
           {
             defaultMessage:
               'Query filter for service group does not support fields [{unsupportedFieldNames}]',

diff --git a/...k/plugins/apm/public/components/app/service_groups/service_group_save/select_services.tsx b/...k/plugins/apm/public/components/app/service_groups/service_group_save/select_services.tsx
@@ -83,9 +83,7 @@ export function SelectServices({
     const { isValid, isParsingError, message } =
       validateServiceGroupKuery(stagedKuery);
     if (isValid || isParsingError) {
-      if (kueryValidationMessage !== '') {
-        setKueryValidationMessage('');
-      }
+      setKueryValidationMessage('');
     } else {
       setKueryValidationMessage(message);
     }

diff --git a/.../plugins/apm/server/routes/alerts/rule_types/anomaly/get_anomalous_event_source_fields.ts b/.../plugins/apm/server/routes/alerts/rule_types/anomaly/get_anomalous_event_source_fields.ts
@@ -35,6 +35,7 @@ export async function getAnomalousEventSourceFields({
     index,
     body: {
       size: 0,
+      track_total_hits: false,
       query: {
         bool: {
           filter: [

diff --git a/...plugins/apm/server/routes/alerts/rule_types/error_count/register_error_count_rule_type.ts b/...plugins/apm/server/routes/alerts/rule_types/error_count/register_error_count_rule_type.ts
@@ -31,6 +31,7 @@ import {
   PROCESSOR_EVENT,
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,
+  TRANSACTION_DURATION,
 } from '../../../../../common/elasticsearch_fieldnames';
 import { environmentQuery } from '../../../../../common/utils/environment_query';
 import { getApmIndices } from '../../../settings/apm_indices/get_apm_indices';
@@ -123,7 +124,8 @@ export function registerErrorCountRuleType({
                       missing: ENVIRONMENT_NOT_DEFINED.value,
                     },
                   ],
-                  size: 10000,
+                  size: 1000,
+                  order: { [TRANSACTION_DURATION]: 'desc' as const },
                 },
                 aggs: getSourceFieldsAgg(),
               },

diff --git a/...es/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.test.ts b/...es/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.test.ts
@@ -24,10 +24,10 @@ describe('registerTransactionDurationRuleType', () => {
         },
       },
       aggregations: {
-        environments: {
+        series: {
           buckets: [
             {
-              key: 'ENVIRONMENT_NOT_DEFINED',
+              key: ['opbeans-java', 'ENVIRONMENT_NOT_DEFINED', 'request'],
               avgLatency: {
                 value: 5500000,
               },

diff --git a/.../routes/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.ts b/.../routes/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.ts
@@ -31,6 +31,7 @@ import {
   SERVICE_NAME,
   TRANSACTION_TYPE,
   SERVICE_ENVIRONMENT,
+  TRANSACTION_DURATION,
 } from '../../../../../common/elasticsearch_fieldnames';
 import {
   ENVIRONMENT_NOT_DEFINED,
@@ -159,7 +160,8 @@ export function registerTransactionDurationRuleType({
                   },
                   { field: TRANSACTION_TYPE },
                 ],
-                size: 10000,
+                size: 1000,
+                order: { [TRANSACTION_DURATION]: 'desc' as const },
               },
               aggs: {
                 ...averageOrPercentileAgg({

diff --git a/...tes/alerts/rule_types/transaction_error_rate/register_transaction_error_rate_rule_type.ts b/...tes/alerts/rule_types/transaction_error_rate/register_transaction_error_rate_rule_type.ts
@@ -34,6 +34,7 @@ import {
   SERVICE_ENVIRONMENT,
   SERVICE_NAME,
   TRANSACTION_TYPE,
+  TRANSACTION_DURATION,
 } from '../../../../../common/elasticsearch_fieldnames';
 import { EventOutcome } from '../../../../../common/event_outcome';
 import { asDecimalOrInteger } from '../../../../../common/utils/formatters';
@@ -154,7 +155,8 @@ export function registerTransactionErrorRateRuleType({
                     },
                     { field: TRANSACTION_TYPE },
                   ],
-                  size: 10000,
+                  size: 1000,
+                  order: { [TRANSACTION_DURATION]: 'desc' as const },
                 },
                 aggs: {
                   outcomes: {