github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[APM] Update alert rule producer terms in getServicesAlerts query (#203100)

Browse source 
## Summary

This PR continues the work from
https://github.com/elastic/kibana/issues/201565.
We missed updating the alert rules in the `getServicesAlerts` function,
so this fixes that.

There's an ongoing
[issue](https://github.com/elastic/kibana/issues/202415) to test the
alert counts across solutions and ensure it works as expected in all
scenarios.

---------

Co-authored-by: Cauê Marcondes <55978943+cauemarcondes@users.noreply.github.com>
This commit is contained in:
Irene Blanco 2024-12-05 16:35:15 +01:00 • committed by GitHub
parent 6178e8295d
commit b210a3e6aa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/observability_solution/apm/common/alerting/config/apm_alerting_feature_ids.ts
View file

@ -11,7 +11,7 @@ import {
type ValidFeatureId,
} from '@kbn/rule-data-utils';
export const apmAlertingConsumers: ValidFeatureId[] = [
export const APM_ALERTING_CONSUMERS: ValidFeatureId[] = [
AlertConsumers.LOGS,
AlertConsumers.APM,
AlertConsumers.SLO,
@ -20,4 +20,4 @@ export const apmAlertingConsumers: ValidFeatureId[] = [
AlertConsumers.ALERTS,
];
export const apmAlertingRuleTypeIds: string[] = [...OBSERVABILITY_RULE_TYPE_IDS];
export const APM_ALERTING_RULE_TYPE_IDS: string[] = [...OBSERVABILITY_RULE_TYPE_IDS];

8
x-pack/plugins/observability_solution/apm/public/components/app/alerts_overview/index.tsx
View file

@ -14,8 +14,8 @@ import { BoolQuery } from '@kbn/es-query';
import { AlertConsumers } from '@kbn/rule-data-utils';
import { useKibana } from '@kbn/kibana-react-plugin/public';
import {
apmAlertingConsumers,
apmAlertingRuleTypeIds,
APM_ALERTING_CONSUMERS,
APM_ALERTING_RULE_TYPE_IDS,
} from '../../../../common/alerting/config/apm_alerting_feature_ids';
import { ApmPluginStartDeps } from '../../../plugin';
import { useAnyOfApmParams } from '../../../hooks/use_apm_params';
@ -111,8 +111,8 @@ export function AlertsOverview() {
alertsTableConfigurationRegistry={alertsTableConfigurationRegistry}
id={'service-overview-alerts'}
configurationId={AlertConsumers.OBSERVABILITY}
ruleTypeIds={apmAlertingRuleTypeIds}
consumers={apmAlertingConsumers}
ruleTypeIds={APM_ALERTING_RULE_TYPE_IDS}
consumers={APM_ALERTING_CONSUMERS}
query={esQuery}
showAlertStatusWithFlapping
cellContext={{ observabilityRuleTypeRegistry }}

6
x-pack/plugins/observability_solution/apm/server/lib/helpers/get_apm_alerts_client.ts
View file

@ -12,7 +12,7 @@ import { DataTier } from '@kbn/observability-shared-plugin/common';
import { searchExcludedDataTiers } from '@kbn/observability-plugin/common/ui_settings_keys';
import { estypes } from '@elastic/elasticsearch';
import { getDataTierFilterCombined } from '@kbn/apm-data-access-plugin/server/utils';
import { apmAlertingRuleTypeIds } from '../../../common/alerting/config/apm_alerting_feature_ids';
import { APM_ALERTING_RULE_TYPE_IDS } from '../../../common/alerting/config/apm_alerting_feature_ids';
import type { MinimalAPMRouteHandlerResources } from '../../routes/apm_routes/register_apm_server_routes';
export type ApmAlertsClient = Awaited<ReturnType<typeof getApmAlertsClient>>;
@ -32,7 +32,9 @@ export async function getApmAlertsClient({
const ruleRegistryPluginStart = await plugins.ruleRegistry.start();
const alertsClient = await ruleRegistryPluginStart.getRacClientWithRequest(request);
const apmAlertsIndices = await alertsClient.getAuthorizedAlertsIndices(apmAlertingRuleTypeIds);
const apmAlertsIndices = await alertsClient.getAuthorizedAlertsIndices(
APM_ALERTING_RULE_TYPE_IDS
);
if (!apmAlertsIndices || isEmpty(apmAlertsIndices)) {
throw Error('No alert indices exist for "apm"');

4
x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_service_alerts.ts
View file

@ -18,7 +18,7 @@ import {
ALERT_STATUS_ACTIVE,
ALERT_UUID,
} from '@kbn/rule-data-utils';
import { observabilityFeatureId } from '@kbn/observability-shared-plugin/common';
import { APM_ALERTING_CONSUMERS } from '../../../../common/alerting/config/apm_alerting_feature_ids';
import { SERVICE_NAME } from '../../../../common/es_fields/apm';
import { ServiceGroup } from '../../../../common/service_groups';
import { ApmAlertsClient } from '../../../lib/helpers/get_apm_alerts_client';
@ -58,7 +58,7 @@ export async function getServicesAlerts({
query: {
bool: {
filter: [
...termsQuery(ALERT_RULE_PRODUCER, 'apm', observabilityFeatureId),
...termsQuery(ALERT_RULE_PRODUCER, ...APM_ALERTING_CONSUMERS),
...termQuery(ALERT_STATUS, ALERT_STATUS_ACTIVE),
...rangeQuery(start, end),
...kqlQuery(kuery),