5 files changed, 109 insertions, 22 deletions

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