From a8220ab2d293bb7f4b014b79d16b2fb05090fa93 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Feb 2021 12:45:55 +0100 Subject: Adding upstream version 1.29.0. Signed-off-by: Daniel Baumann --- streaming/stream.conf | 49 +++++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) (limited to 'streaming/stream.conf') diff --git a/streaming/stream.conf b/streaming/stream.conf index fdff1f25f..b5142632d 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. # @@ -87,16 +87,15 @@ # Sync the clock of the charts for that many iterations, when starting. 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) @@ -141,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 @@ -150,13 +149,6 @@ # postpone alarms for a short period after the sender is connected default postpone alarms on connect seconds = 60 - # allow or deny multiple connections for the same host? - # If you are sure all your netdata have their own machine GUID, - # set this to 'allow', since it allows faster reconnects. - # When set to 'deny', new connections for a host will not be - # accepted until an existing connection is cleared. - multiple connections = allow - # need to route metrics differently? set these. # the defaults are the ones at the [stream] section (above) #default proxy enabled = yes | no @@ -166,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 @@ -205,13 +197,6 @@ # postpone alarms when the sender connects postpone alarms on connect seconds = 60 - # allow or deny multiple connections for the same host? - # If you are sure all your netdata have their own machine GUID, - # set this to 'allow', since it allows faster reconnects. - # When set to 'deny', new connections for a host will not be - # accepted until an existing connection is cleared. - multiple connections = allow - # need to route metrics differently? # the defaults are the ones at the [API KEY] section #proxy enabled = yes | no -- cgit v1.2.3