teach dnsdist about uptime metric

diff --git a/pdns/dnsdist-carbon.cc b/pdns/dnsdist-carbon.cc
index e9fc295db06ebd6b2dd6751a865158b6620bfd52..69ab9521a5903c5cd723512126da73b8bc4f343e 100644 (file)
--- a/pdns/dnsdist-carbon.cc
+++ b/pdns/dnsdist-carbon.cc
@@ -10,6 +10,11 @@
 #include "dnsdist.hh"
 
 GlobalStateHolder<CarbonConfig> g_carbon;
+static time_t s_start=time(0);
+uint64_t uptimeOfProcess(const std::string& str)
+{
+  return time(0) - s_start;
+}
 
 void* carbonDumpThread()
 try

diff --git a/pdns/dnsdist.hh b/pdns/dnsdist.hh
index 09f8aefd981dcdba2429eee5082de950a5c6bf9f..c1e74374525cbc12d6e43942ae11f837703f9229 100644 (file)
--- a/pdns/dnsdist.hh
+++ b/pdns/dnsdist.hh
@@ -11,6 +11,7 @@
 #include <thread>
 #include "sholder.hh"
 void* carbonDumpThread();
+uint64_t uptimeOfProcess(const std::string& str);
 struct DNSDistStats
 {
   using stat_t=std::atomic<uint64_t>; // aww yiss ;-)
@@ -43,6 +44,7 @@ struct DNSDistStats
     {"latency100-1000", &latency100_1000}, {"latency-slow", &latencySlow},
     {"latency-avg100", &latencyAvg100}, {"latency-avg1000", &latencyAvg1000}, 
     {"latency-avg10000", &latencyAvg10000}, {"latency-avg1000000", &latencyAvg1000000},
+    {"uptime", uptimeOfProcess},
     {"real-memory-usage", getRealMemoryUsage}
   };
 };