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

Appends the saved objects documents count to the CoreUsageData service (#124308) (#124562)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit ad7c8de75a)

# Conflicts:
#	docs/development/core/server/kibana-plugin-core-server.md
#	docs/development/core/server/kibana-plugin-core-server.mergesavedobjectmigrationmaps.md
This commit is contained in:
Christiane (Tina) Heiligers 2022-02-03 12:11:29 -07:00 • committed by GitHub
parent 5b6ae47da7
commit af850953fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 77 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
docs/development/core/server/kibana-plugin-core-server.mergesavedobjectmigrationmaps.md Normal file
View file

@ -0,0 +1,21 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->
[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [mergeSavedObjectMigrationMaps](./kibana-plugin-core-server.mergesavedobjectmigrationmaps.md)
## mergeSavedObjectMigrationMaps variable
Merges two saved object migration maps.
If there is a migration for a given version on only one of the maps, that migration function will be used:
mergeSavedObjectMigrationMaps(<!-- -->{ '1.2.3': f }<!-- -->, { '4.5.6': g }<!-- -->) -<!-- -->&gt; { '1.2.3': f, '4.5.6': g }
If there is a migration for a given version on both maps, the migrations will be composed:
mergeSavedObjectMigrationMaps(<!-- -->{ '1.2.3': f }<!-- -->, { '1.2.3': g }<!-- -->) -<!-- -->&gt; { '1.2.3': (doc, context) =<!-- -->&gt; f(g(doc, context), context) }
<b>Signature:</b>
```typescript
mergeSavedObjectMigrationMaps: (map1: SavedObjectMigrationMap, map2: SavedObjectMigrationMap) => SavedObjectMigrationMap
```

1
src/core/server/core_usage_data/core_usage_data_service.mock.ts
View file

@ -140,6 +140,7 @@ const createStartContractMock = () => {
alias: 'test_index',
primaryStoreSizeBytes: 1,
storeSizeBytes: 1,
savedObjectsDocsCount: 1,
},
],
legacyUrlAliases: {

12
src/core/server/core_usage_data/core_usage_data_service.test.ts
View file

@ -218,6 +218,11 @@ describe('CoreUsageDataService', () => {
},
],
} as any);
elasticsearch.client.asInternalUser.count.mockResolvedValueOnce({
body: {
count: '15',
},
} as any);
elasticsearch.client.asInternalUser.cat.indices.mockResolvedValueOnce({
body: [
{
@ -229,6 +234,11 @@ describe('CoreUsageDataService', () => {
},
],
} as any);
elasticsearch.client.asInternalUser.count.mockResolvedValueOnce({
body: {
count: '10',
},
} as any);
elasticsearch.client.asInternalUser.search.mockResolvedValueOnce({
body: {
hits: { total: { value: 6 } },
@ -384,6 +394,7 @@ describe('CoreUsageDataService', () => {
"docsCount": 10,
"docsDeleted": 10,
"primaryStoreSizeBytes": 2000,
"savedObjectsDocsCount": "15",
"storeSizeBytes": 1000,
},
Object {
@ -391,6 +402,7 @@ describe('CoreUsageDataService', () => {
"docsCount": 20,
"docsDeleted": 20,
"primaryStoreSizeBytes": 4000,
"savedObjectsDocsCount": "10",
"storeSizeBytes": 2000,
},
],

28
src/core/server/core_usage_data/core_usage_data_service.ts
View file

@ -124,11 +124,11 @@ export class CoreUsageDataService
return acc.add(index);
}, new Set<string>())
.values()
).map((index) => {
).map(async (index) => {
// The _cat/indices API returns the _index_ and doesn't return a way
// to map back from the index to the alias. So we have to make an API
// call for every alias
return elasticsearch.client.asInternalUser.cat
// call for every alias. The document count is the lucene document count.
const catIndicesResults = await elasticsearch.client.asInternalUser.cat
.indices<any[]>({
index,
format: 'JSON',
@ -136,6 +136,7 @@ export class CoreUsageDataService
})
.then(({ body }) => {
const stats = body[0];
return {
alias: kibanaOrTaskManagerIndex(index, kibanaIndex),
docsCount: stats['docs.count'] ? parseInt(stats['docs.count'], 10) : 0,
@ -146,6 +147,27 @@ export class CoreUsageDataService
: 0,
};
});
// We use the GET <index>/_count API to get the number of saved objects
// to monitor if the cluster will hit the scalling limit of saved object migrations
const savedObjectsCounts = await elasticsearch.client.asInternalUser
.count({
index,
})
.then(({ body }) => {
return {
savedObjectsDocsCount: body.count ? body.count : 0,
};
});
this.logger.debug(
`Lucene documents count ${catIndicesResults.docsCount} from index ${catIndicesResults.alias}`
);
this.logger.debug(
`Saved objects documents count ${savedObjectsCounts.savedObjectsDocsCount} from index ${catIndicesResults.alias}`
);
return {
...catIndicesResults,
...savedObjectsCounts,
};
})
);
}

1
src/core/server/core_usage_data/types.ts
View file

@ -177,6 +177,7 @@ export interface CoreServicesUsageData {
docsDeleted: number;
storeSizeBytes: number;
primaryStoreSizeBytes: number;
savedObjectsDocsCount: number;
}[];
legacyUrlAliases: {
activeCount: number;

1
src/core/server/server.api.md
View file

@ -425,6 +425,7 @@ export interface CoreServicesUsageData {
docsDeleted: number;
storeSizeBytes: number;
primaryStoreSizeBytes: number;
savedObjectsDocsCount: number;
}[];
legacyUrlAliases: {
activeCount: number;

10
src/plugins/kibana_usage_collection/server/collectors/core/core_usage_collector.ts
View file

@ -355,14 +355,14 @@ export function getCoreUsageCollector(
type: 'long',
_meta: {
description:
'The number of documents in the index, including hidden nested documents.',
'The number of lucene documents in the index, including hidden nested documents.',
},
},
docsDeleted: {
type: 'long',
_meta: {
description:
'The number of deleted documents in the index, including hidden nested documents.',
'The number of deleted lucene documents in the index, including hidden nested documents.',
},
},
alias: {
@ -382,6 +382,12 @@ export function getCoreUsageCollector(
description: 'The size in bytes of the index, for primaries and replicas.',
},
},
savedObjectsDocsCount: {
type: 'long',
_meta: {
description: 'The number of saved objects documents in the index.',
},
},
},
},
legacyUrlAliases: {

10
src/plugins/telemetry/schema/oss_plugins.json
View file

@ -6248,13 +6248,13 @@
"docsCount": {
"type": "long",
"_meta": {
"description": "The number of documents in the index, including hidden nested documents."
"description": "The number of lucene documents in the index, including hidden nested documents."
}
},
"docsDeleted": {
"type": "long",
"_meta": {
"description": "The number of deleted documents in the index, including hidden nested documents."
"description": "The number of deleted lucene documents in the index, including hidden nested documents."
}
},
"alias": {
@ -6274,6 +6274,12 @@
"_meta": {
"description": "The size in bytes of the index, for primaries and replicas."
}
},
"savedObjectsDocsCount": {
"type": "long",
"_meta": {
"description": "The number of saved objects documents in the index."
}
}
}
}