moved [stream] configuration to stream.conf

2 files changed, 57 insertions, 36 deletions

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index dd6c2cbf9e..743ab19e93 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -4,7 +4,6 @@
 MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
 
 dist_config_DATA = \
-    aggregated_hosts.conf \
     apps_groups.conf \
     charts.d.conf \
     fping.conf \
@@ -12,6 +11,7 @@ dist_config_DATA = \
     python.d.conf \
     health_alarm_notify.conf \
     health_email_recipients.conf \
+    stream.conf \
     $(NULL)
 
 nodeconfigdir=$(configdir)/node.d
diff --git a/conf.d/aggregated_hosts.conf b/conf.d/stream.conf
index d192a55eb8..2dcb25a629 100644
--- a/conf.d/aggregated_hosts.conf
+++ b/conf.d/stream.conf
@@ -8,27 +8,31 @@
 #
 # -----------------------------------------------------------------------------
 # 1. SLAVE NETDATA - THE ONE THAT WILL BE SENDING METRICS
-#
-#    In /etc/netdata/netdata.conf you have a configuration like this:
-#
-#    [stream]
-#
-#        # enable or disable sending metrics.
-#        # default: no
-#	     enabled = yes
-#
-#        # one or more netdata hosts to send metrics to.
-#        # only one will get them, the first available.
-#	     destination = HOST1:PORT1 HOST2:PORT2 ...
-#
-#        # the API key to use, to authorize ourselves
-#	     api key =  API_KEY
-#
+
+[stream]
+	enabled = no
+
+	# where to send metrics to?
+	# A space separated list of IP:PORT is accepted. The first available will
+	# get the metrics.
+	# IPv6 addresses should be [IP]:PORT
+	destination =
+
+	# The API_KEY to use (as the sender)
+	api key =
+
+	# other options (uncomment and set)
+
+	# timeout seconds = 60
+	# default port = 19999
+	# buffer size bytes = 1048576
+	# reconnect delay seconds = 5
+	# initial clock resync iterations = 60
+
+
 # -----------------------------------------------------------------------------
 # 2. MASTER NETDATA - THE ONE THAT WILL BE RECEIVING METRICS
 #
-#    Use this file to define the API keys is accepts.
-#
 #    You can have one API key per slave, or the same API key for all slaves.
 #
 #    All options below are used in this order:
@@ -38,8 +42,6 @@
 #    c) this netdata defaults (as in netdata.conf)
 #
 #    You can combine the above (the more specific setting will be used).
-#
-# -----------------------------------------------------------------------------
 
 # API key authentication
 # If the key is not listed here, it will not be able to connect.
@@ -49,29 +51,41 @@
 
     # You can disable the API key, by setting this to: no
     # The default (for unknown API keys) is also: no
-#    enabled = yes
+    enabled = no
 
     # The default history in entries, for all hosts using this API key.
     # You can also set it per host below.
     # If you don't set it here, the history size of the central netdata
     # will be used
-#    default history = 3600
+    default history = 3600
 
     # The default memory mode to be used for all hosts using this API key.
     # You can also set it per host below.
-    # If you don't set it here, the memory mode of the central netdata
-    # will be used.
-    # Valid modes: save (load/save db), map (like swap), ram (no disk)
-#    default memory mode = save
+    # If you don't set it here, the memory mode of netdata.conf will be used.
+    # Valid modes:
+    #    save    save on exit, load on start
+    #    map     like swap (continuously syncing to disks)
+    #    ram     keep it in RAM, don't touch the disk
+    #    none    no database (passing through this netdata)
+    default memory mode = ram
 
     # Shall we enable health monitoring for the hosts using this API key?
     # 3 values:
     #    yes     enable alarms
     #    no      do not enable alarms
-    #    auto    enable alarms, only when the host is streaming metrics
+    #    auto    enable alarms, only when the sending netdata is connected
     # You can also set it per host, below.
-    # The default is the same as the central netdata
-#    health enabled by default = auto
+    # The default is the same as to netdata.conf
+    health enabled by default = auto
+
+    # postpone alarms for a short period after the sender is connected
+    default postpone alarms on connect seconds = 60
+
+    # need to route metrics differently? set these.
+    # the defaults are the ones at the [stream] section
+    #default proxy enabled = yes | no
+    #default proxy destination = IP:PORT IP:PORT ...
+    #default proxy api key = API_KEY
 
 
 # -----------------------------------------------------------------------------
@@ -81,17 +95,24 @@
 # you can give settings for each specific host here.
 
 [MACHINE_GUID]
-    # This can be used to stop receiving data
+    # enable this host: yes | no
     # THIS IS NOT A SECURITY MECHANISM - AN ATTACKER CAN SET ANY OTHER GUID.
     # Use only the API key for security.
-#    enabled = yes
+    enabled = no
 
     # The number of entries in the database
-#    history = 3600
+    history = 3600
 
-    # The memory mode of the database
-#    memory mode = save
+    # The memory mode of the database: save | map | ram | none
+    memory mode = save
 
     # Health / alarms control: yes | no | auto
-#    health enabled = yes
+    health enabled = yes
+
+    # postpone alarms when the sender connects
+    postpone alarms on connect seconds = 60
 
+    # need to route metrics differently?
+    #proxy enabled = yes | no
+    #proxy destination = IP:PORT IP:PORT ...
+    #proxy api key = API_KEY