Revert "Add system.hostfs setting (#673)"

ycombinator · ycombinator · commit 2f8d31bb71da · 2021-02-09T05:24:37.000-08:00
This reverts commit b1b35b1.
diff --git a/packages/linux/_dev/build/docs/README.md b/packages/linux/_dev/build/docs/README.md
@@ -8,8 +8,6 @@ and the resulting `ptrace_may_access()` call by the kernel to check for
 permissions can be blocked by
 [AppArmor and other LSM software](https://gitlab.com/apparmor/apparmor/wikis/TechnicalDoc_Proc_and_ptrace), even though the System module doesn't use `ptrace` directly.
 
-In addition, when running inside a container the proc filesystem directory of the host
-should be set using `system.hostfs` setting to `/hostfs`. 
 
 ## Metrics
 
diff --git a/packages/linux/data_stream/entropy/agent/stream/stream.yml.hbs b/packages/linux/data_stream/entropy/agent/stream/stream.yml.hbs
@@ -1,5 +1,2 @@
 metricsets: ["entropy"]
-period: {{period}}
-{{#if system.hostfs}}
-system.hostfs: {{system.hostfs}}
-{{/if}}
+period: {{period}}
diff --git a/packages/linux/data_stream/raid/agent/stream/stream.yml.hbs b/packages/linux/data_stream/raid/agent/stream/stream.yml.hbs
@@ -2,7 +2,4 @@ metricsets: ["raid"]
 {{#if raid.mount_point}}
 raid.mount_point: {{raid.mount_point}}
 {{/if}}
-period: {{period}}
-{{#if system.hostfs}}
-system.hostfs: {{system.hostfs}}
-{{/if}}
+period: {{period}}
diff --git a/packages/linux/data_stream/socket/agent/stream/stream.yml.hbs b/packages/linux/data_stream/socket/agent/stream/stream.yml.hbs
@@ -8,7 +8,4 @@ socket.reverse_lookup.success_ttl: {{socket.reverse_lookup.success_ttl}}
 {{#if socket.reverse_lookup.failure_ttl}}
 socket.reverse_lookup.failure_ttl: {{socket.reverse_lookup.failure_ttl}}
 {{/if}}
-period: {{period}}
-{{#if system.hostfs}}
-system.hostfs: {{system.hostfs}}
-{{/if}}
+period: {{period}}
diff --git a/packages/linux/docs/README.md b/packages/linux/docs/README.md
@@ -8,8 +8,6 @@ and the resulting `ptrace_may_access()` call by the kernel to check for
 permissions can be blocked by
 [AppArmor and other LSM software](https://gitlab.com/apparmor/apparmor/wikis/TechnicalDoc_Proc_and_ptrace), even though the System module doesn't use `ptrace` directly.
 
-In addition, when running inside a container the proc filesystem directory of the host
-should be set using `system.hostfs` setting to `/hostfs`. 
 
 ## Metrics
 
diff --git a/packages/linux/manifest.yml b/packages/linux/manifest.yml
@@ -1,7 +1,7 @@
 format_version: 1.0.0
 name: linux
 title: Linux
-version: 0.3.6
+version: 0.3.5
 license: basic
 description: Linux Integration
 type: integration
@@ -23,14 +23,6 @@ policy_templates:
       - type: system/metrics
         title: Collect system metrics from Linux instances
         description: Collecting Linux entropy, Network Summary, RAID, service, socket, and users metrics
-        vars:
-          - name: system.hostfs
-            type: text
-            title: Proc Filesystem Directory
-            multi: false
-            required: false
-            show_user: true
-            description: The proc filesystem base directory.
       - type: linux/metrics
         title: Collect low-level system metrics from Linux instances
         description: Collecting Linux conntrack, ksm, pageinfo metrics.
diff --git a/packages/system/_dev/build/docs/README.md b/packages/system/_dev/build/docs/README.md
@@ -12,9 +12,6 @@ and the resulting `ptrace_may_access()` call by the kernel to check for
 permissions can be blocked by
 [AppArmor and other LSM software](https://gitlab.com/apparmor/apparmor/wikis/TechnicalDoc_Proc_and_ptrace), even though the System module doesn't use `ptrace` directly.
 
-In addition, when running inside a container the proc filesystem directory of the host
-should be set using `system.hostfs` setting to `/hostfs`.  
-
 ## Compatibility
 
 The System datasets collect different kinds of metric data, which may require dedicated permissions
diff --git a/packages/system/data_stream/process/agent/stream/stream.yml.hbs b/packages/system/data_stream/process/agent/stream/stream.yml.hbs
@@ -13,7 +13,4 @@ process.include_cpu_ticks: {{process.include_cpu_ticks}}
 processes:
 {{#each processes}}
   - {{this}}
-{{/each}}
-{{#if system.hostfs}}
-system.hostfs: {{system.hostfs}}
-{{/if}}
+{{/each}}
diff --git a/packages/system/data_stream/process_summary/agent/stream/stream.yml.hbs b/packages/system/data_stream/process_summary/agent/stream/stream.yml.hbs
@@ -1,5 +1,2 @@
 metricsets: ["process_summary"]
-period: {{period}}
-{{#if system.hostfs}}
-system.hostfs: {{system.hostfs}}
-{{/if}}
+period: {{period}}
diff --git a/packages/system/data_stream/socket_summary/agent/stream/stream.yml.hbs b/packages/system/data_stream/socket_summary/agent/stream/stream.yml.hbs
@@ -1,5 +1,2 @@
 metricsets: ["socket_summary"]
-period: {{period}}
-{{#if system.hostfs}}
-system.hostfs: {{system.hostfs}}
-{{/if}}
+period: {{period}}
diff --git a/packages/system/docs/README.md b/packages/system/docs/README.md
@@ -12,9 +12,6 @@ and the resulting `ptrace_may_access()` call by the kernel to check for
 permissions can be blocked by
 [AppArmor and other LSM software](https://gitlab.com/apparmor/apparmor/wikis/TechnicalDoc_Proc_and_ptrace), even though the System module doesn't use `ptrace` directly.
 
-In addition, when running inside a container the proc filesystem directory of the host
-should be set using `system.hostfs` setting to `/hostfs`.  
-
 ## Compatibility
 
 The System datasets collect different kinds of metric data, which may require dedicated permissions
diff --git a/packages/system/manifest.yml b/packages/system/manifest.yml
@@ -36,13 +36,5 @@ policy_templates:
       - type: system/metrics
         title: Collect metrics from System instances
         description: Collecting System core, CPU, diskio, entropy, filesystem, fsstat, load, memory, network, Network Summary, process, Process Summary, raid, service, socket, Socket Summary, uptime and users metrics
-        vars:
-          - name: system.hostfs
-            type: text
-            title: Proc Filesystem Directory
-            multi: false
-            required: false
-            show_user: true
-            description: The proc filesystem base directory.
 owner:
   github: elastic/integrations-services
