Skip to content

Commit f46ee61

Browse files
fhennigmaltesander
andauthored
docs: various small docs fixes (#683)
* various small docs fixes * ~ * Apply suggestions from code review * Update docs/modules/nifi/pages/index.adoc --------- Co-authored-by: Malte Sander <[email protected]>
1 parent b2cc147 commit f46ee61

16 files changed

+55
-52
lines changed

docs/modules/nifi/pages/getting_started/first_steps.adoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
= First steps
22
:description: Deploy Apache NiFi and ZooKeeper on Kubernetes using manifest files. Verify setup and access NiFi's web interface with stackablectl or kubectl.
33

4-
After going through the xref:getting_started/installation.adoc[] section and having installed all the operators, you will now deploy a NiFi cluster and the required dependencies. Afterwards you can <<_verify_that_it_works, verify that it works>> by querying the REST API.
4+
After going through the xref:getting_started/installation.adoc[] section and having installed all the operators, you deploy a NiFi cluster and the required dependencies.
5+
Afterward you can <<_verify_that_it_works, verify that it works>> by querying the REST API.
56

67
== Setup
78

@@ -10,7 +11,8 @@ Two things need to be installed to create a NiFi cluster:
1011
* A ZooKeeper cluster for internal use by NiFi
1112
* The NiFi cluster itself
1213

13-
We will create them in this order, each one is created by applying a manifest file. The operators you just installed will then create the resources according to the manifest.
14+
Create them in this order, each one is created by applying a manifest file.
15+
The operators create the resources according to the manifest.
1416

1517
=== Apache ZooKeeper
1618

@@ -28,7 +30,7 @@ Create a Znode object:
2830
include::example$getting_started/getting_started.sh[tag=install-znode]
2931
----
3032

31-
The xref:zookeeper:znodes.adoc[ZNode] makes sure that the NiFi cluster will operate in its own separated directory in ZooKeeper.
33+
The xref:zookeeper:znodes.adoc[ZNode] makes sure that the NiFi cluster operates in its own separated directory in ZooKeeper.
3234

3335
=== Apache NiFi
3436

docs/modules/nifi/pages/getting_started/index.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
= Getting started
22
:description: Get started with Apache NiFi using the Stackable operator: install, set up your cluster, and configure resources.
33

4-
This guide will get you started with Apache NiFi using the Stackable operator.
5-
It will guide you through the installation of the operator and its dependencies, setting up your first NiFi cluster.
4+
This guide gets you started with Apache NiFi using the Stackable operator.
5+
It guides you through the installation of the operator and its dependencies, setting up your first NiFi cluster.
66

77
== Prerequisites
88

9-
You will need:
9+
You need:
1010

1111
* a Kubernetes cluster
1212
* kubectl

docs/modules/nifi/pages/getting_started/installation.adoc

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
= Installation
22
:description: Install the Stackable operator for Apache NiFi and its dependencies using stackablectl or Helm. Follow steps for a complete setup on Kubernetes.
33

4-
On this page you will install the Stackable operator for Apache NiFi and operators for its dependencies - ZooKeeper -
4+
On this page you install the Stackable operator for Apache NiFi and operators for its dependencies -- ZooKeeper --
55
as well as the commons, secret and listener operator which are required by all Stackable operators.
66

7-
== Stackable operators
8-
9-
There are two ways to install Stackable operators:
10-
11-
* Using xref:management:stackablectl:index.adoc[stackablectl]
12-
* Using Helm
7+
There are multiple ways to install the Stackable operators.
8+
xref:management:stackablectl:index.adoc[] is the preferred way, but Helm is also supported.
9+
OpenShift users may prefer installing the operator from the RedHat Certified Operator catalog using the OpenShift web console.
1310

1411
[tabs]
1512
====
@@ -52,8 +49,7 @@ Then install the Stackable operators:
5249
include::example$getting_started/getting_started.sh[tag=helm-install-operators]
5350
----
5451
55-
Helm will deploy the operators in a Kubernetes Deployment and apply the CRDs for the Apache NiFi service (as well as the CRDs for the required operators).
56-
You are now ready to deploy Apache NiFi in Kubernetes.
52+
Helm deploys the operators in a Kubernetes Deployment and applies the CRDs for the Apache NiFi service (as well as the CRDs for the required operators).
5753
--
5854
====
5955

docs/modules/nifi/pages/index.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ It supports a wide range of data sources, formats and features such as data prov
1919
== Getting started
2020

2121
Get started with Apache NiFi and the Stackable operator by following the xref:getting_started/index.adoc[] guide.
22-
It will guide you through the xref:getting_started/installation.adoc[installation] process and xref:getting_started/first_steps.adoc[connect] to the NiFi web interface.
23-
Afterwards have a look at the xref:usage_guide/index.adoc[] to learn how to configure your NiFi instance to your needs or run some <<demos, demos>> to learn more about using NiFi with other components.
22+
It guides you through the xref:getting_started/installation.adoc[installation] process and xref:getting_started/first_steps.adoc[connect] to the NiFi web interface.
23+
Afterward, have a look at the xref:usage_guide/index.adoc[] to learn how to configure your NiFi instance to your needs or run some <<demos, demos>> to learn more about using NiFi with other components.
2424

2525
== Operator model
2626

@@ -49,7 +49,7 @@ The xref:demos:nifi-kafka-druid-earthquake-data.adoc[] and xref:demos:nifi-kafka
4949
== Supported versions
5050

5151
The Stackable operator for Apache NiFi currently supports the NiFi versions listed below.
52-
To use a specific NiFi version in your NifiCluster, you have to specify an image - this is explained in the xref:concepts:product-image-selection.adoc[] documentation.
52+
To use a specific NiFi version in your NifiCluster, you have to specify an image -- this is explained in the xref:concepts:product-image-selection.adoc[] documentation.
5353
The operator also supports running images from a custom registry or running entirely customized images; both of these cases are explained under xref:concepts:product-image-selection.adoc[] as well.
5454

5555
include::partial$supported-versions.adoc[]

docs/modules/nifi/pages/reference/commandline-parameters.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ stackable-nifi-operator run --product-config /foo/bar/properties.yaml
2323

2424
*Multiple values:* false
2525

26-
The operator will **only** watch for resources in the provided namespace `test`:
26+
The operator **only** watches for resources in the provided namespace `test`:
2727

2828
[source]
2929
----

docs/modules/nifi/pages/reference/environment-variables.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ docker run \
3636

3737
*Multiple values:* false
3838

39-
The operator will **only** watch for resources in the provided namespace `test`:
39+
The operator **only** watches for resources in the provided namespace `test`:
4040

4141
[source]
4242
----

docs/modules/nifi/pages/usage_guide/configuration-environment-overrides.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
:nifi-docs: https://nifi.apache.org/docs/nifi-docs/html/administration-guide.html#system_properties
44
:java-security-docs: https://docs.oracle.com/en/java/javase/11/security/java-security-overview1.html
55

6-
The NiFi cluster definition supports overriding configuration properties, environment variables, and Pod attributes. The configuration overrides can be applied either per role, or per role group where the more specific override (role group) has precedence over the less specific one (role).
6+
The NiFi cluster definition supports overriding configuration properties, environment variables, and Pod attributes.
7+
The configuration overrides can be applied either per role, or per role group where the more specific override (role group) has precedence over the less specific one (role).
78

89
IMPORTANT: Do not override port numbers.
9-
This will lead to cluster malfunction.
10+
This leads to cluster malfunction.
1011

1112
== Configuration overrides
1213

@@ -22,7 +23,7 @@ The following files can be edited directly via the `configOverrides` mechanism:
2223

2324
Overrides are key-value pairs defined under one of the configuration files from the list above.
2425
They must match the property names as expected by NiFi.
25-
In the example below, a property `nifi.flow.configuration.archive.enabled` is being explicitly set to 'false', overriding the default value.
26+
In the example below, a property `nifi.flow.configuration.archive.enabled` is being explicitly set to `false`, overriding the default value.
2627

2728
The following snippet shows how to disable workflow file backups in the NifiCluster definition:
2829

docs/modules/nifi/pages/usage_guide/custom_processors.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
:description: Load custom NiFi components by using custom Docker images or mounting external volumes with nar files for enhanced functionality.
33
:nifi-docs-custom-components: https://nifi.apache.org/docs/nifi-docs/html/developer-guide.html#introduction
44

5-
It is possible to develop {nifi-docs-custom-components}[custom components] for Apache NiFi to extend the available functionality - most often this will probably be custom processors.
6-
5+
You can develop {nifi-docs-custom-components}[custom components] for Apache NiFi, typically custom processors, to extend its functionality.
76
For these to be available in the NiFi UI, they need to be present in the classpath at startup, so the nar bundles have to be injected into your NiFi instance.
87

98
The Stackable Data Platform supports two ways to achive this goal, both of which are described below.
@@ -12,8 +11,8 @@ Please note that building your own Docker image is the recommended solution, as
1211

1312
== Custom Docker image
1413

15-
You can extend the official Stackable NiFi image and copy all required _nar_ files into the classpath of Nifi.
16-
The benefit of this method is that there is no need for any config overrides or extra mounts, you can use any of our NiFi examples, swap the image and your components will be available.
14+
You can extend the official Stackable NiFi image by copying the required _nar_ files into NiFi's classpath.
15+
The benefit of this method is that there is no need for any config overrides or extra mounts, you can use any of the NiFi examples, swap the image and your components will be available.
1716
But this means you will need to have access to a registry to push your custom image to.
1817

1918
The basic Dockerfile below shows how to achieve this:
@@ -40,7 +39,7 @@ Also read the xref:guides:custom-images.adoc[Using customized product images] gu
4039
If you don't want to create a custom image or don't have access to an image registry, you can use the extra volume mount functionality to mount a volume containing your custom components and configure NiFi to read these from the mounted volumes.
4140

4241
For this to work you'll need to prepare a PersistentVolumeClaim (PVC) containing your components.
43-
Usually the best way to do this will be to mount the PVC into a temporary container and then `kubectl cp` the _nar_ files into that volume.
42+
Usually the best way to do this is to mount the PVC into a temporary container and then `kubectl cp` the _nar_ files into that volume.
4443

4544
The following listing shows an example of creating the PVC and the Pod:
4645

@@ -78,7 +77,8 @@ spec:
7877
name: nifi-processor
7978
----
8079

81-
<1> Please note that this access mode will mean that you can only use this volume with a single NiFi Pod. For a distributed scenario, an additional list value of `ReadOnlyMany` could be specified here if this is supported.
80+
<1> Please note that this access mode means that you can only use this volume with a single NiFi Pod.
81+
For a distributed scenario, an additional list value of `ReadOnlyMany` could be specified here if this is supported.
8282

8383
The command to then copy the nar bundle into the PVC is:
8484

@@ -89,7 +89,7 @@ kubectl cp /path/to/component.nar processorcopy:/volume/
8989

9090
Now you can mount the extra volume into your NiFi instance as described in xref:nifi:usage_guide/extra-volumes.adoc[].
9191

92-
After this is done your components will be available within the NiFi Pods and NiFi can be configured to load these at startup by adding an extra directory to the classpath:
92+
After this is done, your components are available within the NiFi Pods and NiFi can be configured to load these at startup by adding an extra directory to the classpath:
9393

9494

9595
[source,yaml]

docs/modules/nifi/pages/usage_guide/external_ports.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ spec:
3636
targetPort: 8123
3737
----
3838

39-
Depending on the Kubernetes configuration this snippet will request and external ip address and open port 8080 on that ip address.
40-
Any requests to this port will be forwarded to port 8123 on the NiFi pods - and thus the processor.
39+
Depending on the Kubernetes configuration this snippet requests an external IP address and opens port 8080 on that IP address.
40+
Any requests to this port are forwarded to port 8123 on the NiFi pods -- and thus the processor.
4141

4242
If LoadBalancer Services or Ingress resources are not available for use, a NodePort Service would be an alternative:
4343

docs/modules/nifi/pages/usage_guide/extra-volumes.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Since Apache NiFi allows executing arbitrary workflows depending on which processors are used, it may become necessary to add external files to the Pods.
55
These could for example be client certificates used to configure a `PollHTTP` processor, a keytab to obtain a Kerberos ticket, or similar things.
66

7-
In order to make these files available the operator allows specifying extra volumes that will be added to the NiFi pods.
7+
In order to make these files available the operator allows specifying extra volumes that are added to the NiFi Pods.
88

99
[source,yaml]
1010
----
@@ -16,4 +16,4 @@ spec:
1616
secretName: nifi-client-certs
1717
----
1818

19-
All `Volumes` specified in this section will be made available under `/stackable/userdata/\{volumename\}`.
19+
All Volumes specified in this section are made available under `/stackable/userdata/\{volumename\}`.

0 commit comments

Comments
 (0)