From d5b9d4195d173674f56a66f744b3ac327f9f67ef Mon Sep 17 00:00:00 2001
From: Paul Vaduva <Paul.Vaduva@enea.com>
Date: Tue, 7 Nov 2017 13:31:52 +0100
Subject: Updated Zabbix configuration documentations

Updated Documentation on how to config zabbix for
pushed alarms as described in COSNOSCR-574.

Signed-off-by: Paul Vaduva <Paul.Vaduva@enea.com>
---
 .../doc/high_availability.xml                      |  67 ++++++++++++++++++++-
 .../doc/images/Zabbix_Action.PNG                   | Bin 0 -> 29176 bytes
 .../doc/images/Zabbix_Home.PNG                     | Bin 0 -> 68933 bytes
 .../doc/images/Zabbix_MediaType.PNG                | Bin 0 -> 20227 bytes
 .../doc/images/Zabbix_User.PNG                     | Bin 0 -> 30117 bytes
 5 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100755 book-enea-nfv-core-installation-guide/doc/images/Zabbix_Action.PNG
 create mode 100755 book-enea-nfv-core-installation-guide/doc/images/Zabbix_Home.PNG
 create mode 100755 book-enea-nfv-core-installation-guide/doc/images/Zabbix_MediaType.PNG
 create mode 100755 book-enea-nfv-core-installation-guide/doc/images/Zabbix_User.PNG

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 ac2c790..5854e6c 100644
--- a/book-enea-nfv-core-installation-guide/doc/high_availability.xml
+++ b/book-enea-nfv-core-installation-guide/doc/high_availability.xml
@@ -307,6 +307,12 @@
       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>
+      </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>
@@ -348,7 +354,8 @@
               <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>)</para>
+              /etc/nova/nova.conf transport_url</literal>) It's also vital
+              that the url contains the ending "/".</para>
             </listitem>
 
             <listitem>
@@ -362,6 +369,27 @@
             <listitem>
               <para>Status: Enabled</para>
             </listitem>
+
+            <listitem>
+              <para>Click <literal>Update.</literal></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>
+            </listitem>
+
+            <listitem>
+              <para>Click <literal>Select.</literal></para>
+            </listitem>
+
+            <listitem>
+              <para>Click <literal>Update.</literal></para>
+            </listitem>
           </itemizedlist>
         </listitem>
 
@@ -400,7 +428,15 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
             </listitem>
 
             <listitem>
-              <para>Finally, add an operation:</para>
+              <para>Click Operations tab:</para>
+            </listitem>
+
+            <listitem>
+              <para>Under Action operatsion click New</para>
+            </listitem>
+
+            <listitem>
+              <para>In the Operations details section select</para>
 
               <itemizedlist>
                 <listitem>
@@ -412,10 +448,37 @@ lastchange={EVENT.DATE} {EVENT.TIME}</programlisting>
                 </listitem>
               </itemizedlist>
             </listitem>
+
+            <listitem>
+              <para>Click Add in the Operarion details section</para>
+            </listitem>
+
+            <listitem>
+              <para>Finally outside Operations details section click<literal>
+              Add</literal></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
diff --git a/book-enea-nfv-core-installation-guide/doc/images/Zabbix_Action.PNG b/book-enea-nfv-core-installation-guide/doc/images/Zabbix_Action.PNG
new file mode 100755
index 0000000..652801f
Binary files /dev/null and b/book-enea-nfv-core-installation-guide/doc/images/Zabbix_Action.PNG differ
diff --git a/book-enea-nfv-core-installation-guide/doc/images/Zabbix_Home.PNG b/book-enea-nfv-core-installation-guide/doc/images/Zabbix_Home.PNG
new file mode 100755
index 0000000..06fc6d2
Binary files /dev/null and b/book-enea-nfv-core-installation-guide/doc/images/Zabbix_Home.PNG differ
diff --git a/book-enea-nfv-core-installation-guide/doc/images/Zabbix_MediaType.PNG b/book-enea-nfv-core-installation-guide/doc/images/Zabbix_MediaType.PNG
new file mode 100755
index 0000000..65a6870
Binary files /dev/null and b/book-enea-nfv-core-installation-guide/doc/images/Zabbix_MediaType.PNG differ
diff --git a/book-enea-nfv-core-installation-guide/doc/images/Zabbix_User.PNG b/book-enea-nfv-core-installation-guide/doc/images/Zabbix_User.PNG
new file mode 100755
index 0000000..ae70627
Binary files /dev/null and b/book-enea-nfv-core-installation-guide/doc/images/Zabbix_User.PNG differ
-- 
cgit v1.2.3-54-g00ecf