[icinga-checkins] icinga.org: icinga-doc/master: docs issue #2093: "ICINGA_" instead "NAGIOS_ " environment vars

git at icinga.org git at icinga.org
Sun Nov 20 22:16:56 CET 2011


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

Author: Wolfgang <wnd at gmx.net>
Date:   Sun Nov 20 22:14:44 2011 +0100

docs issue #2093: "ICINGA_" instead "NAGIOS_" environment vars

---

 de/customobjectvars.xml |   12 ++++++------
 de/macros.xml           |    4 ++--
 en/customobjectvars.xml |   12 ++++++------
 en/macros.xml           |    4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/de/customobjectvars.xml b/de/customobjectvars.xml
index 6ecf938..9607e75 100644
--- a/de/customobjectvars.xml
+++ b/de/customobjectvars.xml
@@ -121,7 +121,7 @@
 
           <entry><para>$_HOSTMAC_ADDRESS$</para></entry>
 
-          <entry><para>NAGIOS__HOSTMAC_ADDRESS</para></entry>
+          <entry><para>ICINGA__HOSTMAC_ADDRESS</para></entry>
         </row>
 
         <row>
@@ -131,7 +131,7 @@
 
           <entry><para>$_HOSTRACK_NUMBER$</para></entry>
 
-          <entry><para>NAGIOS__HOSTRACK_NUMBER</para></entry>
+          <entry><para>ICINGA__HOSTRACK_NUMBER</para></entry>
         </row>
 
         <row>
@@ -141,7 +141,7 @@
 
           <entry><para>$_SERVICESNMP_COMMUNITY$</para></entry>
 
-          <entry><para>NAGIOS__SERVICESNMP_COMMUNITY</para></entry>
+          <entry><para>ICINGA__SERVICESNMP_COMMUNITY</para></entry>
         </row>
 
         <row>
@@ -151,7 +151,7 @@
 
           <entry><para>$_SERVICETECHCONTACT$</para></entry>
 
-          <entry><para>NAGIOS__SERVICETECHCONTACT</para></entry>
+          <entry><para>ICINGA__SERVICETECHCONTACT</para></entry>
         </row>
 
         <row>
@@ -161,7 +161,7 @@
 
           <entry><para>$_CONTACTAIM_USERNAME$</para></entry>
 
-          <entry><para>NAGIOS__CONTACTAIM_USERNAME</para></entry>
+          <entry><para>ICINGA__CONTACTAIM_USERNAME</para></entry>
         </row>
 
         <row>
@@ -171,7 +171,7 @@
 
           <entry><para>$_CONTACTYAHOOID$</para></entry>
 
-          <entry><para>NAGIOS__CONTACTYAHOOID</para></entry>
+          <entry><para>ICINGA__CONTACTYAHOOID</para></entry>
         </row>
       </tbody>
     </tgroup>
diff --git a/de/macros.xml b/de/macros.xml
index 70a756f..9292040 100644
--- a/de/macros.xml
+++ b/de/macros.xml
@@ -255,8 +255,8 @@
   Umgebungsvariablen zur Verfügung gestellt.</para>
 
   <para>Umgebungsvariablen, die Standard-Makros enthalten, werden ebenso wie ihre entsprechenden Makronamen benannt (<link
-  linkend="macrolist">hier</link> aufgeführt), wobei ihnen "NAGIOS_" vorangestellt wird. Beispielsweise wäre das <link
-  linkend="macrolist-hostname">$HOSTNAME$</link>-Makro als Umgebungsvariable "NAGIOS_HOSTNAME" verfügbar.</para>
+  linkend="macrolist">hier</link> aufgeführt), wobei ihnen "ICINGA_" vorangestellt wird. Beispielsweise wäre das <link
+  linkend="macrolist-hostname">$HOSTNAME$</link>-Makro als Umgebungsvariable "ICINGA_HOSTNAME" verfügbar.</para>
 
   <para><emphasis role="bold">Verfügbare Makros</emphasis></para>
 
diff --git a/en/customobjectvars.xml b/en/customobjectvars.xml
index 70fa969..046c759 100644
--- a/en/customobjectvars.xml
+++ b/en/customobjectvars.xml
@@ -122,7 +122,7 @@ define contact{
 
           <entry><para>$_HOSTMAC_ADDRESS$</para></entry>
 
-          <entry><para>NAGIOS__HOSTMAC_ADDRESS</para></entry>
+          <entry><para>ICINGA__HOSTMAC_ADDRESS</para></entry>
         </row>
 
         <row>
@@ -132,7 +132,7 @@ define contact{
 
           <entry><para>$_HOSTRACK_NUMBER$</para></entry>
 
-          <entry><para>NAGIOS__HOSTRACK_NUMBER</para></entry>
+          <entry><para>ICINGA__HOSTRACK_NUMBER</para></entry>
         </row>
 
         <row>
@@ -142,7 +142,7 @@ define contact{
 
           <entry><para>$_SERVICESNMP_COMMUNITY$</para></entry>
 
-          <entry><para>NAGIOS__SERVICESNMP_COMMUNITY</para></entry>
+          <entry><para>ICINGA__SERVICESNMP_COMMUNITY</para></entry>
         </row>
 
         <row>
@@ -152,7 +152,7 @@ define contact{
 
           <entry><para>$_SERVICETECHCONTACT$</para></entry>
 
-          <entry><para>NAGIOS__SERVICETECHCONTACT</para></entry>
+          <entry><para>ICINGA__SERVICETECHCONTACT</para></entry>
         </row>
 
         <row>
@@ -162,7 +162,7 @@ define contact{
 
           <entry><para>$_CONTACTAIM_USERNAME$</para></entry>
 
-          <entry><para>NAGIOS__CONTACTAIM_USERNAME</para></entry>
+          <entry><para>ICINGA__CONTACTAIM_USERNAME</para></entry>
         </row>
 
         <row>
@@ -172,7 +172,7 @@ define contact{
 
           <entry><para>$_CONTACTYAHOOID$</para></entry>
 
-          <entry><para>NAGIOS__CONTACTYAHOOID</para></entry>
+          <entry><para>ICINGA__CONTACTYAHOOID</para></entry>
         </row>
       </tbody>
     </tgroup>
diff --git a/en/macros.xml b/en/macros.xml
index d8e7d82..cbf1c23 100644
--- a/en/macros.xml
+++ b/en/macros.xml
@@ -249,9 +249,9 @@
   service macros are <emphasis role="underline">not</emphasis> made available as environment variables.</para>
 
   <para>Environment variables that contain standard macros are named the same as their corresponding macro names (listed <link
-  linkend="macrolist">here</link>), with "NAGIOS_" prepended to their names. For example, the <link
+  linkend="macrolist">here</link>), with "ICINGA_" prepended to their names. For example, the <link
   linkend="macrolist-hostname">$HOSTNAME$</link> macro would be available as an environment variable named
-  "NAGIOS_HOSTNAME".</para>
+  "ICINGA_HOSTNAME".</para>
 
   <para><emphasis role="bold">Available Macros</emphasis></para>
 





More information about the icinga-checkins mailing list