Merge branch 'main' into custom-field-description

elastic · Mar 7, 2024 · 1bf3c80 · 1bf3c80
2 parents 8b99b14 + cfd1961
commit 1bf3c80
Show file tree

Hide file tree

Showing 10 changed files with 103 additions and 37 deletions.
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts b/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts
@@ -50,6 +50,7 @@ export type Integration = rt.TypeOf<typeof integrationRt>;
 export const degradedDocsRt = rt.type({
   dataset: rt.string,
   percentage: rt.number,
+  count: rt.number,
 });
 
 export type DegradedDocs = rt.TypeOf<typeof degradedDocsRt>;

diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/constants.ts b/x-pack/plugins/observability_solution/dataset_quality/common/constants.ts
@@ -18,3 +18,4 @@ export const DEFAULT_SORT_DIRECTION = 'asc';
 export const NONE = 'none';
 
 export const DEFAULT_TIME_RANGE = { from: 'now-24h', to: 'now' };
+export const DEFAULT_DEGRADED_DOCS = { percentage: 0, count: 0 };
diff --git a/...gins/observability_solution/dataset_quality/common/data_streams_stats/data_stream_stat.ts b/...gins/observability_solution/dataset_quality/common/data_streams_stats/data_stream_stat.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { DEFAULT_DEGRADED_DOCS } from '../constants';
 import { DataStreamType } from '../types';
 import { indexNameToDataStreamParts } from '../utils';
 import { Integration } from './integration';
@@ -20,7 +21,10 @@ export class DataStreamStat {
   sizeBytes?: DataStreamStatType['sizeBytes'];
   lastActivity?: DataStreamStatType['lastActivity'];
   integration?: Integration;
-  degradedDocs?: number;
+  degradedDocs: {
+    percentage: number;
+    count: number;
+  };
 
   private constructor(dataStreamStat: DataStreamStat) {
     this.rawName = dataStreamStat.rawName;
@@ -32,7 +36,10 @@ export class DataStreamStat {
     this.sizeBytes = dataStreamStat.sizeBytes;
     this.lastActivity = dataStreamStat.lastActivity;
     this.integration = dataStreamStat.integration;
-    this.degradedDocs = dataStreamStat.degradedDocs;
+    this.degradedDocs = {
+      percentage: dataStreamStat.degradedDocs.percentage,
+      count: dataStreamStat.degradedDocs.count,
+    };
   }
 
   public static create(dataStreamStat: DataStreamStatType) {
@@ -50,6 +57,7 @@ export class DataStreamStat {
       integration: dataStreamStat.integration
         ? Integration.create(dataStreamStat.integration)
         : undefined,
+      degradedDocs: DEFAULT_DEGRADED_DOCS,
     };
 
     return new DataStreamStat(dataStreamStatProps);

diff --git a/...s/observability_solution/dataset_quality/common/data_streams_stats/malformed_docs_stat.ts b/...s/observability_solution/dataset_quality/common/data_streams_stats/malformed_docs_stat.ts
@@ -10,10 +10,12 @@ import { DegradedDocsStatType } from './types';
 export class DegradedDocsStat {
   dataset: DegradedDocsStatType['dataset'];
   percentage: DegradedDocsStatType['percentage'];
+  count: DegradedDocsStatType['count'];
 
   private constructor(degradedDocsStat: DegradedDocsStat) {
     this.dataset = degradedDocsStat.dataset;
     this.percentage = degradedDocsStat.percentage;
+    this.count = degradedDocsStat.count;
   }
 
   public static create(degradedDocsStat: DegradedDocsStatType) {

diff --git a/...bservability_solution/dataset_quality/public/components/dataset_quality/table/columns.tsx b/...bservability_solution/dataset_quality/public/components/dataset_quality/table/columns.tsx
@@ -207,7 +207,7 @@ export const getDatasetQualityTableColumns = ({
           </span>
         </EuiToolTip>
       ),
-      field: 'degradedDocs',
+      field: 'degradedDocs.percentage',
       sortable: true,
       render: (_, dataStreamStat: DataStreamStat) => (
         <DegradedDocsPercentageLink

diff --git a/...dataset_quality/public/components/dataset_quality/table/degraded_docs_percentage_link.tsx b/...dataset_quality/public/components/dataset_quality/table/degraded_docs_percentage_link.tsx
@@ -18,27 +18,29 @@ export const DegradedDocsPercentageLink = ({
   isLoading: boolean;
   dataStreamStat: DataStreamStat;
 }) => {
+  const {
+    degradedDocs: { percentage, count },
+  } = dataStreamStat;
+
   const logsExplorerLinkProps = useLinkToLogsExplorer({
     dataStreamStat,
     query: { language: 'kuery', query: '_ignored:*' },
   });
 
   return (
-    <>
-      <EuiSkeletonRectangle width="50px" height="20px" borderRadius="m" isLoading={isLoading}>
-        <EuiFlexGroup alignItems="center" gutterSize="s">
-          {dataStreamStat.degradedDocs ? (
-            <EuiLink
-              data-test-subj="datasetQualityDegradedDocsPercentageLink"
-              {...logsExplorerLinkProps}
-            >
-              <QualityPercentageIndicator percentage={dataStreamStat.degradedDocs} />
-            </EuiLink>
-          ) : (
-            <QualityPercentageIndicator percentage={dataStreamStat.degradedDocs} />
-          )}
-        </EuiFlexGroup>
-      </EuiSkeletonRectangle>
-    </>
+    <EuiSkeletonRectangle width="50px" height="20px" borderRadius="m" isLoading={isLoading}>
+      <EuiFlexGroup alignItems="center" gutterSize="s">
+        {percentage ? (
+          <EuiLink
+            data-test-subj="datasetQualityDegradedDocsPercentageLink"
+            {...logsExplorerLinkProps}
+          >
+            <QualityPercentageIndicator percentage={percentage} degradedDocsCount={count} />
+          </EuiLink>
+        ) : (
+          <QualityPercentageIndicator percentage={percentage} />
+        )}
+      </EuiFlexGroup>
+    </EuiSkeletonRectangle>
   );
 };
diff --git a/...ity_solution/dataset_quality/public/components/quality_indicator/percentage_indicator.tsx b/...ity_solution/dataset_quality/public/components/quality_indicator/percentage_indicator.tsx
@@ -5,20 +5,57 @@
  * 2.0.
  */
 
-import { EuiText } from '@elastic/eui';
+import { EuiIcon, EuiText, EuiToolTip } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { FormattedNumber } from '@kbn/i18n-react';
 import React from 'react';
 import { mapPercentageToQuality } from './helpers';
 import { QualityIndicator } from './indicator';
 
-export function QualityPercentageIndicator({ percentage = 0 }: { percentage?: number }) {
+const FEW_DEGRADED_DOCS_THRESHOLD = 0.0005;
+
+export function QualityPercentageIndicator({
+  percentage,
+  degradedDocsCount,
+}: {
+  percentage: number;
+  degradedDocsCount?: number;
+}) {
   const quality = mapPercentageToQuality(percentage);
 
-  const description = (
-    <EuiText size="s">
-      <FormattedNumber value={percentage} />%
-    </EuiText>
+  const isFewDegradedDocsAvailable = percentage && percentage < FEW_DEGRADED_DOCS_THRESHOLD;
+
+  const description = isFewDegradedDocsAvailable ? (
+    <DatasetWithFewDegradedDocs degradedDocsCount={degradedDocsCount} />
+  ) : (
+    <DatasetWithManyDegradedDocs percentage={percentage} />
   );
 
   return <QualityIndicator quality={quality} description={description} />;
 }
+
+const DatasetWithFewDegradedDocs = ({ degradedDocsCount }: { degradedDocsCount?: number }) => {
+  return (
+    <EuiText size="s">
+      ~0%{' '}
+      <EuiToolTip
+        content={i18n.translate('xpack.datasetQuality.fewDegradedDocsTooltip', {
+          defaultMessage: '{degradedDocsCount} degraded docs in this dataset.',
+          values: {
+            degradedDocsCount,
+          },
+        })}
+      >
+        <EuiIcon type="warning" color="warning" size="s" />
+      </EuiToolTip>
+    </EuiText>
+  );
+};
+
+const DatasetWithManyDegradedDocs = ({ percentage }: { percentage: number }) => {
+  return (
+    <EuiText size="s">
+      <FormattedNumber value={percentage} />%
+    </EuiText>
+  );
+};
diff --git a/...servability_solution/dataset_quality/public/utils/merge_degraded_docs_into_datastreams.ts b/...servability_solution/dataset_quality/public/utils/merge_degraded_docs_into_datastreams.ts
@@ -12,15 +12,20 @@ export function mergeDegradedStatsIntoDataStreams(
   dataStreamStats: DataStreamStat[],
   degradedDocStats: DegradedDocsStat[]
 ) {
-  const degradedMap: Record<DegradedDocsStat['dataset'], DegradedDocsStat['percentage']> =
-    degradedDocStats.reduce(
-      (degradedMapAcc, { dataset, percentage }) =>
-        Object.assign(degradedMapAcc, { [dataset]: percentage }),
-      {}
-    );
+  const degradedMap: Record<
+    DegradedDocsStat['dataset'],
+    {
+      percentage: DegradedDocsStat['percentage'];
+      count: DegradedDocsStat['count'];
+    }
+  > = degradedDocStats.reduce(
+    (degradedMapAcc, { dataset, percentage, count }) =>
+      Object.assign(degradedMapAcc, { [dataset]: { percentage, count } }),
+    {}
+  );
 
   return dataStreamStats?.map((dataStream) => ({
     ...dataStream,
-    degradedDocs: degradedMap[dataStream.rawName],
+    degradedDocs: degradedMap[dataStream.rawName] || dataStream.degradedDocs,
   }));
 }
diff --git a/...ns/observability_solution/dataset_quality/server/routes/data_streams/get_degraded_docs.ts b/...ns/observability_solution/dataset_quality/server/routes/data_streams/get_degraded_docs.ts
@@ -86,6 +86,7 @@ export async function getDegradedDocsPaginated(options: {
     response.aggregations?.datasets.buckets.map((bucket) => ({
       dataset: `${type}-${bucket.key.dataset}-${bucket.key.namespace}`,
       percentage: (bucket.degraded.doc_count * 100) / bucket.doc_count,
+      count: bucket.degraded.doc_count,
     })) ?? [];
 
   const degradedDocs = [...prevResults, ...currDegradedDocs];

diff --git a/x-pack/test/dataset_quality_api_integration/tests/data_streams/degraded_docs.spec.ts b/x-pack/test/dataset_quality_api_integration/tests/data_streams/degraded_docs.spec.ts
@@ -70,16 +70,25 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         const stats = await callApiAs('datasetQualityLogsUser');
         expect(stats.body.degradedDocs.length).to.be(2);
 
-        const percentages = stats.body.degradedDocs.reduce(
+        const degradedDocsStats = stats.body.degradedDocs.reduce(
           (acc, curr) => ({
             ...acc,
-            [curr.dataset]: curr.percentage,
+            [curr.dataset]: {
+              percentage: curr.percentage,
+              count: curr.count,
+            },
           }),
-          {} as Record<string, number>
+          {} as Record<string, { percentage: number; count: number }>
         );
 
-        expect(percentages['logs-synth.1-default']).to.be(0);
-        expect(percentages['logs-synth.2-default']).to.be(100);
+        expect(degradedDocsStats['logs-synth.1-default']).to.eql({
+          percentage: 0,
+          count: 0,
+        });
+        expect(degradedDocsStats['logs-synth.2-default']).to.eql({
+          percentage: 100,
+          count: 1,
+        });
       });
 
       after(async () => {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ export const DEFAULT_SORT_DIRECTION = 'asc';
		export const NONE = 'none';

		export const DEFAULT_TIME_RANGE = { from: 'now-24h', to: 'now' };
		export const DEFAULT_DEGRADED_DOCS = { percentage: 0, count: 0 };