diff options
author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-04-13 10:32:33 -0400 |
---|---|---|
committer | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-04-13 10:32:33 -0400 |
commit | 983a26d1a2c110b35db252b4b79c3f03eb4eeb4b (patch) | |
tree | 85d42c30bc81514bd5c18aa564497e439290523b /daemon | |
parent | 5a12b4a7e42587058b9b42871a1316545d527a57 (diff) |
Revert "Revert changes since v1.21 in pereparation for hotfix release."
This reverts commit e2874320fc027f7ab51ab3e115d5b1889b8fd747.
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, 4 insertions, 3 deletions
diff --git a/daemon/common.h b/daemon/common.h index fe799efe09..f86e61543f 100644 --- a/daemon/common.h +++ b/daemon/common.h @@ -50,6 +50,8 @@ // 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 73fbf4fa5c..01913747d3 100644 --- a/daemon/config/README.md +++ b/daemon/config/README.md @@ -1,6 +1,7 @@ <!-- --- title: "Daemon configuration" +date: 2020-03-31 custom_edit_url: https://github.com/netdata/netdata/edit/master/daemon/config/README.md --- --> @@ -220,7 +221,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 20ca7d883e..e0de2c7357 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -80,9 +80,7 @@ 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}, |