Skip to content

Commit 40f2784

Browse files
authored
Rename 'Ingest Node Pipelines' to 'Ingest Pipelines' (#113783)
While Elasticsearch ingest pipelines require a node with the `ingest` role, we don't need to include `ingest node` in the feature name. There are no official plans, but the Elasticsearch team has discussed removing the `ingest` role in the future. This also better aligns the Kibana UI with the Elasticsearch docs. The PR also makes some related changes to the Kibana docs. Relates to elastic/elasticsearch#70253.
1 parent a9a923d commit 40f2784

File tree

17 files changed

+41
-39
lines changed

17 files changed

+41
-39
lines changed

docs/dev-tools/grokdebugger/index.asciidoc

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@ structure it. Grok is good for parsing syslog, apache, and other
99
webserver logs, mysql logs, and in general, any log format that is
1010
written for human consumption.
1111

12-
Grok patterns are supported in the ingest node
13-
{ref}/grok-processor.html[grok processor] and the Logstash
14-
{logstash-ref}/plugins-filters-grok.html[grok filter]. See
15-
{logstash-ref}/plugins-filters-grok.html#_grok_basics[grok basics]
16-
for more information on the syntax for a grok pattern.
17-
18-
The Elastic Stack ships
19-
with more than 120 reusable grok patterns. See
20-
https://github.com/elastic/elasticsearch/tree/master/libs/grok/src/main/resources/patterns[Ingest node grok patterns] and https://github.com/logstash-plugins/logstash-patterns-core/tree/master/patterns[Logstash grok patterns]
21-
for the complete list of patterns.
12+
Grok patterns are supported in {es} {ref}/runtime.html[runtime fields], the {es}
13+
{ref}/grok-processor.html[grok ingest processor], and the {ls}
14+
{logstash-ref}/plugins-filters-grok.html[grok filter]. For syntax, see
15+
{ref}/grok.html[Grokking grok].
16+
17+
The {stack} ships with more than 120 reusable grok patterns. For a complete
18+
list of patterns, see
19+
https://github.com/elastic/elasticsearch/tree/master/libs/grok/src/main/resources/patterns[{es}
20+
grok patterns] and
21+
https://github.com/logstash-plugins/logstash-patterns-core/tree/master/patterns[{ls}
22+
grok patterns].
2223

2324
Because
24-
ingest node and Logstash share the same grok implementation and pattern
25+
{es} and {ls} share the same grok implementation and pattern
2526
libraries, any grok pattern that you create in the *Grok Debugger* will work
26-
in ingest node and Logstash.
27+
in both {es} and {ls}.
2728

2829
[float]
2930
[[grokdebugger-getting-started]]

docs/developer/plugin-list.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ the infrastructure monitoring use-case within Kibana.
458458
459459
460460
|{kib-repo}blob/{branch}/x-pack/plugins/ingest_pipelines/README.md[ingestPipelines]
461-
|The ingest_pipelines plugin provides Kibana support for Elasticsearch's ingest nodes. Please refer to the Elasticsearch documentation for more details.
461+
|The ingest_pipelines plugin provides Kibana support for Elasticsearch's ingest pipelines.
462462
463463
464464
|{kib-repo}blob/{branch}/x-pack/plugins/lens/readme.md[lens]

docs/redirects.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ This content has moved. Refer to <<dashboard, **Dashboard**>>.
293293
This content has moved. Refer to <<dashboard, **Dashboard**>>.
294294

295295
[role="exclude",id="ingest-node-pipelines"]
296-
== Ingest Node Pipelines
296+
== Ingest Pipelines
297297

298298
This content has moved. Refer to {ref}/ingest.html[Ingest pipelines].
299299

docs/user/management.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Consult your administrator if you do not have the appropriate access.
1717
[cols="50, 50"]
1818
|===
1919

20-
| {ref}/ingest.html[Ingest Node Pipelines]
20+
| {ref}/ingest.html[Ingest Pipelines]
2121
| Create and manage ingest pipelines that let you perform common transformations
2222
and enrichments on your data.
2323

docs/user/monitoring/monitoring-metricbeat.asciidoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,9 @@ If you configured the monitoring cluster to use encrypted communications, you
189189
must access it via HTTPS. For example, use a `hosts` setting like
190190
`https://es-mon-1:9200`.
191191

192-
IMPORTANT: The {es} {monitor-features} use ingest pipelines, therefore the
193-
cluster that stores the monitoring data must have at least one ingest node.
192+
IMPORTANT: The {es} {monitor-features} use ingest pipelines. The
193+
cluster that stores the monitoring data must have at least one node with the
194+
`ingest` role.
194195

195196
If the {es} {security-features} are enabled on the monitoring cluster, you
196197
must provide a valid user ID and password so that {metricbeat} can send metrics

x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function TutorialFleetInstructions({ http, basePath, isDarkTheme }: Props) {
8686
'xpack.apm.tutorial.apmServer.fleet.message',
8787
{
8888
defaultMessage:
89-
'The APM integration installs Elasticsearch templates and Ingest Node pipelines for APM data.',
89+
'The APM integration installs Elasticsearch templates and ingest pipelines for APM data.',
9090
}
9191
)}
9292
footer={

x-pack/plugins/ingest_pipelines/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Ingest Node Pipelines UI
1+
# Ingest Pipelines UI
22

33
## Summary
4-
The `ingest_pipelines` plugin provides Kibana support for [Elasticsearch's ingest nodes](https://www.elastic.co/guide/en/elasticsearch/reference/master/ingest.html). Please refer to the Elasticsearch documentation for more details.
4+
The `ingest_pipelines` plugin provides Kibana support for [Elasticsearch's ingest pipelines](https://www.elastic.co/guide/en/elasticsearch/reference/master/ingest.html).
55

6-
This plugin allows Kibana to create, edit, clone and delete ingest node pipelines. It also provides support to simulate a pipeline.
6+
This plugin allows Kibana to create, edit, clone and delete ingest pipelines. It also provides support to simulate a pipeline.
77

88
It requires a Basic license and the following cluster privileges: `manage_pipeline` and `cluster:monitor/nodes/info`.
99

1010
---
1111

1212
## Development
1313

14-
A new app called Ingest Node Pipelines is registered in the Management section and follows a typical CRUD UI pattern. The client-side portion of this app lives in [public/application](public/application) and uses endpoints registered in [server/routes/api](server/routes/api). For more information on the pipeline processors editor component, check out the [component readme](public/application/components/pipeline_processors_editor/README.md).
14+
A new app called Ingest Pipelines is registered in the Management section and follows a typical CRUD UI pattern. The client-side portion of this app lives in [public/application](public/application) and uses endpoints registered in [server/routes/api](server/routes/api). For more information on the pipeline processors editor component, check out the [component readme](public/application/components/pipeline_processors_editor/README.md).
1515

1616
See the [kibana contributing guide](https://github.com/elastic/kibana/blob/master/CONTRIBUTING.md) for instructions on setting up your development environment.
1717

@@ -25,7 +25,7 @@ The app has the following test coverage:
2525

2626
### Quick steps for manual testing
2727

28-
You can run the following request in Console to create an ingest node pipeline:
28+
You can run the following request in Console to create an ingest pipeline:
2929

3030
```
3131
PUT _ingest/pipeline/test_pipeline
@@ -73,7 +73,7 @@ PUT _ingest/pipeline/test_pipeline
7373
}
7474
```
7575

76-
Then, go to the Ingest Node Pipelines UI to edit, delete, clone, or view details of the pipeline.
76+
Then, go to the Ingest Pipelines UI to edit, delete, clone, or view details of the pipeline.
7777

7878
To simulate a pipeline, go to the "Edit" page of your pipeline. Click the "Add documents" link under the "Processors" section. You may add the following sample documents to test the pipeline:
7979

x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_list.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ describe('<PipelinesList />', () => {
5252

5353
// Verify app title
5454
expect(exists('appTitle')).toBe(true);
55-
expect(find('appTitle').text()).toEqual('Ingest Node Pipelines');
55+
expect(find('appTitle').text()).toEqual('Ingest Pipelines');
5656

5757
// Verify documentation link
5858
expect(exists('documentationLink')).toBe(true);
59-
expect(find('documentationLink').text()).toBe('Ingest Node Pipelines docs');
59+
expect(find('documentationLink').text()).toBe('Ingest Pipelines docs');
6060

6161
// Verify create button exists
6262
expect(exists('createPipelineButton')).toBe(true);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ export const mapProcessorTypeToDescriptor: MapProcessorTypeToDescriptor = {
557557
defaultMessage: 'Pipeline',
558558
}),
559559
typeDescription: i18n.translate('xpack.ingestPipelines.processors.description.pipeline', {
560-
defaultMessage: 'Runs another ingest node pipeline.',
560+
defaultMessage: 'Runs another ingest pipeline.',
561561
}),
562562
getDefaultDescription: ({ name }) =>
563563
i18n.translate('xpack.ingestPipelines.processors.defaultDescription.pipeline', {

x-pack/plugins/ingest_pipelines/public/application/sections/pipelines_list/main.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ export const PipelinesList: React.FunctionComponent<RouteComponentProps> = ({
153153
<span data-test-subj="appTitle">
154154
<FormattedMessage
155155
id="xpack.ingestPipelines.list.listTitle"
156-
defaultMessage="Ingest Node Pipelines"
156+
defaultMessage="Ingest Pipelines"
157157
/>
158158
</span>
159159
}
@@ -172,7 +172,7 @@ export const PipelinesList: React.FunctionComponent<RouteComponentProps> = ({
172172
>
173173
<FormattedMessage
174174
id="xpack.ingestPipelines.list.pipelinesDocsLinkText"
175-
defaultMessage="Ingest Node Pipelines docs"
175+
defaultMessage="Ingest Pipelines docs"
176176
/>
177177
</EuiButtonEmpty>,
178178
]}

x-pack/plugins/ingest_pipelines/public/application/services/breadcrumbs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { ManagementAppMountParams } from '../../../../../../src/plugins/manageme
1111
type SetBreadcrumbs = ManagementAppMountParams['setBreadcrumbs'];
1212

1313
const homeBreadcrumbText = i18n.translate('xpack.ingestPipelines.breadcrumb.pipelinesLabel', {
14-
defaultMessage: 'Ingest Node Pipelines',
14+
defaultMessage: 'Ingest Pipelines',
1515
});
1616

1717
export class BreadcrumbService {

x-pack/plugins/ingest_pipelines/public/plugin.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class IngestPipelinesPlugin
2525
apiService.setup(http, uiMetricService);
2626

2727
const pluginName = i18n.translate('xpack.ingestPipelines.appTitle', {
28-
defaultMessage: 'Ingest Node Pipelines',
28+
defaultMessage: 'Ingest Pipelines',
2929
});
3030

3131
management.sections.section.ingest.registerApp({

x-pack/test/accessibility/apps/ingest_node_pipelines.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ export default function ({ getService, getPageObjects }: any) {
1414
const log = getService('log');
1515
const a11y = getService('a11y'); /* this is the wrapping service around axe */
1616

17-
describe('Ingest Node Pipelines', async () => {
17+
describe('Ingest Pipelines', async () => {
1818
before(async () => {
1919
await putSamplePipeline(esClient);
2020
await common.navigateToApp('ingestPipelines');
2121
});
2222

2323
it('List View', async () => {
24-
await retry.waitFor('Ingest Node Pipelines page to be visible', async () => {
24+
await retry.waitFor('Ingest Pipelines page to be visible', async () => {
2525
await common.navigateToApp('ingestPipelines');
2626
return testSubjects.exists('pipelineDetailsLink') ? true : false;
2727
});

x-pack/test/api_integration/apis/management/ingest_pipelines/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import { FtrProviderContext } from '../../../ftr_provider_context';
99

1010
export default function ({ loadTestFile }: FtrProviderContext) {
11-
describe('Ingest Node Pipelines', () => {
11+
describe('Ingest Pipelines', () => {
1212
loadTestFile(require.resolve('./ingest_pipelines'));
1313
});
1414
}

x-pack/test/api_integration/apis/management/ingest_pipelines/ingest_pipelines.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export default function ({ getService }: FtrProviderContext) {
145145
await createPipeline({ body: PIPELINE, id: PIPELINE_ID }, true);
146146
} catch (err) {
147147
// eslint-disable-next-line no-console
148-
console.log('[Setup error] Error creating ingest node pipeline');
148+
console.log('[Setup error] Error creating ingest pipeline');
149149
throw err;
150150
}
151151
});
@@ -225,7 +225,7 @@ export default function ({ getService }: FtrProviderContext) {
225225
await createPipeline({ body: PIPELINE, id: PIPELINE_ID }, true);
226226
} catch (err) {
227227
// eslint-disable-next-line no-console
228-
console.log('[Setup error] Error creating ingest node pipeline');
228+
console.log('[Setup error] Error creating ingest pipeline');
229229
throw err;
230230
}
231231
});

x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
6060
it('should render the "Ingest" section with ingest pipelines', async () => {
6161
await PageObjects.common.navigateToApp('management');
6262
const sections = await managementMenu.getSections();
63-
// We gave the ingest node pipelines user access to advanced settings to allow them to use ingest node pipelines.
63+
// We gave the ingest pipelines user access to advanced settings to allow them to use ingest pipelines.
6464
// See https://github.com/elastic/kibana/pull/102409/
6565
expect(sections).to.have.length(2);
6666
expect(sections[0]).to.eql({

x-pack/test/functional/apps/ingest_pipelines/ingest_pipelines.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
2929
});
3030

3131
it('Loads the app', async () => {
32-
log.debug('Checking for section heading to say Ingest Node Pipelines.');
32+
log.debug('Checking for section heading to say Ingest Pipelines.');
3333

3434
const headingText = await pageObjects.ingestPipelines.sectionHeadingText();
35-
expect(headingText).to.be('Ingest Node Pipelines');
35+
expect(headingText).to.be('Ingest Pipelines');
3636
});
3737

3838
it('Creates a pipeline', async () => {

0 commit comments

Comments
 (0)