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 --- libnetdata/config/README.md | 2 +- libnetdata/config/appconfig.c | 7 +++---- libnetdata/config/appconfig.h | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'libnetdata/config') diff --git a/libnetdata/config/README.md b/libnetdata/config/README.md index a71f1ee18..2eccf7a21 100644 --- a/libnetdata/config/README.md +++ b/libnetdata/config/README.md @@ -51,4 +51,4 @@ When you get the configuration file from the server, there will be a comment above all `name = value` pairs the server does not use. So you know that whatever you wrote there, is not used. -[![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%2Flibnetdata%2Fconfig%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)](<>) + diff --git a/libnetdata/config/appconfig.c b/libnetdata/config/appconfig.c index 37e9e7688..0daa6e5e4 100644 --- a/libnetdata/config/appconfig.c +++ b/libnetdata/config/appconfig.c @@ -591,7 +591,7 @@ int appconfig_load(struct config *root, char *filename, int overwrite_used, cons int line = 0; struct section *co = NULL; int is_exporter_config = 0; - int _backends = 0; // number of backend sections we have + int _connectors = 0; // number of exporting connector sections we have char working_instance[CONFIG_MAX_NAME + 1]; char working_connector[CONFIG_MAX_NAME + 1]; struct section *working_connector_section = NULL; @@ -641,8 +641,8 @@ int appconfig_load(struct config *root, char *filename, int overwrite_used, cons strncpy(working_connector, s, CONFIG_MAX_NAME); s = s + rc + 1; if (unlikely(!(*s))) { - _backends++; - sprintf(buffer, "instance_%d", _backends); + _connectors++; + sprintf(buffer, "instance_%d", _connectors); s = buffer; } strncpy(working_instance, s, CONFIG_MAX_NAME); @@ -793,7 +793,6 @@ void appconfig_generate(struct config *root, BUFFER *wb, int only_changed) || !strcmp(co->name, CONFIG_SECTION_CLOUD) || !strcmp(co->name, CONFIG_SECTION_REGISTRY) || !strcmp(co->name, CONFIG_SECTION_HEALTH) - || !strcmp(co->name, CONFIG_SECTION_BACKEND) || !strcmp(co->name, CONFIG_SECTION_STREAM) || !strcmp(co->name, CONFIG_SECTION_HOST_LABEL) || !strcmp(co->name, CONFIG_SECTION_ML) diff --git a/libnetdata/config/appconfig.h b/libnetdata/config/appconfig.h index bfc927353..b5cf77419 100644 --- a/libnetdata/config/appconfig.h +++ b/libnetdata/config/appconfig.h @@ -89,7 +89,6 @@ #define CONFIG_SECTION_CLOUD "cloud" #define CONFIG_SECTION_REGISTRY "registry" #define CONFIG_SECTION_HEALTH "health" -#define CONFIG_SECTION_BACKEND "backend" #define CONFIG_SECTION_STREAM "stream" #define CONFIG_SECTION_ML "ml" #define CONFIG_SECTION_EXPORTING "exporting:global" -- cgit v1.2.3