1 files changed, 129 insertions, 76 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 5854e6c..41d107b 100644
--- a/book-enea-nfv-core-installation-guide/doc/high_availability.xml
+++ b/book-enea-nfv-core-installation-guide/doc/high_availability.xml
@@ -294,33 +294,45 @@
     <section id="zabbix">
       <title>Zabbix Configuration for Push Notifications</title>
 
-      <para>Vitrage supports Zabbix datasource by means of regularly polling
-      the Zabbix agents, which need to be configured in advance. The Vitrage
-      plugin developed internally by Enea can automatically configure Zabbix
-      so that everything works as expected. Polling however, is not fast
-      enough for a telco use-case, so it is necessary to configure push
-      notifications for Zabbix . This requires manual configuration on one of
-      the controller nodes, since Zabbix uses a centralized database which
-      makes the configuration available on all the other nodes.</para>
+      <para>Vitrage supports Zabbix datasource by regularly polling the Zabbix
+      agents, which need to be configured in advance.</para>
+
+      <para>The Vitrage plugin developed internally by Enea can automatically
+      configure Zabbix so that everything works as expected. Polling however,
+      is not fast enough for a telco use-case, so it is necessary to configure
+      push notifications for Zabbix . This requires manual configuration on
+      one of the controller nodes, which will be used by the centralized
+      database making the configuration available on all the other
+      nodes.</para>
 
       <para>The Zabbix configuration dashboard is available at the same IP
       address where OpenStack can be reached, e.g.
       <literal>http://10.0.6.42/zabbix</literal>.</para>
 
       <mediaobject>
-        <imageobject>
-          <imagedata fileref="images/Zabbix_Home.PNG" />
+        <imageobject role="fop">
+          <imagedata contentwidth="600" fileref="images/Zabbix_Home.svg" />
+        </imageobject>
+
+        <imageobject role="html">
+          <imagedata fileref="images/Zabbix_Home.png" />
         </imageobject>
       </mediaobject>
 
       <para>To forward Zabbix events to Vitrage, a new media script needs to
-      be created and associated with a user. Follow the steps below as a
-      Zabbix Admin user:</para>
+      be created and associated with a Zabbix Admin user.</para>
+
+      <para><emphasis role="bold">To create the
+      zabbix_vitrage.py</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Create a new media type [Admininstration Media Types &gt;
-          Create Media Type]</para>
+          <para>Create a new media type by selecting the <literal>Media
+          Types</literal> tab under the <literal>Admininstration</literal>,
+          tab and choosing <literal>Create Media Type</literal>.</para>
+
+          <para>Now fill each parameter field with the values given below,
+          before clicking <literal>add</literal>:</para>
 
           <itemizedlist>
             <listitem>
@@ -335,67 +347,105 @@
               <para>Script name: <filename>zabbix_vitrage.py</filename></para>
             </listitem>
           </itemizedlist>
+
+          <mediaobject>
+            <imageobject role="fop">
+              <imagedata contentwidth="600"
+                         fileref="images/Zabbix_MediaType.svg" />
+            </imageobject>
+
+            <imageobject role="html">
+              <imagedata fileref="images/Zabbix_MediaType.png" />
+            </imageobject>
+          </mediaobject>
         </listitem>
 
         <listitem>
-          <para>Modify the Media for the Admin user [Administration
-          Users]</para>
-
-          <para>Click on the Admin user, go to the Media tab and click
-          <literal>Add</literal>.</para>
+          <para>Go to the <literal>User</literal> tab by clicking on the
+          <literal>Administration</literal> and next to the field
+          <literal>Groups</literal>, click <literal>Add</literal>. In this
+          screen:</para>
 
           <itemizedlist>
             <listitem>
-              <para>Type: Vitrage Notifications</para>
+              <para>Check the Zabbix Administrators checkbox</para>
             </listitem>
 
             <listitem>
-              <para>Send to:
-              <literal>rabbit://rabbit_user:rabbit_pass@127.0.0.1:5672/
-              ---</literal> Vitrage message bus url (you need to search for
-              this in <literal>/etc/vitrage/vitrage.conf or
-              /etc/nova/nova.conf transport_url</literal>) It's also vital
-              that the url contains the ending "/".</para>
+              <para>Click <literal>Select</literal></para>
             </listitem>
 
             <listitem>
-              <para>When active: 1-7, 00:00-24:00</para>
+              <para>Click <literal>Update</literal></para>
             </listitem>
+          </itemizedlist>
+
+          <mediaobject>
+            <imageobject role="fop">
+              <imagedata contentwidth="600" fileref="images/Zabbix_User.svg" />
+            </imageobject>
+
+            <imageobject role="html">
+              <imagedata fileref="images/Zabbix_User.png" />
+            </imageobject>
+          </mediaobject>
+        </listitem>
+
+        <listitem>
+          <para>Next select the <literal>Media</literal> tab and and click
+          <literal>Add</literal> to create and modify a new media type. A
+          popup menu will appear for <literal>New Media</literal>, fill each
+          field with the values below:</para>
 
+          <itemizedlist>
             <listitem>
-              <para>Use if severity: (all)</para>
+              <para>Type: Vitrage Notifications</para>
             </listitem>
 
             <listitem>
-              <para>Status: Enabled</para>
+              <para>Send to: <literal>e.g.
+              rabbit://rabbit_user:rabbit_pass@127.0.0.1:5672/ ---</literal>
+              Vitrage message bus url.</para>
+
+              <para>You need to search for this in
+              <literal>/etc/vitrage/vitrage.conf or in /etc/nova/nova.conf
+              transport_url</literal>. It is vital that the url contains the
+              ending " / ".</para>
             </listitem>
 
             <listitem>
-              <para>Click <literal>Update.</literal></para>
+              <para>When active: 1-7, 00:00-24:00</para>
             </listitem>
-          </itemizedlist>
-
-          <para>Go to User tab and next to Groups list click
-          <literal>Add.</literal></para>
 
-          <itemizedlist>
             <listitem>
-              <para>Check Zabbix Administrators checkbox</para>
+              <para>Use if severity: (all)</para>
             </listitem>
 
             <listitem>
-              <para>Click <literal>Select.</literal></para>
+              <para>Status: Enabled</para>
             </listitem>
 
             <listitem>
-              <para>Click <literal>Update.</literal></para>
+              <para>Click <literal>Update</literal></para>
             </listitem>
           </itemizedlist>
+
+          <mediaobject>
+            <imageobject role="fop">
+              <imagedata fileref="images/Zabbix_MediaNotifications.svg" />
+            </imageobject>
+
+            <imageobject role="html">
+              <imagedata fileref="images/Zabbix_MediaNotifications.png" />
+            </imageobject>
+          </mediaobject>
         </listitem>
 
         <listitem>
-          <para>Configure Action [Configuration &gt; Actions &gt; Create
-          Action &gt; Action]</para>
+          <para>To configure an action, select <literal>Actions</literal>
+          under the <literal>Configuration</literal> tab. Then, under the
+          <literal>Action</literal> tab, fill in the parameter fields with the
+          values below and click <literal>Add</literal></para>
 
           <itemizedlist>
             <listitem>
@@ -419,66 +469,69 @@ expression={TRIGGER.EXPRESSION}
 value={TRIGGER.VALUE}
 priority={TRIGGER.NSEVERITY}
 lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
-            </listitem>
 
-            <listitem>
-              <para>To send events add under the <literal>Conditions</literal>
-              tab: "Maintenance status not in "maintenance"" and remove
-              Trigger value = PROBLEM.</para>
-            </listitem>
+              <mediaobject>
+                <imageobject role="fop">
+                  <imagedata contentwidth="600"
+                             fileref="images/Zabbix_Action.svg" />
+                </imageobject>
 
-            <listitem>
-              <para>Click Operations tab:</para>
+                <imageobject role="html">
+                  <imagedata fileref="images/Zabbix_Action.png" />
+                </imageobject>
+              </mediaobject>
             </listitem>
+          </itemizedlist>
+        </listitem>
 
-            <listitem>
-              <para>Under Action operatsion click New</para>
-            </listitem>
+        <listitem>
+          <para>To send events, in the <literal>Conditions</literal> tab shown
+          above, make sure <literal>Maintenance status not in
+          "maintenance"</literal> added and remove <literal>Trigger value =
+          PROBLEM</literal>, before saving your changes.</para>
+        </listitem>
+
+        <listitem>
+          <para>In the Operations tab, configure the users you wish to send
+          to:</para>
 
+          <itemizedlist>
             <listitem>
-              <para>In the Operations details section select</para>
+              <para>In <literal>Operations Details</literal>, set:</para>
 
               <itemizedlist>
                 <listitem>
-                  <para>Send to Users: Admin</para>
+                  <para>Operation Type: Send message</para>
+                </listitem>
+
+                <listitem>
+                  <para>Send to Users: add <literal>Admin</literal></para>
                 </listitem>
 
                 <listitem>
                   <para>Send only to: Vitrage Notifications</para>
                 </listitem>
               </itemizedlist>
-            </listitem>
 
-            <listitem>
-              <para>Click Add in the Operarion details section</para>
+              <mediaobject>
+                <imageobject role="fop">
+                  <imagedata fileref="images/Zabbix_ActionOperations.svg" />
+                </imageobject>
+
+                <imageobject role="html">
+                  <imagedata fileref="images/Zabbix_ActionOperations.png" />
+                </imageobject>
+              </mediaobject>
             </listitem>
 
             <listitem>
-              <para>Finally outside Operations details section click<literal>
-              Add</literal></para>
+              <para>Click Add both in the screen and in the return
+              screen.</para>
             </listitem>
           </itemizedlist>
         </listitem>
       </orderedlist>
 
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="images/Zabbix_MediaType.PNG" />
-        </imageobject>
-      </mediaobject>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="images/Zabbix_User.PNG" />
-        </imageobject>
-      </mediaobject>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="images/Zabbix_Action.PNG" />
-        </imageobject>
-      </mediaobject>
-
       <para>Using these instructions, Zabbix will call the
       <literal>zabbix_vitrage.py</literal> script, made readily available by
       the Fuel Vitrage Plugin, to pass the arguments described in step 3. The