github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

[8.16] [ip location processor] provider case fixes (#196735) (#196932)

Browse source 
# Backport

This will backport the following commits from `main` to `8.16`:
- [[ip location processor] provider case fixes
(#196735)](https://github.com/elastic/kibana/pull/196735)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Joe
Gallo","email":"joe.gallo@elastic.co"},"sourceCommit":{"committedDate":"2024-10-18T17:48:21Z","message":"[ip
location processor] provider case fixes
(#196735)","sha":"9fae77470adcb69e094e806deca518dfcc89f424","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Kibana
Management","release_note:skip","v9.0.0","Feature:Ingest Node
Pipelines","backport:prev-minor","v8.16.0","v8.17.0"],"title":"[ip
location processor] provider case
fixes","number":196735,"url":"https://github.com/elastic/kibana/pull/196735","mergeCommit":{"message":"[ip
location processor] provider case fixes
(#196735)","sha":"9fae77470adcb69e094e806deca518dfcc89f424"}},"sourceBranch":"main","suggestedTargetBranches":["8.16","8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/196735","number":196735,"mergeCommit":{"message":"[ip
location processor] provider case fixes
(#196735)","sha":"9fae77470adcb69e094e806deca518dfcc89f424"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.x","label":"v8.17.0","branchLabelMappingKey":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Joe Gallo <joe.gallo@elastic.co>
This commit is contained in:
Kibana Machine 2024-10-19 06:29:13 +11:00 • committed by GitHub
parent e0d0ff9d7f
commit 849235a69a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
x-pack/plugins/ingest_pipelines/__jest__/client_integration/manage_processors.test.tsx
View file

@ -73,7 +73,7 @@ describe('<ManageProcessors />', () => {
expect(row).toEqual([
database.name,
database.type === 'maxmind' ? 'MaxMind' : 'IPInfo',
database.type === 'maxmind' ? 'MaxMind' : 'IPinfo',
'',
]);
});
@ -122,7 +122,7 @@ describe('<ManageProcessors />', () => {
});
});
it('creates an IPInfo database when none with the same name exists', async () => {
it('creates an IPinfo database when none with the same name exists', async () => {
const { actions, exists } = testBed;
const databaseName = 'ASN';
httpRequestsMockHelpers.setCreateDatabasesResponse({

2
x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/shared/map_processor_type_to_form.tsx
View file

@ -467,7 +467,7 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
}),
typeDescription: i18n.translate('xpack.ingestPipelines.processors.description.geoip', {
defaultMessage:
'Adds geo data based on an IP address. Uses geo data from a Maxmind database file.',
'Adds geo data based on an IP address. Uses geo data from a MaxMind database file.',
}),
getDefaultDescription: ({ field }) =>
i18n.translate('xpack.ingestPipelines.processors.defaultDescription.geoip', {

4
x-pack/plugins/ingest_pipelines/public/application/sections/manage_processors/constants.ts
View file

@ -20,7 +20,7 @@ export const DATABASE_TYPE_OPTIONS = [
{
value: 'ipinfo',
text: i18n.translate('xpack.ingestPipelines.manageProcessors.geoip.ipinfoDatabaseType', {
defaultMessage: 'IPInfo',
defaultMessage: 'IPinfo',
}),
},
];
@ -153,7 +153,7 @@ export const getTypeLabel = (type: GeoipDatabase['type']): string => {
}
case 'ipinfo': {
return i18n.translate('xpack.ingestPipelines.manageProcessors.geoip.list.typeIpinfoLabel', {
defaultMessage: 'IPInfo',
defaultMessage: 'IPinfo',
});
}
case 'web': {

4
x-pack/test/functional/apps/ingest_pipelines/manage_processors.ts
View file

@ -52,7 +52,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
expect(databaseExists).to.be(true);
});
it('Create an IPInfo database', async () => {
it('Create an IPinfo database', async () => {
await pageObjects.ingestPipelines.openCreateDatabaseModal();
await pageObjects.ingestPipelines.fillAddDatabaseForm('ipinfo', 'asn');
await pageObjects.ingestPipelines.clickAddDatabaseButton();
@ -80,7 +80,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
database.includes(ipInfoDatabaseName)
);
expect(ipInfoDatabaseRow).to.contain(ipInfoDatabaseName);
expect(ipInfoDatabaseRow).to.contain('IPInfo');
expect(ipInfoDatabaseRow).to.contain('IPinfo');
});
it('Modal to delete a database', async () => {