Change streaming terminology to parent-child in the code (#9323)

25 files changed, 65 insertions, 332 deletions

diff --git a/build_external/scenarios/aclk-testing/agent-compose.yml b/build_external/scenarios/aclk-testing/agent-compose.yml
index 04c357c433..c05c97cdf2 100644
--- a/build_external/scenarios/aclk-testing/agent-compose.yml
+++ b/build_external/scenarios/aclk-testing/agent-compose.yml
@@ -1,6 +1,6 @@
 version: '3.3'
 services:
-  agent_master:
+  agent_parent:
     build:
       context: ../../..
       dockerfile: build_external/make-install.Dockerfile
diff --git a/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml b/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml
index cf38893b30..d404ed41b9 100644
--- a/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml
+++ b/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml
@@ -1,6 +1,6 @@
 version: '3.3'
 services:
-  agent_master:
+  agent_parent:
     build:
       context: ../../..
       dockerfile: build_external/make-install.Dockerfile
diff --git a/build_external/scenarios/gaps_hi/slave-compose.yml b/build_external/scenarios/gaps_hi/child-compose.yml
index 072d67c141..e507360930 100644
--- a/build_external/scenarios/gaps_hi/slave-compose.yml
+++ b/build_external/scenarios/gaps_hi/child-compose.yml
@@ -1,13 +1,13 @@
 version: '3.3'
 services:
-  agent_slave:
+  agent_child:
     image: debian_10_dev
     command: /usr/sbin/netdata -D
     #ports:
     #- 21002+:19999
     volumes:
-      - ./slave_stream.conf:/etc/netdata/stream.conf:ro
-      #- ./slave_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
+      - ./child_stream.conf:/etc/netdata/stream.conf:ro
+      #- ./child_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
       - ./min.conf:/etc/netdata/netdata.conf:ro
     cap_add:
     - SYS_PTRACE
diff --git a/build_external/scenarios/gaps_hi/slave_guid b/build_external/scenarios/gaps_hi/child_guid
index 670f7c2376..670f7c2376 100644
--- a/build_external/scenarios/gaps_hi/slave_guid
+++ b/build_external/scenarios/gaps_hi/child_guid
diff --git a/build_external/scenarios/gaps_hi/slave_stream.conf b/build_external/scenarios/gaps_hi/child_stream.conf
index 2218c681ea..2218c681ea 100644
--- a/build_external/scenarios/gaps_hi/slave_stream.conf
+++ b/build_external/scenarios/gaps_hi/child_stream.conf
diff --git a/build_external/scenarios/gaps_hi/master-compose.yml b/build_external/scenarios/gaps_hi/master-compose.yml
deleted file mode 100644
index 05d70c9244..0000000000
--- a/build_external/scenarios/gaps_hi/master-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: '3.3'
-services:
-  agent_master:
-    image: debian_10_dev
-    command: /usr/sbin/netdata -D
-    ports:
-    - 21000:19999
-    volumes:
-    - ./master_stream.conf:/etc/netdata/stream.conf:ro
-    - ./master_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
-    - ./min.conf:/etc/netdata/netdata.conf:ro
-    cap_add:
-    - SYS_PTRACE
diff --git a/build_external/scenarios/gaps_hi/middle-compose.yml b/build_external/scenarios/gaps_hi/middle-compose.yml
index 6377a6518f..cb4a045554 100644
--- a/build_external/scenarios/gaps_hi/middle-compose.yml
+++ b/build_external/scenarios/gaps_hi/middle-compose.yml
@@ -4,7 +4,7 @@ services:
     image: debian_10_dev
     command: /usr/sbin/netdata -D
     ports:
-    - 21001:19999
+      - 21001:19999
     volumes:
       - ./middle_stream.conf:/etc/netdata/stream.conf:ro
       - ./middle_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
diff --git a/build_external/scenarios/gaps_hi/middle_stream.conf b/build_external/scenarios/gaps_hi/middle_stream.conf
index f4546e30d2..132eaa1adb 100644
--- a/build_external/scenarios/gaps_hi/middle_stream.conf
+++ b/build_external/scenarios/gaps_hi/middle_stream.conf
@@ -1,6 +1,6 @@
 [stream]
     enabled = yes
-    destination = tcp:agent_master
+    destination = tcp:agent_parent
     api key = 00000000-0000-0000-0000-000000000000
     timeout seconds = 60
     default port = 19999
diff --git a/build_external/scenarios/gaps_hi/parent-compose.yml b/build_external/scenarios/gaps_hi/parent-compose.yml
new file mode 100644
index 0000000000..2944bbc68b
--- /dev/null
+++ b/build_external/scenarios/gaps_hi/parent-compose.yml
@@ -0,0 +1,13 @@
+version: '3.3'
+services:
+  agent_parent:
+    image: debian_10_dev
+    command: /usr/sbin/netdata -D
+    ports:
+      - 21000:19999
+    volumes:
+      - ./parent_stream.conf:/etc/netdata/stream.conf:ro
+      - ./parent_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
+      - ./min.conf:/etc/netdata/netdata.conf:ro
+    cap_add:
+      - SYS_PTRACE
diff --git a/build_external/scenarios/gaps_hi/master_guid b/build_external/scenarios/gaps_hi/parent_guid
index fee6f3234d..fee6f3234d 100644
--- a/build_external/scenarios/gaps_hi/master_guid
+++ b/build_external/scenarios/gaps_hi/parent_guid
diff --git a/build_external/scenarios/gaps_hi/master_stream.conf b/build_external/scenarios/gaps_hi/parent_stream.conf
index 600a9fac3b..600a9fac3b 100644
--- a/build_external/scenarios/gaps_hi/master_stream.conf
+++ b/build_external/scenarios/gaps_hi/parent_stream.conf
diff --git a/build_external/scenarios/gaps_lo/slave-compose.yml b/build_external/scenarios/gaps_lo/child-compose.yml
index 7db632fe16..dca900c2ef 100644
--- a/build_external/scenarios/gaps_lo/slave-compose.yml
+++ b/build_external/scenarios/gaps_lo/child-compose.yml
@@ -1,15 +1,15 @@
 version: '3.3'
 services:
-  agent_slave:
+  agent_child:
     image: arch_extras_dev
     #command: /usr/sbin/valgrind --leak-check=full /usr/sbin/netdata -D
     command: /usr/sbin/netdata -D       # gdb does not like valgrind !
     #ports:
     #- 21002:19999
     volumes:
-      - ./slave_stream.conf:/etc/netdata/stream.conf:ro
-#      - ./slave_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
+      - ./child_stream.conf:/etc/netdata/stream.conf:ro
+      # - ./child_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
       - ./mostly_off.conf:/etc/netdata/netdata.conf:ro
     cap_add:
-    - SYS_PTRACE
+      - SYS_PTRACE
 
diff --git a/build_external/scenarios/gaps_lo/slave_guid b/build_external/scenarios/gaps_lo/child_guid
index 670f7c2376..670f7c2376 100644
--- a/build_external/scenarios/gaps_lo/slave_guid
+++ b/build_external/scenarios/gaps_lo/child_guid
diff --git a/build_external/scenarios/gaps_lo/slave_stream.conf b/build_external/scenarios/gaps_lo/child_stream.conf
index b9a89a3b76..00bcdfa5bc 100644
--- a/build_external/scenarios/gaps_lo/slave_stream.conf
+++ b/build_external/scenarios/gaps_lo/child_stream.conf
@@ -1,5 +1,5 @@
 [stream]
-    # Enable this on slaves, to have them send metrics.
+    # Enable this on child nodes, to have them send metrics.
     enabled = yes
     destination = tcp:192.168.1.2
     api key = 00000000-0000-0000-0000-000000000000
diff --git a/build_external/scenarios/gaps_lo/master-compose.yml b/build_external/scenarios/gaps_lo/master-compose.yml
deleted file mode 100644
index f86d56f636..0000000000
--- a/build_external/scenarios/gaps_lo/master-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: '3.3'
-services:
-  agent_master:
-    image: debian_10_dev
-    command: /usr/sbin/netdata -D
-    ports:
-    - 21000:19999
-    volumes:
-    - ./master_stream.conf:/etc/netdata/stream.conf:ro
-    - ./master_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
-    - ./mostly_off.conf:/etc/netdata/netdata.conf:ro
-    cap_add:
-    - SYS_PTRACE
diff --git a/build_external/scenarios/gaps_lo/middle-compose.yml b/build_external/scenarios/gaps_lo/middle-compose.yml
index 26c22de062..f94e1fe3be 100644
--- a/build_external/scenarios/gaps_lo/middle-compose.yml
+++ b/build_external/scenarios/gaps_lo/middle-compose.yml
@@ -5,10 +5,10 @@ services:
     #command: /usr/sbin/valgrind --leak-check=full /usr/sbin/netdata -D
     command: /usr/sbin/netdata -D
     ports:
-    - 21001:19999
+      - 21001:19999
     volumes:
       - ./middle_stream.conf:/etc/netdata/stream.conf:ro
       - ./middle_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
       - ./mostly_off.conf:/etc/netdata/netdata.conf:ro
     cap_add:
-    - SYS_PTRACE
+      - SYS_PTRACE
diff --git a/build_external/scenarios/gaps_lo/middle_stream.conf b/build_external/scenarios/gaps_lo/middle_stream.conf
index 8bbf31e5a4..3e52e8377a 100644
--- a/build_external/scenarios/gaps_lo/middle_stream.conf
+++ b/build_external/scenarios/gaps_lo/middle_stream.conf
@@ -1,6 +1,6 @@
 [stream]
     enabled = yes
-    destination = tcp:agent_master
+    destination = tcp:agent_parent
     api key = 00000000-0000-0000-0000-000000000000
     timeout seconds = 60
     default port = 19999
diff --git a/build_external/scenarios/gaps_lo/parent-compose.yml b/build_external/scenarios/gaps_lo/parent-compose.yml
new file mode 100644
index 0000000000..e7baad25c2
--- /dev/null
+++ b/build_external/scenarios/gaps_lo/parent-compose.yml
@@ -0,0 +1,13 @@
+version: '3.3'
+services:
+  agent_parent:
+    image: debian_10_dev
+    command: /usr/sbin/netdata -D
+    ports:
+      - 21000:19999
+    volumes:
+      - ./parent_stream.conf:/etc/netdata/stream.conf:ro
+      - ./parent_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
+      - ./mostly_off.conf:/etc/netdata/netdata.conf:ro
+    cap_add:
+      - SYS_PTRACE
diff --git a/build_external/scenarios/gaps_lo/master_guid b/build_external/scenarios/gaps_lo/parent_guid
index fee6f3234d..fee6f3234d 100644
--- a/build_external/scenarios/gaps_lo/master_guid
+++ b/build_external/scenarios/gaps_lo/parent_guid
diff --git a/build_external/scenarios/gaps_lo/master_stream.conf b/build_external/scenarios/gaps_lo/parent_stream.conf
index 99611cc5c2..99611cc5c2 100644
--- a/build_external/scenarios/gaps_lo/master_stream.conf
+++ b/build_external/scenarios/gaps_lo/parent_stream.conf
diff --git a/build_external/scenarios/master-slaves/master_stream.conf b/build_external/scenarios/master-slaves/master_stream.conf
deleted file mode 100644
index cb507e2f03..0000000000
--- a/build_external/scenarios/master-slaves/master_stream.conf
+++ /dev/null
@@ -1,140 +0,0 @@
-# netdata configuration for aggregating data from remote hosts
-#
-# API keys authorize a pair of sending-receiving netdata servers.
-# Once their communication is authorized, they can exchange metrics for any
-# number of hosts.
-#
-# You can generate API keys, with the linux command: uuidgen
-
-
-
-# -----------------------------------------------------------------------------
-# 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.
-#
-#    netdata searches for options in this order:
-#
-#    a) master 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)
-#
-#    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 push metrics.
-
-# [API_KEY] is [YOUR-API-KEY], i.e [11111111-2222-3333-4444-555555555555]
-[00000000-0000-0000-0000-000000000000]
-    # 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 = yes
-
-    # 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
-    # will be used.
-    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 netdata.conf will be used.
-    # Valid modes:
-    #    save     save on exit, load on start
-    #    map      like swap (continuously syncing to disks - you need SSD)
-    #    ram      keep it in RAM, don't touch the disk
-    #    none     no database at all (use this on headless proxies)
-    #    dbengine like a traditional database
-    # default memory mode = ram
-
-    # Shall we enable health monitoring for the hosts using this API key?
-    # 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
-    # You can also set it per host, below.
-    # The default is taken from [health].enabled of 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
-
-    # 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
-    #default proxy destination = IP:PORT IP:PORT ...
-    #default proxy api key = API_KEY
-    #default proxy send charts matching = *
-
-
-# -----------------------------------------------------------------------------
-# 3. PER SENDING HOST SETTINGS, ON MASTER 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.
-#
-# 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).
-#
-# 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.
-    # THIS IS NOT A SECURITY MECHANISM - AN ATTACKER CAN SET ANY OTHER GUID.
-    # 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
-
-    # The memory mode of the database: save | map | ram | none | dbengine
-    memory mode = save
-
-    # Health / alarms control: yes | no | auto
-    health enabled = yes
-
-    # 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
-    #proxy destination = IP:PORT IP:PORT ...
-    #proxy api key = API_KEY
-    #proxy send charts matching = *
diff --git a/build_external/scenarios/master-slaves/slave_stream.conf b/build_external/scenarios/master-slaves/slave_stream.conf
deleted file mode 100644
index d23cd93134..0000000000
--- a/build_external/scenarios/master-slaves/slave_stream.conf
+++ /dev/null
@@ -1,144 +0,0 @@
-# netdata configuration for aggregating data from remote hosts
-#
-# API keys authorize a pair of sending-receiving netdata servers.
-# Once their communication is authorized, they can exchange metrics for any
-# number of hosts.
-#
-# You can generate API keys, with the linux command: uuidgen
-
-
-# -----------------------------------------------------------------------------
-# 1. ON SLAVE NETDATA - THE ONE THAT WILL BE SENDING METRICS
-
-[stream]
-    # Enable this on slaves, to have them send metrics.
-    enabled = yes
-
-    # Where is the receiving netdata?
-    # A space separated list of:
-    #
-    #      [PROTOCOL:]HOST[%INTERFACE][:PORT][:SSL]
-    #
-    # If many are given, the first available will get the metrics.
-    #
-    # 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 (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.
-    #
-    # This communication is not HTTP (it cannot be proxied by web proxies).
-    destination = tcp:agent_master
-
-    # Skip Certificate verification?
-    #
-    # The netdata slave 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'.
-    #
-    #ssl skip certificate verification = yes
-
-    # Certificate Authority Path
-    #
-    # OpenSSL has a default directory where the known certificates are stored,
-    # case it is necessary it is possible to change this rule using the variable
-    # "CApath"
-    #
-    #CApath = /etc/ssl/certs/
-
-    # Certificate Authority file
-    #
-    # When the Netdata master 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.
-    #
-    #CAfile = /etc/ssl/certs/cert.pem
-
-    # The API_KEY to use (as the sender)
-    api key = 00000000-0000-0000-0000-000000000000
-
-    # The timeout to connect and send metrics
-    timeout seconds = 60
-
-    # If the destination line above does not specify a port, use this
-    default port = 19999
-
-    # filter the charts to be streamed
-    # netdata SIMPLE PATTERN:
-    # - space separated list of patterns (use \ to include spaces in patterns)
-    # - use * as wildcard, any number of times within each pattern
-    # - prefix a pattern with ! for a negative match (ie not stream the charts it matches)
-    # - the order of patterns is important (left to right)
-    # To send all except a few, use: !this !that *   (ie append a wildcard pattern)
-    send charts matching = *
-
-    # The buffer to use for sending metrics.
-    # 1MB is good for 10-20 seconds of data, so increase this if you expect latencies.
-    # The buffer is flushed on reconnects (this will not prevent gaps at the charts).
-    buffer size bytes = 1048576
-
-    # If the connection fails, or it disconnects,
-    # retry after that many seconds.
-    reconnect delay seconds = 5
-
-    # Sync the clock of the charts for that many iterations, when starting.
-    initial clock resync iterations = 60
-
-
-
-# -----------------------------------------------------------------------------
-# 3. PER SENDING HOST SETTINGS, ON MASTER 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.
-#
-# 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).
-#
-# 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.
-    # THIS IS NOT A SECURITY MECHANISM - AN ATTACKER CAN SET ANY OTHER GUID.
-    # 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
-
-    # The memory mode of the database: save | map | ram | none | dbengine
-    memory mode = save
-
-    # Health / alarms control: yes | no | auto
-    health enabled = yes
-
-    # 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
-    #proxy destination = IP:PORT IP:PORT ...
-    #proxy api key = API_KEY
-    #proxy send charts matching = *
diff --git a/build_external/scenarios/parent-child/child_stream.conf b/build_external/scenarios/parent-child/child_stream.conf
new file mode 100644
index 0000000000..7348f8c706
--- /dev/null
+++ b/build_external/scenarios/parent-child/child_stream.conf
@@ -0,0 +1,10 @@
+[stream]
+    enabled = yes
+    destination = tcp:agent_parent
+    api key = 00000000-0000-0000-0000-000000000000
+    timeout seconds = 60
+    default port = 19999
+    send charts matching = *
+    buffer size bytes = 1048576
+    reconnect delay seconds = 5
+    initial clock resync iterations = 60
diff --git a/build_external/scenarios/master-slaves/docker-compose.yml b/build_external/scenarios/parent-child/docker-compose.yml
index 92fa9e6b0d..ed6df15bb1 100644
--- a/build_external/scenarios/master-slaves/docker-compose.yml
+++ b/build_external/scenarios/parent-child/docker-compose.yml
@@ -1,23 +1,23 @@
 version: '3.3'
 services:
-  agent_master:
+  agent_parent:
     image: debian_10_dev
     command: /usr/sbin/netdata -D
     ports:
-    - 20000:19999
+      - 20000:19999
     volumes:
-    - ./master_stream.conf:/etc/netdata/stream.conf:ro
-  agent_slave1:
+      - ./parent_stream.conf:/etc/netdata/stream.conf:ro
+  agent_child1:
     image: debian_9_dev
     command: /usr/sbin/netdata -D
     #ports:               Removed to allow scaling
     #- 20001:19999
     volumes:
-      - ./slave_stream.conf:/etc/netdata/stream.conf:ro
-  agent_slave2:
+      - ./child_stream.conf:/etc/netdata/stream.conf:ro
+  agent_child2:
     image: fedora_30_dev
     command: /usr/sbin/netdata -D
     #ports:              Removed to allow scaling
     #- 20002:19999
     volumes:
-      - ./slave_stream.conf:/etc/netdata/stream.conf:ro
+      - ./child_stream.conf:/etc/netdata/stream.conf:ro
diff --git a/build_external/scenarios/parent-child/parent_stream.conf b/build_external/scenarios/parent-child/parent_stream.conf
new file mode 100644
index 0000000000..bf85ae258a
--- /dev/null
+++ b/build_external/scenarios/parent-child/parent_stream.conf
@@ -0,0 +1,7 @@
+[00000000-0000-0000-0000-000000000000]
+    enabled = yes
+    allow from = *
+    default history = 3600
+    health enabled by default = auto
+    default postpone alarms on connect seconds = 60
+    multiple connections = allow