Fix carbon-instance / carbon-namespace inconsistencies

diff --git a/pdns/auth-carbon.cc b/pdns/auth-carbon.cc
index 374b243ccdade2c28c6b226dca6f9b38fba18584..4d0cfcb7826932e7430459b3169ef3389f9e1a50 100644 (file)
--- a/pdns/auth-carbon.cc
+++ b/pdns/auth-carbon.cc
@@ -49,7 +49,7 @@ try
     hostname=tmp;
     boost::replace_all(hostname, ".", "_");
   }
-  string instance_name=arg()["carbon-instancename"];
+  string instance_name=arg()["carbon-instance"];
 
   vector<string> carbonServers;
   stringtok(carbonServers, arg()["carbon-server"], ", ");

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 651f52740328706a8e150099b0be3df6ad8522a2..f6c158f3bf408e927aa785dc494730f2aa4a9bb6 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -156,7 +156,7 @@ void declareArguments()
 
   ::arg().set("carbon-namespace", "If set overwrites the first part of the carbon string")="pdns";
   ::arg().set("carbon-ourname", "If set, overrides our reported hostname for carbon stats")="";
-  ::arg().set("carbon-instancename", "If set overwrites the the instance name default")="auth";
+  ::arg().set("carbon-instance", "If set overwrites the the instance name default")="auth";
   ::arg().set("carbon-server", "If set, send metrics in carbon (graphite) format to this server IP address")="";
   ::arg().set("carbon-interval", "Number of seconds between carbon (graphite) updates")="30";
 

diff --git a/pdns/dnsdist-carbon.cc b/pdns/dnsdist-carbon.cc
index 6815cc976273986d28132514d2799b1f686b286b..d0ece8f4757a0fc4651967cca4fc65902312167d 100644 (file)
--- a/pdns/dnsdist-carbon.cc
+++ b/pdns/dnsdist-carbon.cc
@@ -56,10 +56,7 @@ try
 
     for (const auto& conf : *localCarbon) {
       const auto& server = conf.server;
-      std::string namespace_name = conf.namespace_name;
-      if(namespace_name.empty()) {
-        namespace_name="dnsdist";
-      }
+      const std::string& namespace_name = conf.namespace_name;
       std::string hostname = conf.ourname;
       if(hostname.empty()) {
         char tmp[80];
@@ -70,10 +67,7 @@ try
         hostname=tmp;
         boost::replace_all(hostname, ".", "_");
       }
-      std::string instance_name = conf.instance_name;
-      if(instance_name.empty()) {
-        instance_name="main";
-      }
+      const std::string& instance_name = conf.instance_name;
 
       try {
         Socket s(server.sin4.sin_family, SOCK_STREAM);

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index 95b25b0f028cd7f876423d48b91c0154af2653d8..bc6f22304b5ebe02bf5b1386cdfed4473f480484 100644 (file)
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -641,17 +641,18 @@ void setupLuaConfig(bool client)
 
   g_lua.writeFunction("carbonServer", [](const std::string& address, boost::optional<string> ourName,
                                         boost::optional<unsigned int> interval, boost::optional<string> namespace_name,
-           boost::optional<string> instance_name) {
-                        setLuaSideEffect();
-                       auto ours = g_carbon.getCopy();
-                       ours.push_back({
-          ComboAddress(address, 2003),
-          namespace_name ? *namespace_name : "dnsdist",
-          ourName ? *ourName : "", 
-instance_name ? *instance_name : "main" ,
-          interval ? *interval : 30, });
-                       g_carbon.setState(ours);
-                     });
+                                         boost::optional<string> instance_name) {
+      setLuaSideEffect();
+      auto ours = g_carbon.getCopy();
+      ours.push_back({
+        ComboAddress(address, 2003),
+        (namespace_name && !namespace_name->empty()) ? *namespace_name : "dnsdist",
+        ourName ? *ourName : "",
+        (instance_name && !instance_name->empty()) ? *instance_name : "main" ,
+        interval ? *interval : 30
+      });
+      g_carbon.setState(ours);
+  });
 
   g_lua.writeFunction("webserver", [client](const std::string& address, const std::string& password, const boost::optional<std::string> apiKey, const boost::optional<std::map<std::string, std::string> > customHeaders) {
       setLuaSideEffect();

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 85d79f73777d6da090fbcf6f856b8b955ff340cf..622cc2b83e6c3ac2315dc25d54fdd401186dbea2 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4122,6 +4122,9 @@ int main(int argc, char **argv)
     ::arg().set("carbon-ourname", "If set, overrides our reported hostname for carbon stats")="";
     ::arg().set("carbon-server", "If set, send metrics in carbon (graphite) format to this server IP address")="";
     ::arg().set("carbon-interval", "Number of seconds between carbon (graphite) updates")="30";
+    ::arg().set("carbon-namespace", "If set overwrites the first part of the carbon string")="pdns";
+    ::arg().set("carbon-instance", "If set overwrites the the instance name default")="recursor";
+
     ::arg().set("statistics-interval", "Number of seconds between printing of recursor statistics, 0 to disable")="1800";
     ::arg().set("quiet","Suppress logging of questions and answers")="";
     ::arg().set("logging-facility","Facility to log messages as. 0 corresponds to local0")="";