Merge branch 'master' of github.com:PowerDNS/pdns

Conflicts:
	pdns/dnsdist.hh

diff --cc pdns/README-dnsdist.md
Simple merge

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

diff --cc pdns/dnsdist.cc
index f7482cced4cb81886e1b6a8dd993cbbe3653d208,c60d9dd3572e4eaf102942eefd88279d2c32a382..24141f9d6d8c2505b6aec0d5149069cfe2e9d7e8
--- 1/pdns/dnsdist.cc
--- 2/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@@ -1259,15 -1262,10 +1274,15 @@@ tr
      }
    }
  
 +  if(g_dstates.getCopy().empty()) {
 +    errlog("No downstream servers defined: all packets will get dropped");
 +    // you might define them later, but you need to know
 +  }
 +
    for(auto& dss : g_dstates.getCopy()) { // it is a copy, but the internal shared_ptrs are the real deal
      if(dss->availability==DownstreamState::Availability::Auto) {
-       bool newState=upCheck(dss->remote);
-       warnlog("Marking downstream %s as '%s'", dss->getName(), newState ? "up" : "down");
+       bool newState=upCheck(dss->remote, dss->checkName, dss->checkType, dss->mustResolve);
+       warnlog("Marking downstream %s as '%s'", dss->remote.toStringWithPort(), newState ? "up" : "down");
        dss->upStatus = newState;
      }
    }

diff --cc pdns/dnsdist.hh
index bae1e8b9ed6410286743e5e5b5fbfeb70eb344e3,8ace38a00568c0f330c37ec3cb5ef5d6a813151f..f5d3ab7803b58f9a8f51a71486f9db4b44d8d645
--- 1/pdns/dnsdist.hh
--- 2/pdns/dnsdist.hh
+++ b/pdns/dnsdist.hh
@@@ -47,8 -46,9 +47,10 @@@ struct DNSDistStat
      {"latency-avg10000", &latencyAvg10000}, {"latency-avg1000000", &latencyAvg1000000},
      {"uptime", uptimeOfProcess},
      {"real-memory-usage", getRealMemoryUsage},
-     {"fd-usage", getOpenFileDescriptors},
-     {"noncompliant-queries", &nonCompliantQueries}
++    {"noncompliant-queries", &nonCompliantQueries},
+     {"cpu-user-msec", getCPUTimeUser},
+     {"cpu-sys-msec", getCPUTimeSystem},
+     {"fd-usage", getOpenFileDescriptors}
    };
  };