From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 15 Nov 2018 16:12:29 +0000 (+0100)
Subject: Fix carbon-instance / carbon-namespace inconsistencies
X-Git-Tag: auth-4.2.0-alpha1~37^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7201%2Fhead;p=thirdparty%2Fpdns.git

Fix carbon-instance / carbon-namespace inconsistencies
---

diff --git a/pdns/auth-carbon.cc b/pdns/auth-carbon.cc
index 374b243ccd..4d0cfcb782 100644
--- 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 651f527403..f6c158f3bf 100644
--- 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 6815cc9762..d0ece8f475 100644
--- 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 95b25b0f02..bc6f22304b 100644
--- 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 85d79f7377..622cc2b83e 100644
--- 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")="";