add cGroupOverrides to the legacy config (#77180)

* add cGroupOverrides to the legacy config * update missing usages * remove old cpu/cgroup schema
elastic · Sep 11, 2020 · 1bdff6e · 1bdff6e
1 parent 52d044c
commit 1bdff6e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker
@@ -18,6 +18,8 @@ kibana_vars=(
     console.enabled
     console.proxyConfig
     console.proxyFilter
+    ops.cGroupOverrides.cpuPath
+    ops.cGroupOverrides.cpuAcctPath
     cpu.cgroup.path.override
     cpuacct.cgroup.path.override
     csp.rules
@@ -279,4 +281,4 @@ umask 0002
 # Therefore, we set this value here so that cgroup statistics are
 # available for the container this process will run in.
 
-exec /usr/share/kibana/bin/kibana --cpu.cgroup.path.override=/ --cpuacct.cgroup.path.override=/ ${longopts} "$@"
+exec /usr/share/kibana/bin/kibana --ops.cGroupOverrides.cpuPath=/ --ops.cGroupOverrides.cpuAcctPath=/ ${longopts} "$@"
diff --git a/src/legacy/server/config/schema.js b/src/legacy/server/config/schema.js
@@ -49,22 +49,6 @@ export default () =>
 
     csp: HANDLED_IN_NEW_PLATFORM,
 
-    cpu: Joi.object({
-      cgroup: Joi.object({
-        path: Joi.object({
-          override: Joi.string().default(),
-        }),
-      }),
-    }),
-
-    cpuacct: Joi.object({
-      cgroup: Joi.object({
-        path: Joi.object({
-          override: Joi.string().default(),
-        }),
-      }),
-    }),
-
     server: Joi.object({
       name: Joi.string().default(os.hostname()),
       // keep them for BWC, remove when not used in Legacy.
@@ -144,6 +128,10 @@ export default () =>
 
     ops: Joi.object({
       interval: Joi.number().default(5000),
+      cGroupOverrides: Joi.object().keys({
+        cpuPath: Joi.string().default(),
+        cpuAcctPath: Joi.string().default(),
+      }),
     }).default(),
 
     plugins: Joi.object({

diff --git a/src/legacy/server/status/lib/metrics.js b/src/legacy/server/status/lib/metrics.js
@@ -116,8 +116,8 @@ export class Metrics {
   async captureCGroups() {
     try {
       const cgroup = await cGroupStats({
-        cpuPath: this.config.get('cpu.cgroup.path.override'),
-        cpuAcctPath: this.config.get('cpuacct.cgroup.path.override'),
+        cpuPath: this.config.get('ops.cGroupOverrides.cpuPath'),
+        cpuAcctPath: this.config.get('ops.cGroupOverrides.cpuAcctPath'),
       });
 
       if (isObject(cgroup)) {