COSNOSCR-574 updated zabbix config, added images for it, updated rel notes ceph storage cluster

1 files changed, 150 insertions, 114 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 41d107b..e6dc825 100644
--- a/book-enea-nfv-core-installation-guide/doc/high_availability.xml
+++ b/book-enea-nfv-core-installation-guide/doc/high_availability.xml
@@ -165,8 +165,8 @@
 
     <mediaobject>
       <imageobject role="fo">
-        <imagedata contentwidth="600" fileref="images/functional_blocks.svg"
-                   format="SVG" />
+        <imagedata align="center" contentwidth="600"
+                   fileref="images/functional_blocks.svg" format="SVG" />
       </imageobject>
     </mediaobject>
 
@@ -184,13 +184,15 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata contentwidth="600" fileref="images/dr_fault_mg.svg" />
+          <imagedata align="center" contentwidth="600"
+                     fileref="images/dr_fault_mg.svg" />
         </imageobject>
       </mediaobject>
 
       <mediaobject>
         <imageobject>
-          <imagedata contentwidth="600" fileref="images/dr_fault_mg_2.svg" />
+          <imagedata align="center" contentwidth="600"
+                     fileref="images/dr_fault_mg_2.svg" />
         </imageobject>
       </mediaobject>
 
@@ -307,29 +309,26 @@
 
       <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>
+      <literal>http://10.0.101.42/zabbix</literal>.</para>
 
       <mediaobject>
-        <imageobject role="fop">
-          <imagedata contentwidth="600" fileref="images/Zabbix_Home.svg" />
-        </imageobject>
-
-        <imageobject role="html">
-          <imagedata fileref="images/Zabbix_Home.png" />
+        <imageobject>
+          <imagedata align="center" contentwidth="600"
+                     fileref="images/Zabbix_Home.svg" />
         </imageobject>
       </mediaobject>
 
-      <para>To forward Zabbix events to Vitrage, a new media script needs to
-      be created and associated with a Zabbix Admin user.</para>
+      <para>To forward Zabbix events to Vitrage, a new media type needs to be
+      created and associated with a Zabbix Admin user.</para>
 
-      <para><emphasis role="bold">To create the
+      <para><emphasis role="bold">To create the Media Type which calls
       zabbix_vitrage.py</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <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>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>
 
           <para>Now fill each parameter field with the values given below,
           before clicking <literal>add</literal>:</para>
@@ -349,22 +348,56 @@
           </itemizedlist>
 
           <mediaobject>
-            <imageobject role="fop">
-              <imagedata contentwidth="600"
+            <imageobject>
+              <imagedata align="center" contentwidth="600"
                          fileref="images/Zabbix_MediaType.svg" />
             </imageobject>
+          </mediaobject>
+        </listitem>
+
+        <listitem>
+          <para>Under <literal>Administration</literal>, in the
+          <literal>Users</literal> tab (next to <literal>Media
+          Types</literal>), click on the drop-down menu <literal>User
+          groups</literal> and select <literal>Users</literal>, to display the
+          list of existing users. Choose from this list, the
+          <literal>admin</literal> alias:</para>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center"
+                         fileref="images/Zabbix_AdminSelectUsers.svg" />
+            </imageobject>
+          </mediaobject>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" contentwidth="600"
+                         fileref="images/Zabbix_AdminUser.svg" />
+            </imageobject>
+          </mediaobject>
+        </listitem>
+
+        <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>
+
+          <mediaobject>
+            <imageobject role="fop">
+              <imagedata align="center" contentwidth="600"
+                         fileref="images/Zabbix_User.svg" />
+            </imageobject>
 
             <imageobject role="html">
-              <imagedata fileref="images/Zabbix_MediaType.png" />
+              <imagedata fileref="images/Zabbix_User.png" />
             </imageobject>
           </mediaobject>
         </listitem>
 
         <listitem>
-          <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>
+          <para>Once the <literal>User groups</literal> popup menu
+          appears:</para>
 
           <itemizedlist>
             <listitem>
@@ -381,20 +414,17 @@
           </itemizedlist>
 
           <mediaobject>
-            <imageobject role="fop">
-              <imagedata contentwidth="600" fileref="images/Zabbix_User.svg" />
-            </imageobject>
-
-            <imageobject role="html">
-              <imagedata fileref="images/Zabbix_User.png" />
+            <imageobject>
+              <imagedata align="center" contentwidth="600"
+                         fileref="images/Zabbix_AdminUserSelectGroup.svg" />
             </imageobject>
           </mediaobject>
         </listitem>
 
         <listitem>
-          <para>Next select the <literal>Media</literal> tab and and click
+          <para>Next, select the <literal>Media</literal> tab 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
+          popup menu will appear for <literal>New Media</literal>. Fill each
           field with the values below:</para>
 
           <itemizedlist>
@@ -404,8 +434,7 @@
 
             <listitem>
               <para>Send to: <literal>e.g.
-              rabbit://rabbit_user:rabbit_pass@127.0.0.1:5672/ ---</literal>
-              Vitrage message bus url.</para>
+              rabbit://nova:Q1Vt9iocA8OpXKOPoUYOLKie@192.168.0.4:5673/</literal></para>
 
               <para>You need to search for this in
               <literal>/etc/vitrage/vitrage.conf or in /etc/nova/nova.conf
@@ -426,24 +455,23 @@
             </listitem>
 
             <listitem>
-              <para>Click <literal>Update</literal></para>
+              <para>Click <literal>Add</literal> and then
+              <literal>Update</literal> to save your changes.</para>
             </listitem>
           </itemizedlist>
 
           <mediaobject>
-            <imageobject role="fop">
-              <imagedata fileref="images/Zabbix_MediaNotifications.svg" />
-            </imageobject>
-
-            <imageobject role="html">
-              <imagedata fileref="images/Zabbix_MediaNotifications.png" />
+            <imageobject>
+              <imagedata align="center" contentwidth="600"
+                         fileref="images/Zabbix_AdminUserMediaAdd.svg" />
             </imageobject>
           </mediaobject>
         </listitem>
 
         <listitem>
-          <para>To configure an action, select <literal>Actions</literal>
-          under the <literal>Configuration</literal> tab. Then, under the
+          <para>To configure an action, under the
+          <literal>Configuration</literal> tab select
+          <literal>Actions</literal>. Then, under the
           <literal>Action</literal> tab, fill in the parameter fields with the
           values below and click <literal>Add</literal></para>
 
@@ -471,14 +499,10 @@ priority={TRIGGER.NSEVERITY}
 lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
 
               <mediaobject>
-                <imageobject role="fop">
-                  <imagedata contentwidth="600"
+                <imageobject>
+                  <imagedata align="center" contentwidth="600"
                              fileref="images/Zabbix_Action.svg" />
                 </imageobject>
-
-                <imageobject role="html">
-                  <imagedata fileref="images/Zabbix_Action.png" />
-                </imageobject>
               </mediaobject>
             </listitem>
           </itemizedlist>
@@ -486,14 +510,23 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
 
         <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>
+          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>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" contentwidth="600"
+                         fileref="images/Zabbix_ActionConditions.svg" />
+            </imageobject>
+          </mediaobject>
         </listitem>
 
         <listitem>
-          <para>In the Operations tab, configure the users you wish to send
-          to:</para>
+          <para>In the <literal>Operations</literal> tab still under
+          <literal>Configuration</literal> and <literal>Actions</literal>,
+          configure the users you wish to send to.</para>
 
           <itemizedlist>
             <listitem>
@@ -515,30 +548,21 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
 
               <mediaobject>
                 <imageobject role="fop">
-                  <imagedata fileref="images/Zabbix_ActionOperations.svg" />
-                </imageobject>
-
-                <imageobject role="html">
-                  <imagedata fileref="images/Zabbix_ActionOperations.png" />
+                  <imagedata align="center" contentwidth="600"
+                             fileref="images/Zabbix_ActionOperations.svg" />
                 </imageobject>
               </mediaobject>
             </listitem>
-
-            <listitem>
-              <para>Click Add both in the screen and in the return
-              screen.</para>
-            </listitem>
           </itemizedlist>
         </listitem>
       </orderedlist>
 
       <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
-      <literal>zabbix_vitrage.py</literal> script will then interpret the
-      parameters and format an AMQP message to be sent to the
-      <literal>vitrage.notifications</literal> queue, managed by the
-      vitrage-graph service.</para>
+      the Fuel Vitrage Plugin, to pass the arguments described above. This
+      script will then interpret the parameters and format an AMQP message to
+      be sent to the <literal>vitrage.notifications</literal> queue, managed
+      by the vitrage-graph service.</para>
     </section>
 
     <section id="vitrage_config">
@@ -555,59 +579,71 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
       <para>In order to make use of these features, Vitrage supports
       additional configurations via <literal>yaml</literal> templates that
       must be placed in <literal>/etc/vitrage/templates</literal> on the nodes
-      have the Vitrage role.</para>
+      that have the Vitrage role.</para>
+
+      <mediaobject>
+        <imageobject role="fop">
+          <imagedata align="center" contentwidth="600"
+                     fileref="images/Vitrage_ConfigurationRole.svg" />
+        </imageobject>
+
+        <imageobject role="html">
+          <imagedata align="center"
+                     fileref="images/Vitrage_ConfigurationRole.png" />
+        </imageobject>
+      </mediaobject>
 
       <para>The example below shows how to program Vitrage to mark failed
       compute hosts as down and then to change the state of the instances to
       ERROR, by creating Vitrage deduced alarms.</para>
 
       <programlisting>metadata:
- name: test_nova_mark_instance_err
- description: test description
+  name: test_mark_inst_err
+  description: test description
 definitions:
- entities:
-  - entity:
-     category: ALARM
-     type: zabbix
-     rawtext: Nova Compute process is not running on {HOST.NAME}
-     template_id:  zabbix_alarm
-  - entity:
-     category: RESOURCE
-     type: nova.host
-     template_id: host
-  - entity:
-     category: RESOURCE
-     type: nova.instance
-     template_id: instance
- relationships:
-  - relationship:
-     source: zabbix_alarm
-     relationship_type: on
-     target: host
-     template_id: nova_process_not_running
-  - relationship:
-      source: host
-      target: instance
-      relationship_type: contains
-      template_id : host_contains_instance
+  entities:
+    - entity:
+        category: ALARM
+        type: zabbix
+        rawtext: Nova Compute process is not running on {HOST.NAME}
+        template_id: zabbix_alarm
+    - entity:
+        category: RESOURCE
+        type: nova.host
+        template_id: host
+    - entity:
+        category: RESOURCE
+        type: nova.instance
+        template_id: instance
+  relationships:
+    - relationship:
+        source: zabbix_alarm
+        relationship_type: on
+        target: host
+        template_id : nova_process_not_running
+    - relationship:
+        source: host
+        target: instance
+        relationship_type: contains
+        template_id : host_contains_instance
 scenarios:
- - scenario:
-    condition: nova_process_not_running and host_contains_instance
-    actions:
-     - action:
-        action_type: mark_down
-        action_target:
-         target: host
-     - action:
-        action_type: set_instance_state
-        action_target:
-         target: instance
-     - action:
-        action_type: set_state
-        action_target:
-         target: instance
-        properties:
-         state: ERROR</programlisting>
+  - scenario:
+      condition: nova_process_not_running and host_contains_instance
+      actions:
+        - action:
+            action_type: mark_down
+            action_target:
+              target: host
+        - action:
+            action_type: set_state
+            action_target:
+              target: instance
+            properties:
+              state: ERROR
+        - action:
+            action_type: set_instance_state
+            action_target:
+              target: instance</programlisting>
 
       <para>For the action type of fencing, a similar action item must be
       added:</para>