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

[ES body removal] @elastic/observability-ui #204873

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+38 −39
Open

[ES body removal] @elastic/observability-ui #204873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26d47b2
[ES `body` removal] `@elastic/observability-ui`
afharo Dec 19, 2024
78b0834
Merge branch 'main' of github.com:elastic/kibana into esclient/remove…
afharo Jan 20, 2025
cae0406
Merge branch 'main' of github.com:elastic/kibana into esclient/remove…
afharo Jan 21, 2025
b7afe1b
Fix types
afharo Jan 21, 2025
0b65266
Merge branch 'main' into esclient/remove-deprecated-body/elastic/obse…
afharo Jan 21, 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
2 changes: 1 addition & 1 deletion x-pack/solutions/observability/packages/utils_server/entities/analyze_documents.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export async function analyzeDocuments({
})
.then((response) => ({
hits: response.hits.hits.map((hit) =>
mapValues(hit.fields!, (value) => (value.length === 1 ? value[0] : value))
mapValues(hit.fields!, (value) => (value?.length === 1 ? value[0] : value))
),
total: response.hits.total,
})),
Expand Down
2 changes: 1 addition & 1 deletion x-pack/solutions/observability/plugins/observability_shared/public/hooks/use_es_search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
import type * as estypes from '@elastic/elasticsearch/lib/api/types';
import { DataPublicPluginStart } from '@kbn/data-plugin/public';
import type { ESSearchResponse } from '@kbn/es-types';
import { useKibana } from '@kbn/kibana-react-plugin/public';
Expand Down
68 changes: 33 additions & 35 deletions x-pack/solutions/observability/plugins/observability_shared/public/hooks/use_values_list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,46 +92,44 @@ export const useValuesList = ({
const { data, loading } = useEsSearch(
createEsParams({
index: dataViewTitle!,
body: {
query: {
bool: {
filter: [
...(filters ?? []),
...(from && to
? [
{
range: {
'@timestamp': {
gte: from,
lte: to,
},
query: {
bool: {
filter: [
...(filters ?? []),
...(from && to
? [
{
range: {
'@timestamp': {
gte: from,
lte: to,
},
},
]
: []),
],
},
},
]
: []),
],
},
size: 0,
aggs: {
values: {
terms: {
field: sourceField,
size: 50,
...(query ? { include: includeClause } : {}),
},
...(cardinalityField
? {
aggs: {
count: {
cardinality: {
field: cardinalityField,
},
},
size: 0,
aggs: {
values: {
terms: {
field: sourceField,
size: 50,
...(query ? { include: includeClause } : {}),
},
...(cardinalityField
? {
aggs: {
count: {
cardinality: {
field: cardinalityField,
},
},
}
: {}),
},
},
}
: {}),
},
},
}),
Expand Down
5 changes: 3 additions & 2 deletions x-pack/solutions/observability/plugins/slo/common/parse_kuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
* 2.0.
*/

import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
import { kqlQuerySchema, QuerySchema } from '@kbn/slo-schema';
import { buildEsQuery, fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';

export function getElasticsearchQueryOrThrow(kuery: QuerySchema = '') {
export function getElasticsearchQueryOrThrow(kuery: QuerySchema = ''): QueryDslQueryContainer {
try {
if (kqlQuerySchema.is(kuery)) {
return toElasticsearchQuery(fromKueryExpression(kuery));
Expand All @@ -23,6 +24,6 @@ export function getElasticsearchQueryOrThrow(kuery: QuerySchema = '') {
);
}
} catch (err) {
return [];
return [] as QueryDslQueryContainer;
}
}