From: Gibheer Date: Tue, 2 Oct 2018 06:54:19 +0000 (+0200) Subject: add versionadded for the new carbon options X-Git-Tag: auth-4.2.0-alpha1~49^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dd919af8c1b41a839cc06b8ac859fa45ecb8fd8;p=thirdparty%2Fpdns.git add versionadded for the new carbon options --- diff --git a/docs/settings.rst b/docs/settings.rst index 7a158ef71c..419ae4df07 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -185,6 +185,8 @@ Seconds to store packets in the :ref:`packet-cache`. - String - Default: pdns +.. versionadded:: 4.2.0 + Set the namespace or first string of the metric key. Be careful not to include any dots in this setting, unless you know what you are doing. See :ref:`metricscarbon` @@ -209,6 +211,8 @@ you are doing. See :ref:`metricscarbon` - String - Default: auth +.. versionadded:: 4.2.0 + Set the instance or third string of the metric key. Be careful not to include any dots in this setting, unless you know what you are doing. See :ref:`metricscarbon` diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst index 4e82c2ed93..86e30f8b28 100644 --- a/pdns/recursordist/docs/settings.rst +++ b/pdns/recursordist/docs/settings.rst @@ -140,6 +140,8 @@ See :doc:`metrics`. ``carbon-namespace`` -------------------- +.. versionadded:: 4.2.0 + - String Change the namespace or first string of the metric key. The default is pdns. @@ -158,6 +160,8 @@ See :ref:`metricscarbon`. ``carbon-instance`` -------------------- +.. versionadded:: 4.2.0 + - String Change the instance or third string of the metric key. The default is recursor.