Merge pull request #6959 from Gibheer/master

add namespace and instance variable to carbon key

diff --cc docs/settings.rst
Simple merge

diff --cc pdns/auth-carbon.cc
index 325bac326e71bbd7656d8edadf2ce4aa4183f103,9c3697aef6f213d9c1ec421127615c6db94882e4..374b243ccdade2c28c6b226dca6f9b38fba18584
--- 1/pdns/auth-carbon.cc
--- 2/pdns/auth-carbon.cc
+++ b/pdns/auth-carbon.cc
@@@ -35,9 -34,9 +35,10 @@@
  void* carbonDumpThread(void*)
  try
  {
 +  setThreadName("pdns/carbonDump");
    extern StatBag S;
  
+   string namespace_name=arg()["carbon-namespace"];
    string hostname=arg()["carbon-ourname"];
    if(hostname.empty()) {
      char tmp[80];

diff --cc pdns/common_startup.cc
Simple merge

diff --cc pdns/dnsdist-carbon.cc
Simple merge

diff --cc pdns/dnsdist-lua.cc
Simple merge

diff --cc pdns/dnsdist.hh
Simple merge

diff --cc pdns/rec_channel_rec.cc
Simple merge

diff --cc pdns/recursordist/docs/settings.rst
Simple merge