diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-25 17:33:56 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-25 17:34:10 +0000 |
| commit | 83ba6762cc43d9db581b979bb5e3445669e46cc2 (patch) | |
| tree | 2e69833b43f791ed253a7a20318b767ebe56cdb8 /src/exporting/json | |
| parent | Releasing debian version 1.47.5-1. (diff) | |
| download | netdata-83ba6762cc43d9db581b979bb5e3445669e46cc2.tar.xz netdata-83ba6762cc43d9db581b979bb5e3445669e46cc2.zip | |
Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/exporting/json')
| -rw-r--r-- | src/exporting/json/integrations/json.md | 4 | ||||
| -rw-r--r-- | src/exporting/json/json.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/exporting/json/integrations/json.md b/src/exporting/json/integrations/json.md index 0b17aa318..b6d872492 100644 --- a/src/exporting/json/integrations/json.md +++ b/src/exporting/json/integrations/json.md @@ -36,8 +36,8 @@ further analysis, or correlation with data from other sources The configuration file name for this integration is `exporting.conf`. -You can edit the configuration file using the `edit-config` script from the -Netdata [config directory](/docs/netdata-agent/configuration/README.md#the-netdata-config-directory). +You can edit the configuration file using the [`edit-config`](https://github.com/netdata/netdata/blob/master/docs/netdata-agent/configuration/README.md#edit-a-configuration-file-using-edit-config) script from the +Netdata [config directory](https://github.com/netdata/netdata/blob/master/docs/netdata-agent/configuration/README.md#the-netdata-config-directory). ```bash cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata diff --git a/src/exporting/json/json.c b/src/exporting/json/json.c index e9c4db635..d696c7358 100644 --- a/src/exporting/json/json.c +++ b/src/exporting/json/json.c @@ -70,12 +70,10 @@ int init_json_http_instance(struct instance *instance) struct simple_connector_data *connector_specific_data = callocz(1, sizeof(struct simple_connector_data)); instance->connector_specific_data = connector_specific_data; -#ifdef ENABLE_HTTPS connector_specific_data->ssl = NETDATA_SSL_UNSET_CONNECTION; if (instance->config.options & EXPORTING_OPTION_USE_TLS) { netdata_ssl_initialize_ctx(NETDATA_SSL_EXPORTING_CTX); } -#endif instance->start_batch_formatting = open_batch_json_http; instance->start_host_formatting = format_host_labels_json_plaintext; |