rebase for merge conflicts

Author: JoeAldinger

modules/network-observability-operator-install.adoc

@@ -5,11 +5,11 @@
 :_content-type: PROCEDURE
 [id="network-observability-operator-installation_{context}"]
 = Installing the Network Observability Operator
-You can install the Network Observability Operator using the {product-title} web console Operator Hub. When you install the Operator,  it provides the `FlowCollector` custom resource definition (CRD). You can set specifications in the web console when you create the  `FlowCollector`.  
+You can install the Network Observability Operator using the {product-title} web console Operator Hub. When you install the Operator,  it provides the `FlowCollector` custom resource definition (CRD). You can set specifications in the web console when you create the  `FlowCollector`.
 
 .Prerequisites
 
-* Installed Loki. It is recommended to install Loki using the link:https://catalog.redhat.com/software/containers/openshift-logging/loki-rhel8-operator/622b46bcae289285d6fcda39[Loki Operator version 5.6]. 
+* Installed Loki. It is recommended to install Loki using the link:https://catalog.redhat.com/software/containers/openshift-logging/loki-rhel8-operator/622b46bcae289285d6fcda39[Loki Operator version 5.6].
 
 [NOTE]
 ====
@@ -25,13 +25,13 @@ This documentation assumes that your `LokiStack` instance name is `loki`. Using
 . Navigate to *Operators* -> *Installed Operators*. Under Provided APIs for Network Observability, select the *Flow Collector* link.
 .. Navigate to the *Flow Collector* tab, and click *Create FlowCollector*. Make the following selections in the form view:
 +
-* *spec.agent.ebpf.Sampling* : Specify a sampling size for flows. Lower sampling sizes will have higher impact on resource utilization. For more information, see the `FlowCollector` API reference, under spec.agent.ebpf. 
+* *spec.agent.ebpf.Sampling* : Specify a sampling size for flows. Lower sampling sizes will have higher impact on resource utilization. For more information, see the `FlowCollector` API reference, under spec.agent.ebpf.
 * *spec.deploymentModel*: If you are using Kafka, verify Kafka is selected.
 * *spec.exporters*: If you are using Kafka, you can optionally send network flows to Kafka, so that they can be consumed by any processor or storage that supports Kafka input, such as Splunk, Elasticsearch, or Fluentd. To do this, set the following specifications:
-** Set the *type* to `KAFKA`. 
-** Set the *address* as `kafka-cluster-kafka-bootstrap.netobserv`. 
-** Set the *topic* as `netobserv-flows-export`. The Operator exports all flows to the configured Kafka topic. 
-** Set the following *tls* specifications: 
+** Set the *type* to `KAFKA`.
+** Set the *address* as `kafka-cluster-kafka-bootstrap.netobserv`.
+** Set the *topic* as `netobserv-flows-export`. The Operator exports all flows to the configured Kafka topic.
+** Set the following *tls* specifications:
 *** *certFile*: `service-ca.crt`, *name*: `kafka-gateway-ca-bundle`, and *type*: `configmap`.
 +
 You can also configure this option at a later time by directly editing the YAML. For more information, see _Export enriched network flow data_.
@@ -46,12 +46,12 @@ For the first part of the certificate reference names: `loki-gateway-ca-bundle`,
 
 .Verification
 
-To confirm this was successful, when you navigate to *Observe* you should see *Network Traffic* listed in the options. 
+To confirm this was successful, when you navigate to *Observe* you should see *Network Traffic* listed in the options.
 
-In the absence of *Application Traffic* within the {product-title} cluster, default filters might show that there are "No results", which results in no visual flow. Beside the filter selections, select *Clear all filters* to see the flow. 
+In the absence of *Application Traffic* within the {product-title} cluster, default filters might show that there are "No results", which results in no visual flow. Beside the filter selections, select *Clear all filters* to see the flow.
 
 [IMPORTANT]
 ====
-If you installed Loki using the Loki Operator, it is advised not to use `querierUrl`, as it can break the console access to Loki. If you installed Loki using another type of Loki installation, this does not apply. 
+If you installed Loki using the Loki Operator, it is advised not to use `querierUrl`, as it can break the console access to Loki. If you installed Loki using another type of Loki installation, this does not apply.
 ====
 

modules/network-observability-operator-uninstall.adoc

@@ -10,17 +10,19 @@ You can uninstall the Network Observability Operator using the {product-title} w
 .Procedure
 
 . Remove the `FlowCollector` custom resource.
-.. Click *Flow Collector*, which is next to the *Network Observability Operator* in the *Provided APIs* column. 
+.. Click *Flow Collector*, which is next to the *Network Observability Operator* in the *Provided APIs* column.
 .. Click the options menu {kebab} for the *cluster* and select *Delete FlowCollector*.
 . Uninstall the Network Observability Operator.
-.. Navigate back to the *Operators* -> *Installed Operators* area. 
+.. Navigate back to the *Operators* -> *Installed Operators* area.
 .. Click the options menu {kebab} next to the  *Network Observability Operator* and select *Uninstall Operator*.
+.. *Home* -> *Projects* and select `openshift-netobserv-operator`
+.. Navigate to *Actions* and select *Delete Project*
 . Remove the `FlowCollector` custom resource definition (CRD).
-.. Navigate to *Administration* -> *CustomResourceDefinitions*. 
-.. Look for *FlowCollector* and click the options menu {kebab}. 
+.. Navigate to *Administration* -> *CustomResourceDefinitions*.
+.. Look for *FlowCollector* and click the options menu {kebab}.
 .. Select *Delete CustomResourceDefinition*.
 +
 [IMPORTANT]
 ====
-The Loki Operator and Kafka remain if they were installed and must be removed separately. Additionally, you might have remaining data stored in an object store, and a persistent volume that must be removed. 
+The Loki Operator and Kafka remain if they were installed and must be removed separately. Additionally, you might have remaining data stored in an object store, and a persistent volume that must be removed.
 ====