From 46541751ed1c3bc051d78217543d5fc76733e212 Mon Sep 17 00:00:00 2001
From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 25 Dec 2014 20:47:01 +0100
Subject: [PATCH] replace dots in hostname by underscores for carbon reporting,
 and document this.

---
 pdns/auth-carbon.cc                     |  1 +
 pdns/docs/markdown/common/logging.md    | 13 ++++++++++++-
 pdns/docs/markdown/recursor/settings.md |  6 +++++-
 pdns/rec-carbon.cc                      |  1 +
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pdns/auth-carbon.cc b/pdns/auth-carbon.cc
index a1811fbaa..5b87f04d0 100644
--- a/pdns/auth-carbon.cc
+++ b/pdns/auth-carbon.cc
@@ -39,6 +39,7 @@ try
 	char *p = strchr(tmp, '.');
 	if(p) *p=0;
 	hostname=tmp;
+	boost::replace_all(hostname, ".", "_");
       }
       BOOST_FOREACH(const string& entry, entries) {
 	str<<"pdns."<<hostname<<".auth."<<entry<<' '<<S.read(entry)<<' '<<now<<"\r\n";
diff --git a/pdns/docs/markdown/common/logging.md b/pdns/docs/markdown/common/logging.md
index 4a12897ae..a627bfb2f 100644
--- a/pdns/docs/markdown/common/logging.md
+++ b/pdns/docs/markdown/common/logging.md
@@ -129,8 +129,19 @@ LegendI[recursing]: recursing-answers
 ## Sending to Carbon/Graphite/Metronome
 For carbon/graphite/metronome, we use the following namespace. Everything starts with 'pdns.', which is then followed by the local hostname. Thirdly, we add either 'auth' or 'recursor' to siginify the daemon generating the metrics. This is then rounded off with the actual name of the metric. As an example: 'pdns.ns1.recursor.questions'.
 
+**Warning**: If your hostname includes dots, beyond 3.6.2 they will be
+replaced by underscores so as not to confuse the namespace. In 3.6.2 and earlier,
+any dots will remain unchanged. See below for how to override the hostname.
+
 Care has been taken to make the sending of statistics as unobtrusive as possible, the daemons will not be hindered by an unreachable carbon server, timeouts or connection refused situations.
 
 To benefit from our carbon/graphite support, either install Graphite, or use our own lightweight statistics daemon, Metronome, currently available on [GitHub](https://github.com/ahupowerdns/metronome/).
 
-Secondly, set [`carbon-server`](../authoritative/settings.md#carbon-server), possibly [`carbon-interval`](../authoritative/settings.md#carbon-interval) and possibly [`carbon-ourname`](../authoritative/settings.md#carbon-ourname) in the configuration.
+Secondly, set [`carbon-server`](../authoritative/settings.md#carbon-server),
+possibly [`carbon-interval`](../authoritative/settings.md#carbon-interval)
+and possibly [`carbon-ourname`](../authoritative/settings.md#carbon-ourname)
+in the configuration.
+
+**Warning**: If you include dots in `carbon-ourname`, they will not be replaced by underscores, 
+since PowerDNS assumes you know what you are doing if you override your hostname.
+
diff --git a/pdns/docs/markdown/recursor/settings.md b/pdns/docs/markdown/recursor/settings.md
index ab5ba78b9..6cd97707d 100644
--- a/pdns/docs/markdown/recursor/settings.md
+++ b/pdns/docs/markdown/recursor/settings.md
@@ -20,7 +20,11 @@ Authoritative zones can transmit a TTL value that is lower than that specified i
 Comma separated list of 'zonename=filename' pairs. Zones read from these files (in BIND format) are served authoritatively. Example: `auth-zones=example.org=/var/zones/example.org, powerdns.com=/var/zones/powerdns.com`. Available since version 3.1.
 
 ## `carbon-ourname`
-If sending carbon updates, if set, this will override our hostname. See ["PowerDNS Metrics"](../common/logging.md#sending-to-carbongraphitemetronome). Available beyond 3.5.3.
+If sending carbon updates, if set, this will override our hostname. Be
+careful not to include any dots in this setting, unless you know what you
+are doing.  See ["PowerDNS Metrics"](../common/logging.md#sending-to-carbongraphitemetronome). 
+Available beyond 3.5.3.
+
 
 ## `carbon-server=...`
 If set to an IP or IPv6 address, will send all available metrics to this server via the carbon protocol, which is used by graphite and metronome. See ["PowerDNS Metrics"](../common/logging.md#sending-to-carbongraphitemetronome). Available beyond 3.5.3.
diff --git a/pdns/rec-carbon.cc b/pdns/rec-carbon.cc
index 1029e2011..6b17540ba 100644
--- a/pdns/rec-carbon.cc
+++ b/pdns/rec-carbon.cc
@@ -42,6 +42,7 @@ try
     if(p) *p=0;
 
     hostname=tmp;
+    boost::replace_all(hostname, ".", "_");    
   }
   BOOST_FOREACH(const all_t::value_type& val, all) {
     str<<"pdns."<<hostname<<".recursor."<<val.first<<' '<<val.second<<' '<<now<<"\r\n";
-- 
2.40.0