diff options
author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-04-13 08:39:52 -0400 |
---|---|---|
committer | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-04-13 08:42:22 -0400 |
commit | e2874320fc027f7ab51ab3e115d5b1889b8fd747 (patch) | |
tree | cd755ef9b8522634c61aed9888239c9b67394157 /daemon | |
parent | 353780082c0ac8525e5b52aa8a29bbf5b70871e8 (diff) |
Revert changes since v1.21 in pereparation for hotfix release.
Diffstat (limited to 'daemon')
-rw-r--r-- | daemon/common.h | 2 | ||||
-rw-r--r-- | daemon/config/README.md | 3 | ||||
-rw-r--r-- | daemon/main.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/daemon/common.h b/daemon/common.h index f86e61543f..fe799efe09 100644 --- a/daemon/common.h +++ b/daemon/common.h @@ -50,8 +50,6 @@ // backends for archiving the metrics #include "backends/backends.h" -// the new exporting engine for archiving the metrics -#include "exporting/exporting_engine.h" // the netdata API #include "web/api/web_api_v1.h" diff --git a/daemon/config/README.md b/daemon/config/README.md index 01913747d3..73fbf4fa5c 100644 --- a/daemon/config/README.md +++ b/daemon/config/README.md @@ -1,7 +1,6 @@ <!-- --- title: "Daemon configuration" -date: 2020-03-31 custom_edit_url: https://github.com/netdata/netdata/edit/master/daemon/config/README.md --- --> @@ -221,7 +220,7 @@ For example, the `system.io` chart has the following default settings: These `dim` settings produce two dimensions, `in` and `out`, both of which use the `incremental` algorithm. By multiplying the value of `out` by -1, Netdata creates the negative values seen in the following area chart: -![The system.io chart on a macOS +![The system.io chart on a MacOS laptop](https://user-images.githubusercontent.com/1153921/69286708-2cfb3900-0bb1-11ea-9fcd-dd8fbb2adf11.png) [![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%2Fdaemon%2Fconfig%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)](<>) diff --git a/daemon/main.c b/daemon/main.c index e0de2c7357..20ca7d883e 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -80,7 +80,9 @@ struct netdata_static_thread static_threads[] = { // common plugins for all systems {"BACKENDS", NULL, NULL, 1, NULL, NULL, backends_main}, +#ifdef ENABLE_EXPORTING {"EXPORTING", NULL, NULL, 1, NULL, NULL, exporting_main}, +#endif {"WEB_SERVER[static1]", NULL, NULL, 0, NULL, NULL, socket_listen_main_static_threaded}, {"STREAM", NULL, NULL, 0, NULL, NULL, rrdpush_sender_thread}, |