From 441f1843883600a3ef6d0a44ccb6af983babbca1 Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Wed, 24 Mar 2021 15:20:09 +0100
Subject: [PATCH 01/11] [Linux] Fix system-probe enablement conditions

---
 tasks/agent-linux.yml          | 41 +++++++++++++++++++++++++++++++---
 templates/system-probe.yaml.j2 |  2 +-
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/tasks/agent-linux.yml b/tasks/agent-linux.yml
index cbe0ca2f..5d099299 100644
--- a/tasks/agent-linux.yml
+++ b/tasks/agent-linux.yml
@@ -92,12 +92,42 @@
       or ansible_facts.services['datadog-agent-sysprobe.service'] is defined }}"
   when: not datadog_skip_running_check
 
-- name: set system probe enabled
+- name: set before 6/7.23.0 flag
+  set_fact:
+    datadog_before_7230: "{{ datadog_major is defined and datadog_minor is defined
+      and datadog_major < 8 and datadog_minor | int < 23 }}"
+
+- name: set before 6/7.18.0 flag
+  set_fact:
+    datadog_before_7180: "{{ datadog_major is defined and datadog_minor is defined
+      and datadog_major < 8 and datadog_minor | int < 18 }}"
+
+# Before 6/7.23.0, system_probe_config controls the system-probe service
+# datadog_minor is only defined when a specific Agent version is given
+# (see tasks/parse-version.yml)
+- name: set system probe enabled (before 6/7.23.0)
   set_fact:
     datadog_sysprobe_enabled: "{{ system_probe_config is defined
+      and 'enabled' in (system_probe_config | default({}, true))
       and system_probe_config['enabled']
       and datadog_sysprobe_installed }}"
   when: not datadog_skip_running_check
+    and datadog_before_7230
+
+# Since 6/7.23.0, setting enabled: true in system_probe_config or network_config
+# is enough to start the system-probe service: https://github.com/DataDog/datadog-agent/pull/6640 
+- name: set system probe enabled (since 6/7.23.0)
+  set_fact:
+    datadog_sysprobe_enabled: "{{
+      ((system_probe_config is defined
+      and 'enabled' in (system_probe_config | default({}, true))
+      and system_probe_config['enabled'])
+      or (network_config is defined
+      and 'enabled' in (network_config | default({}, true))
+      and network_config['enabled']))
+      and datadog_sysprobe_installed }}"
+  when: not datadog_skip_running_check
+    and (not datadog_before_7230)
 
 - name: Ensure datadog-agent-sysprobe is running if enabled and installed
   service:
@@ -106,12 +136,17 @@
     enabled: yes
   when: not datadog_skip_running_check and datadog_enabled and not ansible_check_mode and datadog_sysprobe_enabled
 
-- name: Ensure datadog-agent-sysprobe is stopped if disabled or not installed
+# Stop system-probe manually on Agent versions < 6/7.18, as it was not tied
+# to the main Agent service: https://github.com/DataDog/datadog-agent/pull/4883
+- name: Ensure datadog-agent-sysprobe is stopped if disabled or not installed (before 6/7.18.0)
   service:
     name: datadog-agent-sysprobe
     state: stopped
     enabled: no
-  when: not datadog_skip_running_check and (not datadog_enabled or not datadog_sysprobe_enabled) and datadog_sysprobe_installed
+  when: not datadog_skip_running_check
+    and (not datadog_enabled or not datadog_sysprobe_enabled)
+    and datadog_before_7180
+    and datadog_sysprobe_installed
 
 - name: Ensure datadog-agent, datadog-agent-process and datadog-agent-trace are not running
   service:
diff --git a/templates/system-probe.yaml.j2 b/templates/system-probe.yaml.j2
index 917d6523..d34fde82 100644
--- a/templates/system-probe.yaml.j2
+++ b/templates/system-probe.yaml.j2
@@ -1,6 +1,6 @@
 # Managed by Ansible
 
-{% if system_probe_config is defined and system_probe_config|length > 0 -%}
+{% if system_probe_config is defined and system_probe_config | default({}, true) | length > 0 -%}
 system_probe_config:
 {# The "first" option is only supported by jinja 2.10+
   which is not present on older systems (CentOS 7, Debian 8, etc.)

From 8af856b171d44675e088c33259e8b3415f12f80a Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Wed, 24 Mar 2021 17:23:46 +0100
Subject: [PATCH 02/11] Restart sysprobe on config change

---
 handlers/main.yml     |  6 +++++
 tasks/agent-linux.yml | 54 +++++++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index 78aa6136..73aa7f1a 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,5 +1,11 @@
 ---
 
+- name: restart datadog-agent-sysprobe
+  service:
+    name: datadog-agent-sysprobe
+    state: restarted
+  when: datadog_enabled and not ansible_check_mode and not ansible_facts.os_family == "Windows"
+
 - name: restart datadog-agent
   service:
     name: datadog-agent
diff --git a/tasks/agent-linux.yml b/tasks/agent-linux.yml
index 5d099299..eb587422 100644
--- a/tasks/agent-linux.yml
+++ b/tasks/agent-linux.yml
@@ -2,6 +2,16 @@
 - name: populate service facts
   service_facts:
 
+- name: set before 6/7.23.0 flag
+  set_fact:
+    datadog_before_7230: "{{ datadog_major is defined and datadog_minor is defined
+      and datadog_major | int < 8 and datadog_minor | int < 23 }}"
+
+- name: set before 6/7.18.0 flag
+  set_fact:
+    datadog_before_7180: "{{ datadog_major is defined and datadog_minor is defined
+      and datadog_major | int < 8 and datadog_minor | int < 18 }}"
+
 - name: add "{{ datadog_user }}" user to additional groups
   user: name="{{ datadog_user }}" groups="{{ datadog_additional_groups }}" append=yes
   when: datadog_additional_groups | default([], true) | length > 0
@@ -71,37 +81,12 @@
   with_items: "{{ datadog_checks|list }}"
   notify: restart datadog-agent
 
-- name: Create system-probe configuration file
-  template:
-    src: system-probe.yaml.j2
-    dest: /etc/datadog-agent/system-probe.yaml
-    mode: 0640
-    owner: "root"
-    group: "{{ datadog_group }}"
-
-- name: Ensure datadog-agent is running
-  service:
-    name: datadog-agent
-    state: started
-    enabled: yes
-  when: not datadog_skip_running_check and datadog_enabled and not ansible_check_mode
-
 - name: set system probe installed
   set_fact:
     datadog_sysprobe_installed: "{{ ansible_facts.services['datadog-agent-sysprobe'] is defined
       or ansible_facts.services['datadog-agent-sysprobe.service'] is defined }}"
   when: not datadog_skip_running_check
 
-- name: set before 6/7.23.0 flag
-  set_fact:
-    datadog_before_7230: "{{ datadog_major is defined and datadog_minor is defined
-      and datadog_major < 8 and datadog_minor | int < 23 }}"
-
-- name: set before 6/7.18.0 flag
-  set_fact:
-    datadog_before_7180: "{{ datadog_major is defined and datadog_minor is defined
-      and datadog_major < 8 and datadog_minor | int < 18 }}"
-
 # Before 6/7.23.0, system_probe_config controls the system-probe service
 # datadog_minor is only defined when a specific Agent version is given
 # (see tasks/parse-version.yml)
@@ -129,6 +114,25 @@
   when: not datadog_skip_running_check
     and (not datadog_before_7230)
 
+- name: Create system-probe configuration file
+  template:
+    src: system-probe.yaml.j2
+    dest: /etc/datadog-agent/system-probe.yaml
+    mode: 0640
+    owner: "root"
+    group: "{{ datadog_group }}"
+  notify:
+    "{% if datadog_before_7180 and datadog_sysprobe_enabled %}restart datadog-agent-sysprobe{%
+        elif (not datadog_before_7180) %}restart datadog-agent{%
+        endif %}"
+
+- name: Ensure datadog-agent is running
+  service:
+    name: datadog-agent
+    state: started
+    enabled: yes
+  when: not datadog_skip_running_check and datadog_enabled and not ansible_check_mode
+
 - name: Ensure datadog-agent-sysprobe is running if enabled and installed
   service:
     name: datadog-agent-sysprobe

From 9ca27f0b00d7d89a49bd7b4e2057d483b56c0d98 Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Thu, 25 Mar 2021 11:10:42 +0100
Subject: [PATCH 03/11] Simplify restart logic

---
 handlers/main.yml     | 2 +-
 tasks/agent-linux.yml | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/handlers/main.yml b/handlers/main.yml
index 73aa7f1a..5ce578bb 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -4,7 +4,7 @@
   service:
     name: datadog-agent-sysprobe
     state: restarted
-  when: datadog_enabled and not ansible_check_mode and not ansible_facts.os_family == "Windows"
+  when: datadog_enabled and datadog_sysprobe_enabled and not ansible_check_mode and not ansible_facts.os_family == "Windows"
 
 - name: restart datadog-agent
   service:
diff --git a/tasks/agent-linux.yml b/tasks/agent-linux.yml
index eb587422..14002e42 100644
--- a/tasks/agent-linux.yml
+++ b/tasks/agent-linux.yml
@@ -122,9 +122,7 @@
     owner: "root"
     group: "{{ datadog_group }}"
   notify:
-    "{% if datadog_before_7180 and datadog_sysprobe_enabled %}restart datadog-agent-sysprobe{%
-        elif (not datadog_before_7180) %}restart datadog-agent{%
-        endif %}"
+    "{% if datadog_before_7180 %}restart datadog-agent-sysprobe{% else %}restart datadog-agent{% endif %}"
 
 - name: Ensure datadog-agent is running
   service:

From 7480cdcac89dd895020b299f049a82bd053ca899 Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Thu, 25 Mar 2021 11:17:19 +0100
Subject: [PATCH 04/11] Remove unneeded system-probe config defaults

---
 defaults/main.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 99fc1445..327c35ef 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,11 +2,9 @@
 role_version: 4.7.1
 
 # default system-probe.yaml options
-system_probe_config:
-  enabled: false
+system_probe_config: {}
 
-network_config:
-  enabled: false
+network_config: {}
 
 # define if the datadog-agent services should be enabled
 datadog_enabled: yes

From fc831202e0ed9971580b5b491bc8d2e8ec24f7a9 Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Thu, 25 Mar 2021 11:39:58 +0100
Subject: [PATCH 05/11] Task name punctuation

---
 tasks/agent-linux.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tasks/agent-linux.yml b/tasks/agent-linux.yml
index 14002e42..ffd023cc 100644
--- a/tasks/agent-linux.yml
+++ b/tasks/agent-linux.yml
@@ -1,18 +1,18 @@
 ---
-- name: populate service facts
+- name: Populate service facts
   service_facts:
 
-- name: set before 6/7.23.0 flag
+- name: Set before 6/7.23.0 flag
   set_fact:
     datadog_before_7230: "{{ datadog_major is defined and datadog_minor is defined
       and datadog_major | int < 8 and datadog_minor | int < 23 }}"
 
-- name: set before 6/7.18.0 flag
+- name: Set before 6/7.18.0 flag
   set_fact:
     datadog_before_7180: "{{ datadog_major is defined and datadog_minor is defined
       and datadog_major | int < 8 and datadog_minor | int < 18 }}"
 
-- name: add "{{ datadog_user }}" user to additional groups
+- name: Add "{{ datadog_user }}" user to additional groups
   user: name="{{ datadog_user }}" groups="{{ datadog_additional_groups }}" append=yes
   when: datadog_additional_groups | default([], true) | length > 0
   notify: restart datadog-agent
@@ -81,7 +81,7 @@
   with_items: "{{ datadog_checks|list }}"
   notify: restart datadog-agent
 
-- name: set system probe installed
+- name: Set system probe installed
   set_fact:
     datadog_sysprobe_installed: "{{ ansible_facts.services['datadog-agent-sysprobe'] is defined
       or ansible_facts.services['datadog-agent-sysprobe.service'] is defined }}"
@@ -90,7 +90,7 @@
 # Before 6/7.23.0, system_probe_config controls the system-probe service
 # datadog_minor is only defined when a specific Agent version is given
 # (see tasks/parse-version.yml)
-- name: set system probe enabled (before 6/7.23.0)
+- name: Set system probe enabled (before 6/7.23.0)
   set_fact:
     datadog_sysprobe_enabled: "{{ system_probe_config is defined
       and 'enabled' in (system_probe_config | default({}, true))
@@ -101,7 +101,7 @@
 
 # Since 6/7.23.0, setting enabled: true in system_probe_config or network_config
 # is enough to start the system-probe service: https://github.com/DataDog/datadog-agent/pull/6640 
-- name: set system probe enabled (since 6/7.23.0)
+- name: Set system probe enabled (since 6/7.23.0)
   set_fact:
     datadog_sysprobe_enabled: "{{
       ((system_probe_config is defined

From 26903da4bddcd6ff94901ed9f4399489e0aafb6b Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Thu, 25 Mar 2021 11:43:55 +0100
Subject: [PATCH 06/11] Update CI tests

---
 ci_test/install_agent_6.yaml | 4 ++++
 ci_test/install_agent_7.yaml | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ci_test/install_agent_6.yaml b/ci_test/install_agent_6.yaml
index 402a91d3..e52befd5 100644
--- a/ci_test/install_agent_6.yaml
+++ b/ci_test/install_agent_6.yaml
@@ -18,6 +18,10 @@
         env: dev
       trace.concentrator:
         extra_aggregators: version
+    system_probe_config:
+      sysprobe_socket: /opt/datadog-agent/run/sysprobe.sock
+    network_config:
+      enabled: true
     datadog_checks:
       process:
         init_config:
diff --git a/ci_test/install_agent_7.yaml b/ci_test/install_agent_7.yaml
index d9cef6ae..3e0ca90d 100644
--- a/ci_test/install_agent_7.yaml
+++ b/ci_test/install_agent_7.yaml
@@ -18,6 +18,10 @@
         env: dev
       trace.concentrator:
         extra_aggregators: version
+    system_probe_config:
+      sysprobe_socket: /opt/datadog-agent/run/sysprobe.sock
+    network_config:
+      enabled: true
     datadog_checks:
       process:
         init_config:

From aa118913c3a124266f4a7fa4684db5ac9efce6a4 Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Thu, 25 Mar 2021 12:01:39 +0100
Subject: [PATCH 07/11] Task reordering

---
 tasks/agent-linux.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tasks/agent-linux.yml b/tasks/agent-linux.yml
index ffd023cc..15ee2dc3 100644
--- a/tasks/agent-linux.yml
+++ b/tasks/agent-linux.yml
@@ -138,6 +138,17 @@
     enabled: yes
   when: not datadog_skip_running_check and datadog_enabled and not ansible_check_mode and datadog_sysprobe_enabled
 
+- name: Ensure datadog-agent, datadog-agent-process and datadog-agent-trace are not running
+  service:
+    name: "{{ item }}"
+    state: stopped
+    enabled: no
+  when: not datadog_skip_running_check and not datadog_enabled
+  with_list:
+    - datadog-agent
+    - datadog-agent-process
+    - datadog-agent-trace
+
 # Stop system-probe manually on Agent versions < 6/7.18, as it was not tied
 # to the main Agent service: https://github.com/DataDog/datadog-agent/pull/4883
 - name: Ensure datadog-agent-sysprobe is stopped if disabled or not installed (before 6/7.18.0)
@@ -150,17 +161,6 @@
     and datadog_before_7180
     and datadog_sysprobe_installed
 
-- name: Ensure datadog-agent, datadog-agent-process and datadog-agent-trace are not running
-  service:
-    name: "{{ item }}"
-    state: stopped
-    enabled: no
-  when: not datadog_skip_running_check and not datadog_enabled
-  with_list:
-    - datadog-agent
-    - datadog-agent-process
-    - datadog-agent-trace
-
 - name: Ensure datadog-agent-security is not running
   service:
     name: datadog-agent-security

From da832668a559a655d8a680f7d150ad512e6fa69a Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Thu, 25 Mar 2021 15:18:51 +0100
Subject: [PATCH 08/11] Task reordering

---
 tasks/agent-linux.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tasks/agent-linux.yml b/tasks/agent-linux.yml
index 15ee2dc3..ff4709c0 100644
--- a/tasks/agent-linux.yml
+++ b/tasks/agent-linux.yml
@@ -81,6 +81,16 @@
   with_items: "{{ datadog_checks|list }}"
   notify: restart datadog-agent
 
+- name: Create system-probe configuration file
+  template:
+    src: system-probe.yaml.j2
+    dest: /etc/datadog-agent/system-probe.yaml
+    mode: 0640
+    owner: "root"
+    group: "{{ datadog_group }}"
+  notify:
+    "{% if datadog_before_7180 %}restart datadog-agent-sysprobe{% else %}restart datadog-agent{% endif %}"
+
 - name: Set system probe installed
   set_fact:
     datadog_sysprobe_installed: "{{ ansible_facts.services['datadog-agent-sysprobe'] is defined
@@ -114,16 +124,6 @@
   when: not datadog_skip_running_check
     and (not datadog_before_7230)
 
-- name: Create system-probe configuration file
-  template:
-    src: system-probe.yaml.j2
-    dest: /etc/datadog-agent/system-probe.yaml
-    mode: 0640
-    owner: "root"
-    group: "{{ datadog_group }}"
-  notify:
-    "{% if datadog_before_7180 %}restart datadog-agent-sysprobe{% else %}restart datadog-agent{% endif %}"
-
 - name: Ensure datadog-agent is running
   service:
     name: datadog-agent

From 5a9e735b9c1eda85389dcd92ccd9d88645fdef21 Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Fri, 26 Mar 2021 16:38:54 +0100
Subject: [PATCH 09/11] Change cutoff version from 7.23.0 to 7.24.1

---
 tasks/agent-linux.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/tasks/agent-linux.yml b/tasks/agent-linux.yml
index ff4709c0..3500edd6 100644
--- a/tasks/agent-linux.yml
+++ b/tasks/agent-linux.yml
@@ -2,10 +2,11 @@
 - name: Populate service facts
   service_facts:
 
-- name: Set before 6/7.23.0 flag
+- name: Set before 6/7.24.1 flag
   set_fact:
-    datadog_before_7230: "{{ datadog_major is defined and datadog_minor is defined
-      and datadog_major | int < 8 and datadog_minor | int < 23 }}"
+    datadog_before_7241: "{{ datadog_major is defined and datadog_minor is defined and datadog_bugfix is defined
+      and datadog_major | int < 8
+      and (datadog_minor | int < 24 or (datadog_minor | int == 24 and datadog_bugfix | int < 1)) }}"
 
 - name: Set before 6/7.18.0 flag
   set_fact:
@@ -97,21 +98,21 @@
       or ansible_facts.services['datadog-agent-sysprobe.service'] is defined }}"
   when: not datadog_skip_running_check
 
-# Before 6/7.23.0, system_probe_config controls the system-probe service
+# Before 6/7.24.1, system_probe_config controls the system-probe service
 # datadog_minor is only defined when a specific Agent version is given
 # (see tasks/parse-version.yml)
-- name: Set system probe enabled (before 6/7.23.0)
+- name: Set system probe enabled (before 6/7.24.1)
   set_fact:
     datadog_sysprobe_enabled: "{{ system_probe_config is defined
       and 'enabled' in (system_probe_config | default({}, true))
       and system_probe_config['enabled']
       and datadog_sysprobe_installed }}"
   when: not datadog_skip_running_check
-    and datadog_before_7230
+    and datadog_before_7241
 
-# Since 6/7.23.0, setting enabled: true in system_probe_config or network_config
-# is enough to start the system-probe service: https://github.com/DataDog/datadog-agent/pull/6640 
-- name: Set system probe enabled (since 6/7.23.0)
+# Since 6/7.24.1, setting enabled: true in network_config is enough to start the system-probe service:
+# https://docs.datadoghq.com/network_monitoring/performance/setup/?tab=agent#setup
+- name: Set system probe enabled (since 6/7.24.1)
   set_fact:
     datadog_sysprobe_enabled: "{{
       ((system_probe_config is defined
@@ -122,7 +123,7 @@
       and network_config['enabled']))
       and datadog_sysprobe_installed }}"
   when: not datadog_skip_running_check
-    and (not datadog_before_7230)
+    and (not datadog_before_7241)
 
 - name: Ensure datadog-agent is running
   service:

From 8e6967c14972e65c7bb22bd08fe45db5116e568d Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Fri, 26 Mar 2021 16:39:08 +0100
Subject: [PATCH 10/11] Documentation updates

---
 README.md | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 0e956c89..dfe3eddb 100644
--- a/README.md
+++ b/README.md
@@ -163,7 +163,7 @@ The following variables are available for live processes:
 
 #### System probe
 
-The system probe is configured under the `network_config` variable. Any variables nested underneath are written to the `system-probe.yaml`.
+The system probe is configured under the `system_probe_config` variable. Any variables nested underneath are written to the `system-probe.yaml`, in the `system_probe_config` section.
 
 [Network Performance Monitoring][7] (NPM) is configured under the `network_config` variable.  Any variables nested underneath are written to the `system-probe.yaml`, in the `network_config` section.
 
@@ -183,13 +183,15 @@ network_config:
   enabled: true
 ```
 
-Once modification is complete, follow the steps below:
+**Note**: This configuration works with Agent 6.24.1+ and 7.24.1+. For older Agent versions, refer to [the public documentation][8] on how to enable system-probe.
+
+On Linux, once this modification is complete, follow the steps below if you installed an Agent version older than 6.18.0 or 7.18.0:
 
 1. Start the system-probe: `sudo service datadog-agent-sysprobe start` **Note**: If the service wrapper is not available on your system, run this command instead: `sudo initctl start datadog-agent-sysprobe`.
-2. [Restart the Agent][8]: `sudo service datadog-agent restart`.
+2. [Restart the Agent][9]: `sudo service datadog-agent restart`.
 3. Enable the system-probe to start on boot: `sudo service enable datadog-agent-sysprobe`.
 
-For manual setup, refer to the [NPM][9] documentation.
+For manual setup, refer to the [NPM][8] documentation.
 
 #### Agent v5
 
@@ -334,7 +336,7 @@ To downgrade to a prior version of the Agent:
 
 Below are some sample playbooks to assist you with using the Datadog Ansible role.
 
-The following example sends data to Datadog US (default), enables logs, and configures a few checks.
+The following example sends data to Datadog US (default), enables logs, NPM and configures a few checks.
 
 ```yml
 - hosts: servers
@@ -403,7 +405,7 @@ The following example sends data to Datadog US (default), enables logs, and conf
         version: 1.11.0
       datadog-postgres:
         action: remove
-    system_probe_config:
+    network_config:
       enabled: true
 ```
 
@@ -530,6 +532,6 @@ For more details, see [Critical Bug in Uninstaller for Datadog Agent 6.14.0 and
 [5]: https://github.com/DataDog/integrations-core
 [6]: https://docs.datadoghq.com/infrastructure/process/
 [7]: https://docs.datadoghq.com/network_performance_monitoring/
-[8]: https://docs.datadoghq.com/agent/guide/agent-commands/#restart-the-agent
-[9]: https://docs.datadoghq.com/network_performance_monitoring/installation/?tab=agent#setup
+[8]: https://docs.datadoghq.com/network_performance_monitoring/installation/?tab=agent#setup
+[9]: https://docs.datadoghq.com/agent/guide/agent-commands/#restart-the-agent
 [10]: https://app.datadoghq.com/help/agent_fix

From d4be0269b9d4f45008844fd5361f6bcfd718eb59 Mon Sep 17 00:00:00 2001
From: Kylian Serrania <kylian.serrania@datadoghq.com>
Date: Tue, 30 Mar 2021 10:31:14 +0200
Subject: [PATCH 11/11] Update manual tests playbooks

---
 manual_tests/test_6_full.yml | 3 ++-
 manual_tests/test_7_full.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/manual_tests/test_6_full.yml b/manual_tests/test_6_full.yml
index fd58b5a3..91142345 100644
--- a/manual_tests/test_6_full.yml
+++ b/manual_tests/test_6_full.yml
@@ -6,13 +6,14 @@
     datadog_api_key: "123456"
     datadog_agent_allow_downgrade: true
     system_probe_config:
-      enabled: true
       source_excludes:
         "*":
           - 8301
       dest_excludes:
         "*":
           - 8301
+    network_config:
+      enabled: true
     datadog_config:
       tags: "mytag0, mytag1"
       log_level: INFO
diff --git a/manual_tests/test_7_full.yml b/manual_tests/test_7_full.yml
index 32c4899b..a6464010 100644
--- a/manual_tests/test_7_full.yml
+++ b/manual_tests/test_7_full.yml
@@ -6,13 +6,14 @@
     datadog_api_key: "123456"
     datadog_agent_allow_downgrade: true
     system_probe_config:
-      enabled: true
       source_excludes:
         "*":
           - 8301
       dest_excludes:
         "*":
           - 8301
+    network_config:
+      enabled: true
     datadog_config:
       tags: "mytag0, mytag1"
       log_level: INFO