Skip to content
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

[8.16] [SLO] Overview embeddable chart use proper theme !! (#198299) #198405

Merged
merged 1 commit into from
Oct 30, 2024
Merged

[8.16] [SLO] Overview embeddable chart use proper theme !! (#198299) #198405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 19 additions & 5 deletions ...k/plugins/observability_solution/slo/public/embeddable/slo/overview/slo_overview_grid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import React from 'react';
import { ALL_VALUE, HistoricalSummaryResponse, SLOWithSummaryResponse } from '@kbn/slo-schema';
import {
Chart,
DARK_THEME,
isMetricElementEvent,
Metric,
MetricTrendShape,
Expand Down Expand Up @@ -73,12 +72,18 @@ const getSloChartData = ({
};
};

const ROW_HEIGHT = 220;
const ITEMS_PER_ROW = 4;

export function SloCardChartList({ sloId }: { sloId: string }) {
const {
http: { basePath },
uiSettings,
charts,
} = useKibana().services;

const baseTheme = charts.theme.useChartsBaseTheme();

const [selectedSlo, setSelectedSlo] = React.useState<SLOWithSummaryResponse | null>(null);

const kqlQuery = `slo.id:"${sloId}"`;
Expand All @@ -89,6 +94,7 @@ export function SloCardChartList({ sloId }: { sloId: string }) {

const { data: activeAlertsBySlo } = useFetchActiveAlerts({
sloIdsAndInstanceIds: [[sloId, ALL_VALUE]],
rangeFrom: 'now-24h',
});

const { data: rulesBySlo } = useFetchRulesForSlo({
Expand Down Expand Up @@ -151,16 +157,24 @@ export function SloCardChartList({ sloId }: { sloId: string }) {
);
}

const height = sloList?.results
? ROW_HEIGHT * Math.ceil(sloList.results.length / ITEMS_PER_ROW)
: ROW_HEIGHT;

return (
<>
<div data-shared-item="" style={{ width: '100%' }}>
<Chart>
<div data-shared-item="" style={{ width: '100%', overflow: 'auto' }}>
<Chart
size={{
height,
}}
>
<Settings
baseTheme={DARK_THEME}
baseTheme={baseTheme}
onElementClick={([d]) => {
if (isMetricElementEvent(d)) {
const { columnIndex, rowIndex } = d;
const slo = sloList?.results[rowIndex * 4 + columnIndex];
const slo = sloList?.results[rowIndex * ITEMS_PER_ROW + columnIndex];
setSelectedSlo(slo ?? null);
}
}}
Expand Down
4 changes: 3 additions & 1 deletion x-pack/plugins/observability_solution/slo/public/hooks/use_fetch_active_alerts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ type SloIdAndInstanceId = [string, string];
interface Params {
sloIdsAndInstanceIds: SloIdAndInstanceId[];
shouldRefetch?: boolean;
rangeFrom?: string;
}

export interface UseFetchActiveAlerts {
Expand All @@ -46,6 +47,7 @@ const EMPTY_ACTIVE_ALERTS_MAP = new ActiveAlerts();
export function useFetchActiveAlerts({
sloIdsAndInstanceIds = [],
shouldRefetch = false,
rangeFrom = 'now-5m/m',
}: Params): UseFetchActiveAlerts {
const { http } = useKibana().services;

Expand All @@ -63,7 +65,7 @@ export function useFetchActiveAlerts({
{
range: {
'@timestamp': {
gte: 'now-5m/m',
gte: rangeFrom,
},
},
},
Expand Down
9 changes: 8 additions & 1 deletion ...bservability_solution/slo/public/pages/slos/components/card_view/slo_card_item_badges.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { SLOWithSummaryResponse } from '@kbn/slo-schema';
import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
import React, { useCallback } from 'react';
import styled from 'styled-components';
import { SloIndicatorTypeBadge } from '../badges/slo_indicator_type_badge';
import { SloActiveAlertsBadge } from '../../../../components/slo/slo_status_badge/slo_active_alerts_badge';
import { BurnRateRuleParams } from '../../../../typings';
import { useUrlSearchState } from '../../hooks/use_url_search_state';
Expand Down Expand Up @@ -45,6 +46,11 @@ export function SloCardItemBadges({ slo, activeAlerts, rules, handleCreateRule }
[onStateChange]
);

const isRemote = !!slo.remote;

// in this case, there is more space to display tags
const numberOfTagsToDisplay = !isRemote || (rules ?? []).length > 0 ? 2 : 1;

return (
<Container
onClick={(evt) => {
Expand All @@ -57,13 +63,14 @@ export function SloCardItemBadges({ slo, activeAlerts, rules, handleCreateRule }
) : (
<>
<SloActiveAlertsBadge slo={slo} activeAlerts={activeAlerts} viewMode="compact" />
<SloIndicatorTypeBadge slo={slo} color="default" />
<SLOCardItemInstanceBadge slo={slo} />
<SloRulesBadge rules={rules} onClick={handleCreateRule} isRemote={!!slo.remote} />
<SloTimeWindowBadge slo={slo} color="default" />
<SloRemoteBadge slo={slo} />
<SloTagsList
tags={slo.tags}
numberOfTagsToDisplay={1}
numberOfTagsToDisplay={numberOfTagsToDisplay}
color="default"
ignoreEmpty
onClick={onTagClick}
Expand Down