New upstream version 1.9.0+dfsgupstream/1.9.0+dfsg

1 files changed, 25 insertions, 10 deletions

diff --git a/conf.d/stream.conf b/conf.d/stream.conf
index 0ae5ba67..8945529e 100644
--- a/conf.d/stream.conf
+++ b/conf.d/stream.conf
@@ -21,13 +21,13 @@
     #
     # If many are given, the first available will get the metrics.
     #
-    # PROTOCOL  = tcp or udp (only tcp is supported by masters)
-    # HOST      = an IPv4, IPv6 IP, or a hostname.
+    # PROTOCOL  = tcp, udp, or unix (only tcp and unix are supported by masters)
+    # 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
+    # INTERFACE = the network interface to use (only for IPv6)
     # PORT      = the port number or service name (/etc/services)
     #
-    # This communication is not HTTP (cannot be proxied by web proxies).
+    # This communication is not HTTP (it cannot be proxied by web proxies).
     destination =
 
     # The API_KEY to use (as the sender)
@@ -56,26 +56,34 @@
 # -----------------------------------------------------------------------------
 # 2. ON MASTER 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 slave,
+#         or the same API key for all slaves.
 #
 #    netdata searches for options in this order:
 #
-#    a) [MACHINE_GUID] section  (settings for each machine)
-#    b) [API_KEY] section       (settings for the API key)
-#    c) master netdata settings (netdata.conf)
+#    a) master netdata settings (netdata.conf)
+#    b) [API_KEY] section       (below, settings for the API key)
+#    c) [MACHINE_GUID] section  (below, settings for each machine)
 #
 #    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.
+# If the key is not listed here, it will not be able to push metrics.
 
+# [API_KEY] is [YOUR-API-KEY], i.e [11111111-2222-3333-4444-555555555555]
 [API_KEY]
-    # Default settings for the API key
+    # Default settings for this API key
 
     # You can disable the API key, by setting this to: no
     # The default (for unknown API keys) is: no
     enabled = no
 
+    # A list of simple patterns matching the IPs of the servers that
+    # will be pushing metrics using this API key.
+    # The metrics are received via the API port, so the same IPs
+    # should also be matched at netdata.conf [web].allow connections from
+    allow from = *
+
     # 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
@@ -132,6 +140,13 @@
     # Use only the API key for security.
     enabled = no
 
+    # A list of simple patterns matching the IPs of the servers that
+    # will be pushing metrics using this MACHINE GUID.
+    # The metrics are received via the API port, so the same IPs
+    # should also be matched at netdata.conf [web].allow connections from
+    # and at stream.conf [API_KEY].allow from
+    allow from = *
+
     # The number of entries in the database
     history = 3600