[icinga-checkins] icinga.org: icinga-doc/master: Feature #782 #822

git at icinga.org git at icinga.org
Tue Sep 28 00:09:03 CEST 2010


Module: icinga-doc
Branch: master
Commit: d6c90c316d5914549d45ff6c48cb219a12c3816a
URL:    https://git.icinga.org/?p=icinga-doc.git;a=commit;h=d6c90c316d5914549d45ff6c48cb219a12c3816a

Author: Lara Berdelsmann <berdelsmann at arcor.de>
Date:   Mon Sep 27 23:46:43 2010 +0200

Feature #782 #822

---

 de/Icinga.xml         |    2 ++
 de/icinga-web-pnp.xml |   11 +++++++++++
 en/Icinga.xml         |    2 ++
 en/icinga-web-api.xml |   19 +++++++++++++++++--
 en/icinga-web-pnp.xml |   49 +++++++++++++++++++++++++++++++------------------
 5 files changed, 63 insertions(+), 20 deletions(-)

diff --git a/de/Icinga.xml b/de/Icinga.xml
index 7431fcb..bbc58f7 100644
--- a/de/Icinga.xml
+++ b/de/Icinga.xml
@@ -319,6 +319,8 @@
     <xi:include href="extcommands2.xml" />
 
     <xi:include href="icinga-api.xml" />
+
+<xi:include href="icinga-web-api.xml" />
   </chapter>
 
   <chapter version="5.0" xml:id="ch12">
diff --git a/de/icinga-web-pnp.xml b/de/icinga-web-pnp.xml
index 4a8101a..4d136eb 100644
--- a/de/icinga-web-pnp.xml
+++ b/de/icinga-web-pnp.xml
@@ -123,6 +123,17 @@ $conf['nagios_base'] = "/icinga/cgi-bin";</programlisting></para>
 </ae:parameter></programlisting></para>
     </listitem>
   </orderedlist>
+<note>
+    <para>Bitte denken Sie daran, wenn Sie eine *.xml-Datei editieren, müssen Sie danach den Cache bereinigen!</para>
+  </note>
+
+  <programlisting>rm -f app/cache/config/*.php</programlisting>
+
+  <para>oder</para>
+
+  <programlisting>/icinga-web/bin/clearcache.sh</programlisting>
+
+  <para>Das war es auch schon, Sie sind fertig!</para>
 <indexterm zone="icinga-web-pnp">
         <primary>&name-pnp;</primary>
 
diff --git a/en/Icinga.xml b/en/Icinga.xml
index c40549e..fed53a4 100644
--- a/en/Icinga.xml
+++ b/en/Icinga.xml
@@ -322,6 +322,8 @@
     <xi:include href="extcommands2.xml" />
 
     <xi:include href="icinga-api.xml" />
+
+<xi:include href="icinga-web-api.xml" />
   </chapter>
 
   <chapter version="5.0" xml:id="ch12">
diff --git a/en/icinga-web-api.xml b/en/icinga-web-api.xml
index a768409..f9d015f 100644
--- a/en/icinga-web-api.xml
+++ b/en/icinga-web-api.xml
@@ -15,7 +15,8 @@
 
   <para>For most people, the combination &name-icinga;/&name-web; will fit most needs. You can see your monitoring status, act on problems
   and extend it to suit your needs (Modules/Cronks). But sometimes, you have another piece of software that is interested in some monitoring
-  data (for example, Icinga-Chromed-Status:http://www.icinga.org/2010/07/16/icinga-chromed-status-for-google-chrome/chromium/). You could
+  data (for example: <link
+  xlink:href="http://www.icinga.org/2010/07/16/icinga-chromed-status-for-google-chrome/chromium/">Icinga-Chromed-Status</link>). You could
   parse the cgi output of &name-icinga; (many programs do that at this time), but that's not really a high performance solution - and
   certainly no fun for the developer. The goal of the REST API is to return the data you want (and only the data you want) in a
   standardized, machine-readable format like JSON or XML</para>
@@ -77,7 +78,15 @@
     <ae:parameter name="auth_provider">Auth.Provider.AuthKey</ae:parameter>
     <ae:parameter name="auth_enable">true</ae:parameter>
     <ae:parameter name="auth_authoritative">true</ae:parameter>
-</ae:parameter></programlisting> Afterwards, clear the cache (icinga-web/bin/clearcache.sh).</para>
+</ae:parameter></programlisting></para>
+<note>
+    <para>If you edit any *.xml-File you have to clear the cache afterwards!</para>
+  </note>
+
+  <programlisting>rm -f app/cache/config/*.php</programlisting>
+<para>or</para>
+
+  <programlisting>/icinga-web/bin/clearcache.sh</programlisting>
 
   <para>Now, in &name-web;, you have to add an user with Api access: <itemizedlist>
       <listitem>
@@ -377,4 +386,10 @@ order(SERVICE_CURRENT_STATE;DESC)/countColumn=SERVICE_ID/authkey=APITEST123456/x
 http://localhost/icinga-web/web/api/xml </programlisting>
 
   <para>This would return the same result as the GET Request shown before.</para>
+
+  <indexterm zone="icinga-web-api">
+    <primary>&name-api;</primary>
+
+    <secondary>&name-web; REST API;</secondary>
+  </indexterm>
 </section>
diff --git a/en/icinga-web-pnp.xml b/en/icinga-web-pnp.xml
index 816771c..3ada2f9 100644
--- a/en/icinga-web-pnp.xml
+++ b/en/icinga-web-pnp.xml
@@ -8,19 +8,20 @@
          xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook">
   <title>Integration of &name-pnp; into &name-web;</title>
 
-  <para>Here we'll give you a little instruction how to integrate &name-pnp; to the &name-web; Frontend. If you want to integrate &name-pnp; to the &name-ui; please follow the &name-pnp; <link
-      xlink:href="http://docs.pnp4nagios.org/en/pnp-0.6/start">documentation</link> </para>
-<para>
-  <figure>
-    <title>&name-pnp; integrated in &name-web;</title>
-    <mediaobject>
-      <imageobject role="html">
-        <imagedata fileref="../images/MyServiceStatus.png" format="PNG"></imagedata>
-      </imageobject>
-    </mediaobject>
-  </figure>
-</para>
-  <para><emphasis role="bold"> Install &name-pnp;</emphasis></para>
+  <para>Here we'll give you a little instruction how to integrate &name-pnp; to the &name-web; Frontend. If you want to integrate &name-pnp;
+  to the &name-ui; please follow the &name-pnp; <link xlink:href="http://docs.pnp4nagios.org/en/pnp-0.6/start">documentation</link></para>
+
+  <para><figure>
+      <title>&name-pnp; integrated in &name-web;</title>
+
+      <mediaobject>
+        <imageobject role="html">
+          <imagedata fileref="../images/MyServiceStatus.png" format="PNG"></imagedata>
+        </imageobject>
+      </mediaobject>
+    </figure></para>
+
+  <para><emphasis role="bold">Install &name-pnp;</emphasis></para>
 
   <orderedlist>
     <listitem>
@@ -39,7 +40,6 @@
 LOG_FILE = /var/log/icinga/perfdata.log</programlisting> <programlisting>#> vi config.php 
 $conf['nagios_base'] = "/icinga/cgi-bin";</programlisting></para>
     </listitem>
-   
   </orderedlist>
 
   <para><emphasis role="bold">Create a configuration to include &name-pnp; host pages in &name-web;</emphasis></para>
@@ -122,9 +122,22 @@ $conf['nagios_base'] = "/icinga/cgi-bin";</programlisting></para>
 </ae:parameter></programlisting></para>
     </listitem>
   </orderedlist>
-<indexterm zone="icinga-web-pnp">
-        <primary>&name-pnp;</primary>
 
-        <secondary>&name-pnp; with &name-web;</secondary>
-    </indexterm>
+  <note>
+    <para>If you edit any *.xml-File you have to clear the cache afterwards!</para>
+  </note>
+
+  <programlisting>rm -f app/cache/config/*.php</programlisting>
+
+  <para>or</para>
+
+  <programlisting>/icinga-web/bin/clearcache.sh</programlisting>
+
+  <para>That's all, you're done!</para>
+
+  <indexterm zone="icinga-web-pnp">
+    <primary>&name-pnp;</primary>
+
+    <secondary>&name-pnp; with &name-web;</secondary>
+  </indexterm>
 </section>





More information about the icinga-checkins mailing list