[icinga-checkins] icinga.org: icinga-doc/next: Feature #3004, new option keep_unknown_macros in configmain.xml

git at icinga.org git at icinga.org
Sat Aug 25 11:59:49 CEST 2012


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

Author: Lara Berdelsmann <berdelsmann at arcor.de>
Date:   Sat Aug 25 11:58:09 2012 +0200

Feature #3004, new option keep_unknown_macros in configmain.xml

---

 de/configmain.xml |   30 ++++++++++++++++++++++++++++++
 en/configmain.xml |   38 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 1 deletions(-)

diff --git a/de/configmain.xml b/de/configmain.xml
index 138cca6..3891d42 100644
--- a/de/configmain.xml
+++ b/de/configmain.xml
@@ -4670,6 +4670,32 @@
   role="bold">$SERVICEOUTPUT$</emphasis>, <emphasis role="bold">$SERVICEPERFDATA$</emphasis>, <emphasis
   role="bold">$SERVICEACKAUTHOR$</emphasis>, und <emphasis role="bold">$SERVICEACKCOMMENT$</emphasis></para>
 
+<para><anchor xml:id="configmain-keep_unknown_macros"/> <emphasis role="bold">Option Behalten von unbekannten Makros</emphasis></para>
+
+  <informaltable frame="none">
+    <tgroup cols="2">
+      <colspec colname="c1" colwidth="5*"/>
+
+      <colspec colname="c2" colwidth="50*"/>
+
+      <tbody>
+        <row>
+          <entry><para>Format:</para></entry>
+
+          <entry><para><emphasis role="bold">keep_unknown_macros=<0/1></emphasis></para></entry>
+        </row>
+
+        <row>
+          <entry><para>Beispiel:</para></entry>
+
+          <entry><para><emphasis condition="red" role="color"><emphasis role="bold">keep_unknown_macros=0</emphasis></emphasis>
+          </para></entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
+<para>Diese Option kann verwendet werden, um unbekannte Makros in der Ausgabe zu belassen, z.B. check_proc -C $foo$, verbleibt in der Kommandozeile. Die Shell versucht $foo zu interpretieren und belässt ein einzelnes $- Zeichen in der Ausgabe. Ab &name-icinga; 1.8 werden solche unbekannten Makros aus der Ausgabe gelöscht. Siehe auch <link xlink:href="https://dev.icinga.org/issues/2291">#2291 </link>für weitere Informationen. Um das alte Verhalten wieder herzustellen muss diese Option aktiviert werden.</para>
+
   <para><anchor xml:id="configmain-use_regexp_matching"/><emphasis role="bold">Option Anpassung regulärer Ausdrücke</emphasis> (Regular
   Expression Matching Option)</para>
 
@@ -5916,7 +5942,11 @@
 
     <secondary>Illegale Makroausgabe</secondary>
   </indexterm>
+<indexterm zone="configmain-keep_unknown_macros">
+    <primary>keep_unknown_macros=</primary>
 
+    <secondary>Unbekannte Makros</secondary>
+  </indexterm>
   <indexterm zone="configmain-use_regexp_matching">
     <primary>use_regexp_matching=</primary>
 
diff --git a/en/configmain.xml b/en/configmain.xml
index b813cb8..fc9b0e6 100644
--- a/en/configmain.xml
+++ b/en/configmain.xml
@@ -561,7 +561,11 @@
       <para><link linkend="configmain-illegal_macro_output_chars">Illegal macro output characters</link></para>
     </listitem>
   </itemizedlist>
-
+<itemizedlist>
+<listitem>
+      <para><link linkend="configmain-keep_unknown_macros">Keep unknown macros</link></para>
+    </listitem>
+  </itemizedlist>
   <itemizedlist>
     <listitem>
       <para><link linkend="configmain-use_regexp_matching">Regular expression matching option</link></para>
@@ -5142,6 +5146,32 @@
   role="bold">$SERVICEOUTPUT$</emphasis>, <emphasis role="bold">$SERVICEPERFDATA$</emphasis>, <emphasis
   role="bold">$SERVICEACKAUTHOR$</emphasis>, and <emphasis role="bold">$SERVICEACKCOMMENT$</emphasis></para>
 
+<para><anchor xml:id="configmain-keep_unknown_macros"/> <emphasis role="bold">Keep Unknown Marcos Option</emphasis></para>
+
+  <informaltable frame="none">
+    <tgroup cols="2">
+      <colspec colname="c1" colwidth="5*"/>
+
+      <colspec colname="c2" colwidth="50*"/>
+
+      <tbody>
+        <row>
+          <entry><para>Format:</para></entry>
+
+          <entry><para><emphasis role="bold">keep_unknown_macros=<0/1></emphasis></para></entry>
+        </row>
+
+        <row>
+          <entry><para>Example:</para></entry>
+
+          <entry><para><emphasis condition="red" role="color"><emphasis role="bold">keep_unknown_macros=0</emphasis></emphasis>
+          </para></entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </informaltable>
+<para>This option can be used to keep unknown macros within the output, e.g. check_proc -C $foo$ will remain on the commandline. This was the default in versions older than &name-icinga; 1.8, but now the default is to remove those macros from the output, causing the shell to interpret $foo and leaving a single $ there. See <link xlink:href="https://dev.icinga.org/issues/2291">#2291</link>for further information. Make sure to escape single dollar signs with another '$', as the docs describe. Other than that, enable this setting to revert to the old behaviour.</para>
+
   <para><anchor xml:id="configmain-use_regexp_matching"/> <emphasis role="bold">Regular Expression Matching Option</emphasis></para>
 
   <informaltable frame="none">
@@ -6406,6 +6436,12 @@
     <secondary>Illegal Macro Output</secondary>
   </indexterm>
 
+<indexterm zone="configmain-keep_unknown_macros">
+    <primary>keep_unknown_macros=</primary>
+
+    <secondary>Keep Unknown Macros</secondary>
+  </indexterm>
+
   <indexterm zone="configmain-use_regexp_matching">
     <primary>use_regexp_matching=</primary>
 





More information about the icinga-checkins mailing list