diff options
Diffstat (limited to 'streaming')
-rw-r--r-- | streaming/receiver.c | 6 | ||||
-rw-r--r-- | streaming/rrdpush.c | 10 | ||||
-rw-r--r-- | streaming/rrdpush.h | 2 | ||||
-rw-r--r-- | streaming/sender.c | 6 | ||||
-rw-r--r-- | streaming/stream.conf | 34 |
5 files changed, 29 insertions, 29 deletions
diff --git a/streaming/receiver.c b/streaming/receiver.c index c8e10330e1..2bfe28dfd6 100644 --- a/streaming/receiver.c +++ b/streaming/receiver.c @@ -51,7 +51,7 @@ PARSER_RC streaming_timestamp(char **words, void *user, PLUGINSD_ACTION *plugins RRDHOST *host = ((PARSER_USER_OBJECT *)user)->host; struct plugind *cd = ((PARSER_USER_OBJECT *)user)->cd; if (cd->version < VERSION_GAP_FILLING ) { - error("STREAM %s from %s: Slave negotiated version %u but sent TIMESTAMP!", host->hostname, cd->cmd, + error("STREAM %s from %s: Child negotiated version %u but sent TIMESTAMP!", host->hostname, cd->cmd, cd->version); return PARSER_RC_OK; // Ignore error and continue stream } @@ -232,8 +232,8 @@ static int rrdpush_receive(struct receiver_state *rpt) if(rpt->tags && !*rpt->tags) rpt->tags = NULL; if (strcmp(rpt->machine_guid, localhost->machine_guid) == 0) { - log_stream_connection(rpt->client_ip, rpt->client_port, rpt->key, rpt->machine_guid, rpt->hostname, "DENIED - ATTEMPT TO RECEIVE METRICS FROM MACHINE_GUID IDENTICAL TO MASTER"); - error("STREAM %s [receive from %s:%s]: denied to receive metrics, machine GUID [%s] is my own. Did you copy the master/proxy machine guid to a slave?", rpt->hostname, rpt->client_ip, rpt->client_port, rpt->machine_guid); + log_stream_connection(rpt->client_ip, rpt->client_port, rpt->key, rpt->machine_guid, rpt->hostname, "DENIED - ATTEMPT TO RECEIVE METRICS FROM MACHINE_GUID IDENTICAL TO PARENT"); + error("STREAM %s [receive from %s:%s]: denied to receive metrics, machine GUID [%s] is my own. Did you copy the parent/proxy machine GUID to a child?", rpt->hostname, rpt->client_ip, rpt->client_port, rpt->machine_guid); close(rpt->fd); return 1; } diff --git a/streaming/rrdpush.c b/streaming/rrdpush.c index 316e9cdc60..ebd76b9397 100644 --- a/streaming/rrdpush.c +++ b/streaming/rrdpush.c @@ -144,9 +144,9 @@ static inline int should_send_chart_matching(RRDSET *st) { return(rrdset_flag_check(st, RRDSET_FLAG_UPSTREAM_SEND)); } -int configured_as_master() { +int configured_as_parent() { struct section *section = NULL; - int is_master = 0; + int is_parent = 0; appconfig_wrlock(&stream_config); for (section = stream_config.first_section; section; section = section->next) { @@ -154,13 +154,13 @@ int configured_as_master() { if (uuid_parse(section->name, uuid) != -1 && appconfig_get_boolean_by_section(section, "enabled", 0)) { - is_master = 1; + is_parent = 1; break; } } appconfig_unlock(&stream_config); - return is_master; + return is_parent; } // checks if the current chart definition has been sent @@ -476,7 +476,7 @@ int rrdpush_receiver_thread_spawn(struct web_client *w, char *url) { else if(!strcmp(name, "ver")) stream_version = MIN((uint32_t) strtoul(value, NULL, 0), STREAMING_PROTOCOL_CURRENT_VERSION); else { - // An old Netdata slave does not have a compatible streaming protocol, map to something sane. + // An old Netdata child does not have a compatible streaming protocol, map to something sane. if (!strcmp(name, "NETDATA_SYSTEM_OS_NAME")) name = "NETDATA_HOST_OS_NAME"; else if (!strcmp(name, "NETDATA_SYSTEM_OS_ID")) diff --git a/streaming/rrdpush.h b/streaming/rrdpush.h index 2f171a0e38..efbf2f1e6f 100644 --- a/streaming/rrdpush.h +++ b/streaming/rrdpush.h @@ -99,7 +99,7 @@ extern void sender_init(struct sender_state *s, RRDHOST *parent); void sender_start(struct sender_state *s); void sender_commit(struct sender_state *s); extern int rrdpush_init(); -extern int configured_as_master(); +extern int configured_as_parent(); extern void rrdset_done_push(RRDSET *st); extern void rrdset_push_chart_definition_now(RRDSET *st); extern void *rrdpush_sender_thread(void *ptr); diff --git a/streaming/sender.c b/streaming/sender.c index 01ae6e8763..c603503051 100644 --- a/streaming/sender.c +++ b/streaming/sender.c @@ -145,7 +145,7 @@ void rrdpush_clean_encoded(stream_encoded_t *se) freez(se->kernel_version); } -static int rrdpush_sender_thread_connect_to_master(RRDHOST *host, int default_port, int timeout, +static int rrdpush_sender_thread_connect_to_parent(RRDHOST *host, int default_port, int timeout, struct sender_state *s) { struct timeval tv = { @@ -365,7 +365,7 @@ static int rrdpush_sender_thread_connect_to_master(RRDHOST *host, int default_po } s->version = version; - info("STREAM %s [send to %s]: established communication with a master using protocol version %d - ready to send metrics..." + info("STREAM %s [send to %s]: established communication with a parent using protocol version %d - ready to send metrics..." , host->hostname , s->connected_to , version); @@ -385,7 +385,7 @@ static void attempt_to_connect(struct sender_state *state) { state->send_attempts = 0; - if(rrdpush_sender_thread_connect_to_master(state->host, state->default_port, state->timeout, state)) { + if(rrdpush_sender_thread_connect_to_parent(state->host, state->default_port, state->timeout, state)) { state->last_sent_t = now_monotonic_sec(); // reset the buffer, to properly send charts and metrics diff --git a/streaming/stream.conf b/streaming/stream.conf index e4d05315d5..b5142632db 100644 --- a/streaming/stream.conf +++ b/streaming/stream.conf @@ -8,10 +8,10 @@ # ----------------------------------------------------------------------------- -# 1. ON SLAVE NETDATA - THE ONE THAT WILL BE SENDING METRICS +# 1. ON CHILD NETDATA - THE ONE THAT WILL BE SENDING METRICS [stream] - # Enable this on slaves, to have them send metrics. + # Enable this on child nodes, to have them send metrics. enabled = no # Where is the receiving netdata? @@ -21,20 +21,20 @@ # # If many are given, the first available will get the metrics. # - # PROTOCOL = tcp, udp, or unix (only tcp and unix are supported by masters) + # PROTOCOL = tcp, udp, or unix (only tcp and unix are supported by parent nodes) # HOST = an IPv4, IPv6 IP, or a hostname, or a unix domain socket path. # IPv6 IPs should be given with brackets [ip:address] # INTERFACE = the network interface to use (only for IPv6) # PORT = the port number or service name (/etc/services) # SSL = when this word appear at the end of the destination string - # the Netdata will do encrypt connection with the master. + # the Netdata will encrypt the connection with the parent. # # This communication is not HTTP (it cannot be proxied by web proxies). destination = # Skip Certificate verification? # - # The netdata slave is configurated to avoid invalid SSL/TLS certificate, + # The netdata child is configurated to avoid invalid SSL/TLS certificate, # so certificates that are self-signed or expired will stop the streaming. # Case the server certificate is not valid, you can enable the use of # 'bad' certificates setting the next option as 'yes'. @@ -51,7 +51,7 @@ # Certificate Authority file # - # When the Netdata master has certificate, that is not recognized as valid, + # When the Netdata parent has certificate, that is not recognized as valid, # we can add this certificate in the list of known certificates in CApath # and give for Netdata as argument. # @@ -88,14 +88,14 @@ initial clock resync iterations = 60 # ----------------------------------------------------------------------------- -# 2. ON MASTER NETDATA - THE ONE THAT WILL BE RECEIVING METRICS +# 2. ON PARENT NETDATA - THE ONE THAT WILL BE RECEIVING METRICS -# You can have one API key per slave, -# or the same API key for all slaves. +# You can have one API key per child, +# or the same API key for all child nodes. # # netdata searches for options in this order: # -# a) master netdata settings (netdata.conf) +# a) parent netdata settings (netdata.conf) # b) [stream] section (above) # c) [API_KEY] section (below, settings for the API key) # d) [MACHINE_GUID] section (below, settings for each machine) @@ -140,8 +140,8 @@ # 3 possible values: # yes enable alarms # no do not enable alarms - # auto enable alarms, only when the sending netdata is connected. For ephemeral slaves or slave system restarts, - # ensure that the netdata process on the slave is gracefully stopped, to prevent invalid last_collected alarms + # auto enable alarms, only when the sending netdata is connected. For ephemeral child nodes or child system restarts, + # ensure that the netdata process on the child is gracefully stopped, to prevent invalid last_collected alarms # You can also set it per host, below. # The default is taken from [health].enabled of netdata.conf health enabled by default = auto @@ -158,22 +158,22 @@ # ----------------------------------------------------------------------------- -# 3. PER SENDING HOST SETTINGS, ON MASTER NETDATA +# 3. PER SENDING HOST SETTINGS, ON PARENT NETDATA # THIS IS OPTIONAL - YOU DON'T HAVE TO CONFIGURE IT -# This section exists to give you finer control of the master settings for each -# slave host, when the same API key is used by many netdata slaves / proxies. +# This section exists to give you finer control of the parent settings for each +# child host, when the same API key is used by many netdata child nodes / proxies. # # Each netdata has a unique GUID - generated the first time netdata starts. # You can find it at /var/lib/netdata/registry/netdata.public.unique.id -# (at the slave). +# (at the child). # # The host sending data will have one. If the host is not ephemeral, # you can give settings for each sending host here. [MACHINE_GUID] # enable this host: yes | no - # When disabled, the master will not receive metrics for this host. + # When disabled, the parent will not receive metrics for this host. # THIS IS NOT A SECURITY MECHANISM - AN ATTACKER CAN SET ANY OTHER GUID. # Use only the API key for security. enabled = no |