summaryrefslogtreecommitdiffstats
path: root/exporting
diff options
context:
space:
mode:
Diffstat (limited to 'exporting')
-rw-r--r--exporting/aws_kinesis/aws_kinesis.c4
-rw-r--r--exporting/check_filters.c4
-rw-r--r--exporting/clean_connectors.c4
-rw-r--r--exporting/exporting_engine.c10
-rw-r--r--exporting/mongodb/mongodb.c4
-rw-r--r--exporting/prometheus/prometheus.c2
-rw-r--r--exporting/pubsub/pubsub.c4
-rw-r--r--exporting/read_config.c18
-rw-r--r--exporting/send_data.c2
9 files changed, 26 insertions, 26 deletions
diff --git a/exporting/aws_kinesis/aws_kinesis.c b/exporting/aws_kinesis/aws_kinesis.c
index c7d7a9d344..9aa7e1aa1a 100644
--- a/exporting/aws_kinesis/aws_kinesis.c
+++ b/exporting/aws_kinesis/aws_kinesis.c
@@ -7,7 +7,7 @@
*/
void aws_kinesis_cleanup(struct instance *instance)
{
- info("EXPORTING: cleaning up instance %s ...", instance->config.name);
+ netdata_log_info("EXPORTING: cleaning up instance %s ...", instance->config.name);
kinesis_shutdown(instance->connector_specific_data);
freez(instance->connector_specific_data);
@@ -21,7 +21,7 @@ void aws_kinesis_cleanup(struct instance *instance)
freez(connector_specific_config);
}
- info("EXPORTING: instance %s exited", instance->config.name);
+ netdata_log_info("EXPORTING: instance %s exited", instance->config.name);
instance->exited = 1;
}
diff --git a/exporting/check_filters.c b/exporting/check_filters.c
index 9b573f02ab..ff3f808811 100644
--- a/exporting/check_filters.c
+++ b/exporting/check_filters.c
@@ -29,10 +29,10 @@ int rrdhost_is_exportable(struct instance *instance, RRDHOST *host)
if (!instance->config.hosts_pattern || simple_pattern_matches(instance->config.hosts_pattern, host_name)) {
*flags |= RRDHOST_FLAG_EXPORTING_SEND;
- info("enabled exporting of host '%s' for instance '%s'", host_name, instance->config.name);
+ netdata_log_info("enabled exporting of host '%s' for instance '%s'", host_name, instance->config.name);
} else {
*flags |= RRDHOST_FLAG_EXPORTING_DONT_SEND;
- info("disabled exporting of host '%s' for instance '%s'", host_name, instance->config.name);
+ netdata_log_info("disabled exporting of host '%s' for instance '%s'", host_name, instance->config.name);
}
}
diff --git a/exporting/clean_connectors.c b/exporting/clean_connectors.c
index ab1fb5dd7b..c850c5ffa2 100644
--- a/exporting/clean_connectors.c
+++ b/exporting/clean_connectors.c
@@ -46,7 +46,7 @@ void clean_instance(struct instance *instance)
*/
void simple_connector_cleanup(struct instance *instance)
{
- info("EXPORTING: cleaning up instance %s ...", instance->config.name);
+ netdata_log_info("EXPORTING: cleaning up instance %s ...", instance->config.name);
struct simple_connector_data *simple_connector_data =
(struct simple_connector_data *)instance->connector_specific_data;
@@ -77,6 +77,6 @@ void simple_connector_cleanup(struct instance *instance)
(struct simple_connector_config *)instance->config.connector_specific_config;
freez(simple_connector_config);
- info("EXPORTING: instance %s exited", instance->config.name);
+ netdata_log_info("EXPORTING: instance %s exited", instance->config.name);
instance->exited = 1;
}
diff --git a/exporting/exporting_engine.c b/exporting/exporting_engine.c
index 8f957c7c57..50bad99429 100644
--- a/exporting/exporting_engine.c
+++ b/exporting/exporting_engine.c
@@ -124,7 +124,7 @@ static void exporting_main_cleanup(void *ptr)
struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
- info("cleaning up...");
+ netdata_log_info("cleaning up...");
if (!engine) {
static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
@@ -139,17 +139,17 @@ static void exporting_main_cleanup(void *ptr)
for (struct instance *instance = engine->instance_root; instance; instance = instance->next) {
if (!instance->exited) {
found++;
- info("stopping worker for instance %s", instance->config.name);
+ netdata_log_info("stopping worker for instance %s", instance->config.name);
uv_mutex_unlock(&instance->mutex);
instance->data_is_ready = 1;
uv_cond_signal(&instance->cond_var);
} else
- info("found stopped worker for instance %s", instance->config.name);
+ netdata_log_info("found stopped worker for instance %s", instance->config.name);
}
while (found && max > 0) {
max -= step;
- info("Waiting %d exporting connectors to finish...", found);
+ netdata_log_info("Waiting %d exporting connectors to finish...", found);
sleep_usec(step);
found = 0;
@@ -178,7 +178,7 @@ void *exporting_main(void *ptr)
engine = read_exporting_config();
if (!engine) {
- info("EXPORTING: no exporting connectors configured");
+ netdata_log_info("EXPORTING: no exporting connectors configured");
goto cleanup;
}
diff --git a/exporting/mongodb/mongodb.c b/exporting/mongodb/mongodb.c
index 186a7dcfdc..9a5ae3fc2e 100644
--- a/exporting/mongodb/mongodb.c
+++ b/exporting/mongodb/mongodb.c
@@ -229,7 +229,7 @@ int format_batch_mongodb(struct instance *instance)
*/
void mongodb_cleanup(struct instance *instance)
{
- info("EXPORTING: cleaning up instance %s ...", instance->config.name);
+ netdata_log_info("EXPORTING: cleaning up instance %s ...", instance->config.name);
struct mongodb_specific_data *connector_specific_data =
(struct mongodb_specific_data *)instance->connector_specific_data;
@@ -261,7 +261,7 @@ void mongodb_cleanup(struct instance *instance)
freez(connector_specific_config->collection);
freez(connector_specific_config);
- info("EXPORTING: instance %s exited", instance->config.name);
+ netdata_log_info("EXPORTING: instance %s exited", instance->config.name);
instance->exited = 1;
return;
diff --git a/exporting/prometheus/prometheus.c b/exporting/prometheus/prometheus.c
index 5736efecac..e46c667998 100644
--- a/exporting/prometheus/prometheus.c
+++ b/exporting/prometheus/prometheus.c
@@ -244,7 +244,7 @@ inline char *prometheus_units_copy(char *d, const char *s, size_t usable, int sh
uint32_t hash = simple_hash(s);
for (i = 0; units[i].newunit; i++) {
if (unlikely(hash == units[i].hash && !strcmp(s, units[i].newunit))) {
- // info("matched extension for filename '%s': '%s'", filename, last_dot);
+ // netdata_log_info("matched extension for filename '%s': '%s'", filename, last_dot);
s = units[i].oldunit;
sorig = s;
break;
diff --git a/exporting/pubsub/pubsub.c b/exporting/pubsub/pubsub.c
index d65fc2c401..b889801021 100644
--- a/exporting/pubsub/pubsub.c
+++ b/exporting/pubsub/pubsub.c
@@ -64,7 +64,7 @@ int init_pubsub_instance(struct instance *instance)
*/
void clean_pubsub_instance(struct instance *instance)
{
- info("EXPORTING: cleaning up instance %s ...", instance->config.name);
+ netdata_log_info("EXPORTING: cleaning up instance %s ...", instance->config.name);
struct pubsub_specific_data *connector_specific_data =
(struct pubsub_specific_data *)instance->connector_specific_data;
@@ -80,7 +80,7 @@ void clean_pubsub_instance(struct instance *instance)
freez(connector_specific_config->topic_id);
freez(connector_specific_config);
- info("EXPORTING: instance %s exited", instance->config.name);
+ netdata_log_info("EXPORTING: instance %s exited", instance->config.name);
instance->exited = 1;
return;
diff --git a/exporting/read_config.c b/exporting/read_config.c
index eab2cdfc0b..c1cdfd26db 100644
--- a/exporting/read_config.c
+++ b/exporting/read_config.c
@@ -211,13 +211,13 @@ struct engine *read_exporting_config()
exporting_config_exists = appconfig_load(&exporting_config, filename, 0, NULL);
if (!exporting_config_exists) {
- info("CONFIG: cannot load user exporting config '%s'. Will try the stock version.", filename);
+ netdata_log_info("CONFIG: cannot load user exporting config '%s'. Will try the stock version.", filename);
freez(filename);
filename = strdupz_path_subpath(netdata_configured_stock_config_dir, EXPORTING_CONF);
exporting_config_exists = appconfig_load(&exporting_config, filename, 0, NULL);
if (!exporting_config_exists)
- info("CONFIG: cannot load stock exporting config '%s'. Running with internal defaults.", filename);
+ netdata_log_info("CONFIG: cannot load stock exporting config '%s'. Running with internal defaults.", filename);
}
freez(filename);
@@ -276,10 +276,10 @@ struct engine *read_exporting_config()
}
while (get_connector_instance(&local_ci)) {
- info("Processing connector instance (%s)", local_ci.instance_name);
+ netdata_log_info("Processing connector instance (%s)", local_ci.instance_name);
if (exporter_get_boolean(local_ci.instance_name, "enabled", 0)) {
- info(
+ netdata_log_info(
"Instance (%s) on connector (%s) is enabled and scheduled for activation",
local_ci.instance_name, local_ci.connector_name);
@@ -290,11 +290,11 @@ struct engine *read_exporting_config()
tmp_ci_list_prev = tmp_ci_list;
instances_to_activate++;
} else
- info("Instance (%s) on connector (%s) is not enabled", local_ci.instance_name, local_ci.connector_name);
+ netdata_log_info("Instance (%s) on connector (%s) is not enabled", local_ci.instance_name, local_ci.connector_name);
}
if (unlikely(!instances_to_activate)) {
- info("No connector instances to activate");
+ netdata_log_info("No connector instances to activate");
return NULL;
}
@@ -313,7 +313,7 @@ struct engine *read_exporting_config()
char *instance_name;
char *default_destination = "localhost";
- info("Instance %s on %s", tmp_ci_list->local_ci.instance_name, tmp_ci_list->local_ci.connector_name);
+ netdata_log_info("Instance %s on %s", tmp_ci_list->local_ci.instance_name, tmp_ci_list->local_ci.connector_name);
if (tmp_ci_list->exporting_type == EXPORTING_CONNECTOR_TYPE_UNKNOWN) {
error("Unknown exporting connector type");
@@ -381,7 +381,7 @@ struct engine *read_exporting_config()
tmp_instance->config.options = exporting_parse_data_source(data_source, tmp_instance->config.options);
if (EXPORTING_OPTIONS_DATA_SOURCE(tmp_instance->config.options) != EXPORTING_SOURCE_DATA_AS_COLLECTED &&
tmp_instance->config.update_every % localhost->rrd_update_every)
- info(
+ netdata_log_info(
"The update interval %d for instance %s is not a multiple of the database update interval %d. "
"Metric values will deviate at different points in time.",
tmp_instance->config.update_every, tmp_instance->config.name, localhost->rrd_update_every);
@@ -488,7 +488,7 @@ struct engine *read_exporting_config()
#endif
#ifdef NETDATA_INTERNAL_CHECKS
- info(
+ netdata_log_info(
" Dest=[%s], upd=[%d], buffer=[%d] timeout=[%ld] options=[%u]",
tmp_instance->config.destination,
tmp_instance->config.update_every,
diff --git a/exporting/send_data.c b/exporting/send_data.c
index d91fc50d79..a58a850b12 100644
--- a/exporting/send_data.c
+++ b/exporting/send_data.c
@@ -303,7 +303,7 @@ void simple_connector_worker(void *instance_p)
if(netdata_ssl_open(&connector_specific_data->ssl, netdata_ssl_exporting_ctx, sock)) {
if(netdata_ssl_connect(&connector_specific_data->ssl)) {
- info("Exporting established a SSL connection.");
+ netdata_log_info("Exporting established a SSL connection.");
struct timeval tv;
tv.tv_sec = timeout.tv_sec / 4;