Skip to content

Commit

Permalink
update missing usages
Browse files Browse the repository at this point in the history
  • Loading branch information
pgayvallet committed Sep 10, 2020
1 parent abd38c6 commit c528f24
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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} "$@"
4 changes: 2 additions & 2 deletions src/legacy/server/status/lib/metrics.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit c528f24

Please sign in to comment.