Skip to content

[SLO] file reorg, improvements to badge #213597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baileycash-elastic merged 2 commits into from
Mar 10, 2025
Merged

[SLO] file reorg, improvements to badge #213597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
287ae27
file reorg, improvements to badge
baileycash-elastic Mar 7, 2025
70997eb
Merge branch 'main' into 4347-updates
elasticmachine Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions .../solutions/observability/plugins/slo/public/components/slo/slo_badges/slo_value_badge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import React, { useMemo } from 'react';
import React from 'react';
import { EuiBadge, EuiFlexItem, EuiSkeletonText, EuiToolTip } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { SLOWithSummaryResponse } from '@kbn/slo-schema';
Expand All @@ -23,15 +23,13 @@ export function SloValueBadge({ slo, isLoading }: SloStatusProps) {
const { uiSettings } = useKibana().services;
const percentFormat = uiSettings.get('format:percent:defaultPattern');

const badgeDisplayText = useMemo(() => {
return i18n.translate('xpack.slo.sloStatusBadge.sloObjectiveValue', {
defaultMessage: '{value} / {objective} (Objective)',
values: {
value: hasNoData ? '-' : numeral(slo.summary.sliValue).format(percentFormat),
objective: numeral(slo.objective.target).format(percentFormat),
},
});
}, [slo, percentFormat, hasNoData]);
const badgeDisplayText = i18n.translate('xpack.slo.sloStatusBadge.sloObjectiveValue', {
defaultMessage: '{value} ({objective} objective)',
values: {
value: hasNoData ? '-' : numeral(slo.summary.sliValue).format(percentFormat),
objective: numeral(slo.objective.target).format(percentFormat),
},
});

if (isLoading || !slo) {
return <EuiSkeletonText lines={2} data-test-subj="loadingTitle" />;
Expand Down
6 changes: 3 additions & 3 deletions ...etails/components/overview/definition.tsx → ...ails/components/definition/definition.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import {
toDurationLabel,
toIndicatorTypeLabel,
} from '../../../../utils/slo/labels';
import { ApmIndicatorOverview } from './apm_indicator_overview';
import { DisplayQuery } from './display_query';
import { ApmIndicatorOverview } from '../overview/apm_indicator_overview';
import { DisplayQuery } from '../overview/display_query';
import { DefinitionItem } from './definition_item';
import { SyntheticsIndicatorOverview } from './synthetics_indicator_overview';
import { SyntheticsIndicatorOverview } from '../overview/synthetics_indicator_overview';

export interface Props {
slo: SLOWithSummaryResponse;
Expand Down
0 ...s/components/overview/definition_item.tsx → ...components/definition/definition_item.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ility/plugins/slo/public/pages/slo_details/components/overview/apm_indicator_overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
import React from 'react';
import { useKibana } from '../../../../hooks/use_kibana';
import { convertSliApmParamsToApmAppDeeplinkUrl } from '../../../../utils/slo/convert_sli_apm_params_to_apm_app_deeplink_url';
import { DefinitionItem } from './definition_item';
import { DefinitionItem } from '../definition/definition_item';

interface Props {
slo: SLOWithSummaryResponse;
Expand Down
2 changes: 1 addition & 1 deletion ...servability/plugins/slo/public/pages/slo_details/components/overview/overview.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ComponentStory } from '@storybook/react';

import { KibanaReactStorybookDecorator } from '../../../../utils/kibana_react.storybook_decorator';
import { buildSlo } from '../../../../data/slo/slo';
import { Definition as Component, Props } from './definition';
import { Definition as Component, Props } from '../definition/definition';

export default {
component: Component,
Expand Down
2 changes: 1 addition & 1 deletion ...lugins/slo/public/pages/slo_details/components/overview/synthetics_indicator_overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
syntheticsMonitorLocationQueryLocatorID,
} from '@kbn/observability-plugin/common';
import { useKibana } from '../../../../hooks/use_kibana';
import { DefinitionItem } from './definition_item';
import { DefinitionItem } from '../definition/definition_item';

interface Props {
slo: SLOWithSummaryResponse;
Expand Down
2 changes: 1 addition & 1 deletion ...k/solutions/observability/plugins/slo/public/pages/slo_details/components/slo_details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { BurnRatePanel } from './burn_rate_panel/burn_rate_panel';
import { EventsChartPanel } from './events_chart_panel/events_chart_panel';
import { HistoricalDataCharts } from './historical_data_charts';
import { SLODetailsHistory } from './history/slo_details_history';
import { Definition } from './overview/definition';
import { Definition } from './definition/definition';
import { SloDetailsAlerts } from './slo_detail_alerts';
import { SloHealthCallout } from './slo_health_callout';
import { SloRemoteCallout } from './slo_remote_callout';
Expand Down