1 files changed, 63 insertions, 57 deletions

diff --git a/book-enea-nfv-core-installation-guide/doc/high_availability.xml b/book-enea-nfv-core-installation-guide/doc/high_availability.xml
index b26c520..8999ddc 100644
--- a/book-enea-nfv-core-installation-guide/doc/high_availability.xml
+++ b/book-enea-nfv-core-installation-guide/doc/high_availability.xml
@@ -207,8 +207,8 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center" fileref="images/dr_fault_mg.png"
-                       scale="70" />
+            <imagedata align="center" contentwidth="600"
+                       fileref="images/dr_fault_mg.svg" />
           </imageobject>
         </mediaobject>
       </figure>
@@ -218,8 +218,8 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata align="center" fileref="images/dr_fault_mg_2.png"
-                       scale="70" />
+            <imagedata align="center" contentwidth="600"
+                       fileref="images/dr_fault_mg_2.svg" />
           </imageobject>
         </mediaobject>
       </figure>
@@ -369,10 +369,21 @@
         <listitem>
           <para>Create a new media type by selecting <literal>Media
           Types</literal> under the <literal>Admininstration</literal> tab and
-          choosing <literal>Create Media Type</literal>.</para>
+          choosing <literal>Create Media Type</literal>:</para>
 
-          <para>Now fill each parameter field with the values given below,
-          before clicking <literal>add</literal>:</para>
+          <figure>
+            <title>Media Types</title>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center" fileref="images/p1_media_types.png"
+                           scale="55" />
+              </imageobject>
+            </mediaobject>
+          </figure>
+
+          <para>Now fill each field with the values given below, before
+          clicking <literal>add</literal>:</para>
 
           <itemizedlist>
             <listitem>
@@ -394,7 +405,7 @@
             <mediaobject>
               <imageobject>
                 <imagedata align="center"
-                           fileref="images/Zabbix_MediaType.png" scale="70" />
+                           fileref="images/p2_zabbix_MediaType.png" scale="55" />
               </imageobject>
             </mediaobject>
           </figure>
@@ -409,24 +420,13 @@
           <literal>admin</literal> alias:</para>
 
           <figure>
-            <title>Existing Users</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center"
-                           fileref="images/Zabbix_AdminSelectUsers.png"
-                           scale="90" />
-              </imageobject>
-            </mediaobject>
-          </figure>
-
-          <figure>
-            <title>Choosing an Alias</title>
+            <title>Choosing the Admin Alias from Users</title>
 
             <mediaobject>
               <imageobject>
                 <imagedata align="center"
-                           fileref="images/Zabbix_AdminUser.png" scale="70" />
+                           fileref="images/p5_Zabbix_AdminSelectUsers.png"
+                           scale="55" />
               </imageobject>
             </mediaobject>
           </figure>
@@ -435,23 +435,8 @@
         <listitem>
           <para>Inside the <literal>User</literal> tab for the
           <literal>admin</literal> alias, click <literal>Add</literal> next to
-          the <literal>Groups</literal> list:</para>
-
-          <figure>
-            <title>Adding Groups</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center" fileref="images/Zabbix_User.png"
-                           scale="70" />
-              </imageobject>
-            </mediaobject>
-          </figure>
-        </listitem>
-
-        <listitem>
-          <para>Once the <literal>User groups</literal> popup menu
-          appears:</para>
+          the <literal>Groups</literal> list. Once the <literal>User
+          groups</literal> popup menu appears:</para>
 
           <itemizedlist>
             <listitem>
@@ -468,13 +453,12 @@
           </itemizedlist>
 
           <figure>
-            <title>Updating the User Groups</title>
+            <title>Adding User Groups</title>
 
             <mediaobject>
               <imageobject>
-                <imagedata align="center"
-                           fileref="images/Zabbix_AdminUserSelectGroup.png"
-                           scale="70" />
+                <imagedata align="center" fileref="images/p7_Zabbix_User.png"
+                           scale="55" />
               </imageobject>
             </mediaobject>
           </figure>
@@ -496,7 +480,8 @@
 
             <listitem>
               <para>Send to: <literal>e.g.
-              rabbit://nova:Q1Vt9iocA8OpXKOPoUYOLKie@192.168.0.4:5673/</literal></para>
+              rabbit://nova:Q1Vt9iocA8OpXKOPoUYOLKie@192.168.0.4:5673/<remark>Is
+              this information still relevant?</remark></literal></para>
 
               <para>This url can be found in either
               <literal>/etc/vitrage/vitrage.conf or in
@@ -528,8 +513,8 @@
             <mediaobject>
               <imageobject>
                 <imagedata align="center"
-                           fileref="images/Zabbix_AdminUserMediaAdd.png"
-                           scale="70" />
+                           fileref="images/p9_Zabbix_AdminUserMediaAdd.png"
+                           scale="55" />
               </imageobject>
             </mediaobject>
           </figure>
@@ -571,7 +556,8 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
                 <mediaobject>
                   <imageobject>
                     <imagedata align="center"
-                               fileref="images/Zabbix_Action.png" scale="70" />
+                               fileref="images/p12_Zabbix_Action.png"
+                               scale="55" />
                   </imageobject>
                 </mediaobject>
               </figure>
@@ -584,7 +570,7 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
           below, make sure the label <literal>Maintenance status not in
           "maintenance"</literal> is added and remove the label
           <literal>Trigger value = PROBLEM</literal>, before saving your
-          changes.</para>
+          changes.<remark>Does this also need updating?</remark></para>
 
           <figure>
             <title>Configuring Conditions</title>
@@ -623,13 +609,20 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
               </itemizedlist>
 
               <figure>
-                <title>Configuring Operations</title>
+                <title>Configuring Operation Actions</title>
+
+                <mediaobject>
+                  <imageobject>
+                    <imagedata align="center"
+                               fileref="images/p14_Zabbix_ActionOperations.png"
+                               scale="55" />
+                  </imageobject>
+                </mediaobject>
 
                 <mediaobject>
                   <imageobject>
                     <imagedata align="center"
-                               fileref="images/Zabbix_ActionOperations.png"
-                               scale="70" />
+                               fileref="images/p15_Send_toOnly.png" scale="55" />
                   </imageobject>
                 </mediaobject>
               </figure>
@@ -641,7 +634,19 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
           <para>In the <literal>Configuration</literal> tab, under
           <literal>Templates</literal>, look for and select the template named
           <filename>Template App Zabbix Agent</filename> and click on
-          <literal>Items</literal>.</para>
+          <literal>Items</literal>:</para>
+
+          <figure>
+            <title>Configuring Templates</title>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center"
+                           fileref="images/p18_ZabbixAgent_Template.png"
+                           scale="55" />
+              </imageobject>
+            </mediaobject>
+          </figure>
         </listitem>
 
         <listitem>
@@ -695,8 +700,8 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
             <mediaobject>
               <imageobject>
                 <imagedata align="center"
-                           fileref="images/Zabbix_ConfigTemplateZabbixAgentTrigger1.png"
-                           scale="70" />
+                           fileref="images/p21_Zabbix_ConfigTemplateZabbixAgentTrigger1.png"
+                           scale="55" />
               </imageobject>
             </mediaobject>
           </figure>
@@ -706,7 +711,8 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
           <para>Edit the <literal>Name</literal> and
           <literal>Expression</literal> fields for this trigger to check the
           condition every 20 seconds. Set the severity to
-          <literal>HIGH</literal> and click <literal>Update</literal>:</para>
+          <literal>AVERAGE</literal> and click
+          <literal>Update</literal>:</para>
 
           <figure>
             <title>Configuring Trigger Settings</title>
@@ -714,8 +720,8 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
             <mediaobject>
               <imageobject>
                 <imagedata align="center"
-                           fileref="images/Zabbix_ConfigTemplateZabbixAgentTrigger2.png"
-                           scale="70" />
+                           fileref="images/p22_Zabbix_ConfigTemplateZabbixAgentTrigger2.png"
+                           scale="55" />
               </imageobject>
             </mediaobject>
           </figure>