12 files changed, 143 insertions, 43 deletions

diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
index 1a6dc0b..55c5510 100644
--- a/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
@@ -56,7 +56,7 @@
     href="../../s_docbuild/olinkdb/pardoc-common.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
     xpointer="element(book_enea_nfv_access_system_test_specification/1)" />
-    manual:</para>
+    Manual:</para>
 
     <para><emphasis role="bold">Lab Network
     Requirements</emphasis><itemizedlist spacing="compact">
diff --git a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
index 70a9978..18c1545 100644
--- a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
@@ -417,9 +417,9 @@ node0.1048576kB = 3 </programlisting>
     </section>
   </section>
 
-  <section id="high_availability_ig">
-    <title>Installing the Enea Edge Management in High Availability
-    Mode</title>
+
+  <section condition="hidden" id="high_availability_ig">
+    <title>Installing the Enea Edge Management in High Availability Mode</title>
 
     <para>The following describes the setup needed for running the Enea Edge
     Management in High Availabilty (HA) mode, with a MariaDB database cluster.
diff --git a/doc/book-enea-edge-getting-started/doc/grafana.xml b/doc/book-enea-edge-getting-started/doc/grafana.xml
index 05276ed..5dfaa98 100644
--- a/doc/book-enea-edge-getting-started/doc/grafana.xml
+++ b/doc/book-enea-edge-getting-started/doc/grafana.xml
@@ -28,16 +28,56 @@
         </listitem>
 
         <listitem>
-          <para>Docker for CentOS 7 installed on the machine and set to
-          <literal>autostart</literal> as a service.</para>
+            <para>Internet connection for installing the Docker tool.</para>
         </listitem>
 
         <listitem>
-          <para>Superuser rights on the CentOS 7 machine.</para>
+            <para>Root rights on the CentOS 7 machine.</para>
         </listitem>
       </itemizedlist>
     </section>
 
+    <section id="docker_steps">
+        <title>Setting up Docker for Grafana and InfluxDB</title>
+      
+        <para>In order to use the Grafana and InfluxDB containers, the Docker 
+          tool that runs and manages containers needs to be available on 
+          the server.</para>
+      
+        <para>To install Docker on a CentOS 7 server open a terminal, log 
+          into a bash shell with the root account and run the following commands:</para>
+
+      <orderedlist>
+         <listitem>
+           <para><literal>yum check-update</literal></para>
+         </listitem>
+        
+        <listitem>
+          <para><literal>yum install -y yum-utils device-mapper-persistent-data lvm2</literal></para>
+         </listitem>
+        
+         <listitem>
+           <para><literal>yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo</literal></para>
+         </listitem>
+        
+         <listitem>
+           <para><literal>yum install docker</literal></para>
+         </listitem>
+        </orderedlist>
+        
+        <para>In order to deploy the Grafana and InfluxDB images, the Docker 
+          service needs to be started. To start the Docker service, log into 
+          a bash shell with the root account and run the following command: 
+          <literal>systemctl start docker</literal>.</para>
+        
+        <note><para>By default, the Docker service is not configured to start at boot. 
+          In order to configure it to autostart, log into a bash shell
+        with the root account and run the following command: 
+          <literal>systemctl enable docker</literal>. The Grafana and InfluxDB 
+          images are configured to autostart when the Docker service starts.</para></note>
+    </section>
+
+
     <section id="deploy_steps">
       <title>Deploying Grafana and InfluxDB</title>
 
@@ -63,10 +103,19 @@
         </listitem>
 
         <listitem>
-          <para>When prompted, select what images you want to deploy.</para>
-
-          <para>If an image is already deployed, you will be prompted to
-          replace it.</para>
+            <para>When prompted, select what images you want to deploy. 
+              Select <literal>Both</literal> unless you wish for the Grafana 
+              and InfluxDB images to be on separate servers.</para>
+          
+            <note>
+              <para>If an image is already deployed, you will be prompted 
+                to replace it.</para>
+              
+              <para>By default, Grafana is configured for deployment on the 
+                same server as InfluxDB. Please read the Grafana documentation 
+                on how to configure it if you wish to deploy the images 
+                on separate servers.</para>
+            </note>
         </listitem>
 
         <listitem>
@@ -86,14 +135,46 @@
           present and have the status <literal>Up</literal>.</para>
         </listitem>
       </orderedlist>
+        
+        <note>
+           <para>The provided Grafana instance by default uses the 
+             <literal>Username:</literal> <emphasis role="bold">admin</emphasis> and 
+           <literal>Password:</literal> <emphasis role="bold">admin</emphasis>.</para>
+        </note>
+      </section>
     </section>
+  
+    <section id="telemetry_firewall_settings">
+        <title>Firewall settings for Grafana and InfluxDB</title>
+      
+      <para>If a firewall is running on the machines where Grafana and InfluxDB are 
+        deployed, this firewall needs to be configured so the required ports are 
+        enabled.</para>
+      
+      <para>To enable the ports, log into a bash shell with the root account and 
+           perform the following:
+         </para>
+      
+      <orderedlist>
+        <listitem>
+          <para>For InfluxDB, run the following command:</para> 
+          
+          <programlisting>firewall-cmd --permanent --add-port=25826/tcp</programlisting>
+        </listitem>
+        
+        <listitem>
+          <para>For Grafana, run the following command:</para>
+          
+          <programlisting>firewall-cmd --permanent --add-port=3000/tcp</programlisting>
+        </listitem>
+      </orderedlist>
   </section>
 
   <section id="grafana_settings">
     <title>Setting Grafana and InfluxDB parameters</title>
 
-    <para>Customizing InfluxDB and Grafana parameters can be done by selecting
-    <emphasis role="bold">System</emphasis>, then the <emphasis
+    <para>Customizing InfluxDB and Grafana parameters can be done in the Enea uCPE Manager 
+      GUI by selecting <emphasis role="bold">System</emphasis>, then the <emphasis
     role="bold">Configuration</emphasis> menu, accessing the <emphasis
     role="bold">Properties</emphasis> tab, and clicking on the <emphasis
     role="bold">Telemetry</emphasis> tab. The settings that can be changed are
@@ -121,7 +202,7 @@
           <row>
             <entry>Grafana Hostname or IP Address</entry>
 
-            <entry>The hostname or IP address where the Grafana instance is
+            <entry>The public hostname or IP address where the Grafana instance is
             installed.</entry>
 
             <entry>no default</entry>
@@ -147,7 +228,7 @@
           <row>
             <entry>InfluxDB Hostname or IP Address</entry>
 
-            <entry>The hostname or IP address where the InfluxDB database is
+            <entry>The public hostname or IP address where the InfluxDB database is
             installed.</entry>
 
             <entry>no default</entry>
diff --git a/doc/book-enea-edge-getting-started/doc/installation_guide.xml b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
index d9784a0..50a90b0 100644
--- a/doc/book-enea-edge-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
@@ -101,7 +101,7 @@
         href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_nfv_access_release_info/1)" />
-        manual.</para>
+        Manual.</para>
 
         <para>Enea Edge Runtime needs EFI support in BIOS to boot. When
         configuring the uCPE device BIOS a serial connection is
@@ -124,7 +124,7 @@
             server and the laptop is required. Please see the <xi:include
             href="../../s_docbuild/olinkdb/pardoc-common.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(book_enea_nfv_access_release_info/1)" /> manual
+            xpointer="element(book_enea_nfv_access_release_info/1)" /> Manual
             available with your release, for recommended browsers.</para>
           </listitem>
         </itemizedlist>
@@ -186,7 +186,9 @@ sudo systemctl mask now firewalld</programlisting>
 
               <entry>UDP</entry>
 
-              <entry>Required for the Enea Edge Management High Availability
+
+             <entry condition="hidden">Required for the Enea Edge Management High Availability
+
               Configuration.</entry>
             </row>
 
@@ -195,7 +197,8 @@ sudo systemctl mask now firewalld</programlisting>
 
               <entry>TCP</entry>
 
-              <entry>Required for the Enea Edge Management High Availability
+              <entry condition="hidden">Required for the Enea Edge Management High Availability
+
               Configuration.</entry>
             </row>
 
@@ -470,6 +473,7 @@ userdel postgres</programlisting>
 
         <orderedlist>
           <listitem>
+
             <para>Extract
             <literal>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
 
@@ -569,10 +573,10 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
                 </itemizedlist>
               </listitem>
 
-              <listitem>
+              <listitem condition="hidden">
                 <para>High Availability Configurations:</para>
 
-                <itemizedlist spacing="compact">
+                <itemizedlist>
                   <listitem>
                     <para>Specify the IP address of the local interface: The
                     CentOS 7 Server loopback address:
diff --git a/doc/book-enea-edge-getting-started/doc/introduction.xml b/doc/book-enea-edge-getting-started/doc/introduction.xml
index 4dec1e1..8186ff1 100644
--- a/doc/book-enea-edge-getting-started/doc/introduction.xml
+++ b/doc/book-enea-edge-getting-started/doc/introduction.xml
@@ -44,6 +44,7 @@
       </listitem>
     </itemizedlist>
 
+
     <para>In addition, Enea Edge includes a framework for
     automation and testing. More information can be found in
     <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
@@ -54,7 +55,7 @@
     structure, are provided in the <xi:include
     href="../../s_docbuild/olinkdb/pardoc-common.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_release_info/1)" /> manual included
+    xpointer="element(book_enea_nfv_access_release_info/1)" /> Manual included
     with your release.</para>
 
     <section id="nfv_access">
diff --git a/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
index 641775d..14ac049 100644
--- a/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
@@ -80,7 +80,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
     Manual contains information about the input required to be entered during
     the execution of the upgrade script.</para>
 
-    <para>For an example on how to upgrade an Enea Edge Management installation
+
+    <para condition="hidden">For an example on how to upgrade an Enea Edge Management installation
     in a High Availability setup, consult <olink
     targetdoc="book_enea_nfv_access_getting_started"
     targetptr="ha_upgrade">Upgrading a High Availability Deployment in the
diff --git a/doc/book-enea-edge-release-info/doc/main_changes.xml b/doc/book-enea-edge-release-info/doc/main_changes.xml
index c01a149..10e36a6 100644
--- a/doc/book-enea-edge-release-info/doc/main_changes.xml
+++ b/doc/book-enea-edge-release-info/doc/main_changes.xml
@@ -25,16 +25,11 @@
       </listitem>
 
       <listitem>
-        <para><remark>CPDX-3498</remark>High Availability support with redundant 
-                Enea Edge Management in active standby configuration.</para>            
-      </listitem>
-
-      <listitem>
         <para><remark>CPDX-3407</remark>HTTPS based downloads of VNFs for
         simplified deployment of the Enea Edge Management in cloud
         environments.</para>
       </listitem>
-          
+
       <listitem>
         <para><remark>CPDX-3500</remark>The Enea Edge Automation,
         a tool for automatic system configuration based on Python
@@ -74,13 +69,29 @@
 
     <para><emphasis role="bold">Early Access Features:</emphasis></para>
 
-    <para>The following Early Access features are included in this release
-    (made originally available with Enea NFV Access 2.3.0):</para>
+    <para>The following Early Access features are included in this
+    release:</para>
 
     <itemizedlist>
       <listitem>
+        <para><remark>CPDX-3498</remark>High Availability support with
+        redundant Enea uCPE Managers in active standby configuration.</para>
+
+        <para>In order to increase resiliency on the uCPE management side, 
+          the Enea uCPE Manager can be installed in High-Availability mode. 
+          Deployment consists of multiple instances of the Enea uCPE Manager, 
+          which can be distributed across different Data Centers and 
+          geographical locations, and with multiple MariaDB servers for 
+          each location.</para>
+      </listitem>
+
+      <listitem>
         <para>Platform and VNF Snapshots:</para>
 
+        <note>
+          <para>Made originally available with Enea NFV Access 2.3.0.</para>
+        </note>
+
         <itemizedlist>
           <listitem>
             <para>Platform Snapshots allow users to store, manage and restore
@@ -122,6 +133,7 @@
 
     <itemizedlist>
       <listitem>
+
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xpointer="element(book_enea_nfv_access_platform_open_source/1)"
         xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
@@ -150,6 +162,7 @@
         xpointer="element(book_enea_nfv_access_auto_fw_th_open_source/1)"
         xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
       </listitem>         
+
     </itemizedlist>
   </section>
 
diff --git a/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml b/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml
index b1bfa1e..c3796f6 100644
--- a/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml
@@ -1687,7 +1687,7 @@ ansible_pass=root</programlisting></para>
           <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
           xmlns:xi="http://www.w3.org/2001/XInclude"
           xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
-          manual for additional information about preconditions.</para>
+          Manual for additional information about preconditions.</para>
         </listitem>
       </itemizedlist>
 
diff --git a/doc/book-enea-nfv-access-evalkit/doc/introduction.xml b/doc/book-enea-nfv-access-evalkit/doc/introduction.xml
index 1e84ed4..afa5fc6 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/introduction.xml
@@ -34,7 +34,7 @@
   flexiWAN and pfSense VNFs service chained together on a uCPE device.</para>
 
   <para>This document will present all information required to replicate the
-  use case described in the user's environment. The first part of this manual
+  use case described in the user's environment. The first part of this Manual
   uses the GUI mode of the uCPE Manager to detail the steps in order to
   reproduce the use cases, while the chapters thereafter use the automation
   framework.</para>
@@ -46,7 +46,7 @@
     are described in Appendix A.</para>
 
     <para>This document assumes the user is familiar with Enea NFV Access and
-    has read the Enea NFV Access Getting Started manual before continuing with
+    has read the Enea NFV Access Getting Started Manual before continuing with
     the following.</para>
   </note>
 
diff --git a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
index d2254f0..fca409c 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
@@ -53,9 +53,9 @@
                 </listitem>
 
                 <listitem>
-                  <para>NFV Access installed on both uCPE devices. Please see
-                  <emphasis>Enea NFV Access Getting Started</emphasis> Manual,
-                  chapter "Getting Started with Enea NFV Access" for more
+                  <para>Enea Edge installed on both uCPE devices. Please see
+                  <emphasis>Enea Edge Getting Started</emphasis> Manual,
+                  chapter "Getting Started with Enea Edge" for more
                   details.</para>
                 </listitem>
               </itemizedlist>
diff --git a/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml b/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
index d157c06..f14805b 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/run_example_uc_auto_fm.xml
@@ -18,7 +18,7 @@
   <note>
     <para>All tests are just examples. In order to run on user specific
     devices they need to be updated accordingly. Please check the Enea NFV
-    Access System Test Specification manual for more details.</para>
+    Access System Test Specification Manual for more details.</para>
   </note>
 
   <programlisting>&gt; cd automation_framework/unittestSuite/
diff --git a/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml b/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
index 0fef6bb..eab7eda 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/sdwan_arch.xml
@@ -78,19 +78,19 @@
 
       <listitem>
         <para>Install NFV Access on the uCPE devices. See the <remark>make
-        this into an olink</remark> Enea NFV Access Getting Started manual,
-        chapter Getting Started with the Enea NFV Access, for more
+        this into an olink</remark>Enea NFV Access Getting Started Manual,
+        chapter "Getting Started with the Enea NFV Access", for more
         details.</para>
       </listitem>
 
       <listitem>
-        <para>Install the uCPE Manager on the CentOS host or VM. See the
+        <para>Install the Enea uCPE Manager on the CentOS 7 host or VM. See the
         <remark>make this into an olink</remark> Enea NFV Access Getting
-        Started manual, chapter Getting Started with Enea uCPE Manager, for
+        Started Manual, chapter "Getting Started with Enea uCPE Manager", for
         more details.</para>
 
         <note>
-          <para>The uCPE Manager host machine must be connected to the network
+          <para>The Enea uCPE Manager host machine must be connected to the network
           so all uCPE devices can access it.</para>
         </note>
       </listitem>