From bb50acdcb8073654ea667b8c0272e335bd43f844 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 14 Apr 2022 20:12:14 +0200 Subject: Merging upstream version 1.34.0. Signed-off-by: Daniel Baumann --- build_external/README.md | 2 +- .../scenarios/aclk-testing/agent_netdata.conf | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) (limited to 'build_external') diff --git a/build_external/README.md b/build_external/README.md index 6a1e30a57..d68e4d0f1 100644 --- a/build_external/README.md +++ b/build_external/README.md @@ -125,4 +125,4 @@ Notes: * There is not yet a good way to configure the target agent container from the docker-compose command line. * Several other containers should be in this compose (a paho client, tshark etc). -[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fbuild_external%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]() + diff --git a/build_external/scenarios/aclk-testing/agent_netdata.conf b/build_external/scenarios/aclk-testing/agent_netdata.conf index 774005f76..7a2803c21 100644 --- a/build_external/scenarios/aclk-testing/agent_netdata.conf +++ b/build_external/scenarios/aclk-testing/agent_netdata.conf @@ -60,8 +60,6 @@ # listen backlog = 4096 # default port = 19999 # bind to = * - # web files owner = netdata - # web files group = netdata # disconnect idle clients after seconds = 60 # timeout for first request = 60 # accept a streaming request every seconds = 0 @@ -140,21 +138,6 @@ [cloud] # cloud base url = https://netdata.cloud -[backend] - # host tags = - # enabled = no - # data source = average - # type = graphite - # destination = localhost - # prefix = netdata - # hostname = b073e16793c4 - # update every = 10 - # buffer on failures = 10 - # timeout ms = 20000 - # send names instead of ids = yes - # send charts matching = * - # send hosts matching = localhost * - [statsd] # enabled = yes # update every (flushInterval) = 1 -- cgit v1.2.3