Skip to content

Commit 481f144

Browse files
committed
Merge branch 'master' of https://github.com/elastic/kibana into disk-usage-alerting
2 parents 7bb5c06 + 53c8fad commit 481f144

File tree

28 files changed

+5184
-167
lines changed

28 files changed

+5184
-167
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@
167167

168168
# Security
169169
/src/core/server/csp/ @elastic/kibana-security @elastic/kibana-platform
170-
/x-pack/legacy/plugins/security/ @elastic/kibana-security
171170
/x-pack/legacy/plugins/spaces/ @elastic/kibana-security
172171
/x-pack/plugins/spaces/ @elastic/kibana-security
173172
/x-pack/plugins/encrypted_saved_objects/ @elastic/kibana-security
@@ -287,7 +286,6 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
287286
/src/plugins/dashboard/**/*.scss @elastic/kibana-core-ui-designers
288287
/x-pack/plugins/canvas/**/*.scss @elastic/kibana-core-ui-designers
289288
/src/legacy/core_plugins/kibana/public/home/**/*.scss @elastic/kibana-core-ui-designers
290-
/x-pack/legacy/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
291289
/x-pack/legacy/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
292290
/x-pack/plugins/spaces/**/*.scss @elastic/kibana-core-ui-designers
293291
/x-pack/plugins/security/**/*.scss @elastic/kibana-core-ui-designers
@@ -297,7 +295,7 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
297295
/x-pack/plugins/infra/**/*.scss @elastic/observability-design
298296
/x-pack/plugins/ingest_manager/**/*.scss @elastic/observability-design
299297
/x-pack/plugins/observability/**/*.scss @elastic/observability-design
300-
/x-pack/plugins/monitoring/**/*.scss @elastic/observability-design
298+
/x-pack/plugins/monitoring/**/*.scss @elastic/observability-design
301299

302300
# Ent. Search design
303301
/x-pack/plugins/enterprise_search/**/*.scss @elastic/ent-search-design

x-pack/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
*/
66

77
import { xpackMain } from './legacy/plugins/xpack_main';
8-
import { security } from './legacy/plugins/security';
98
import { spaces } from './legacy/plugins/spaces';
109

1110
module.exports = function (kibana) {
12-
return [xpackMain(kibana), spaces(kibana), security(kibana)];
11+
return [xpackMain(kibana), spaces(kibana)];
1312
};

x-pack/legacy/plugins/security/index.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.

x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

x-pack/plugins/apm/common/elasticsearch_fieldnames.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ export const METRIC_SYSTEM_FREE_MEMORY = 'system.memory.actual.free';
7979
export const METRIC_SYSTEM_TOTAL_MEMORY = 'system.memory.total';
8080
export const METRIC_SYSTEM_CPU_PERCENT = 'system.cpu.total.norm.pct';
8181
export const METRIC_PROCESS_CPU_PERCENT = 'system.process.cpu.total.norm.pct';
82+
export const METRIC_CGROUP_MEMORY_LIMIT_BYTES =
83+
'system.process.cgroup.memory.mem.limit.bytes';
84+
export const METRIC_CGROUP_MEMORY_USAGE_BYTES =
85+
'system.process.cgroup.memory.mem.usage.bytes';
8286

8387
export const METRIC_JAVA_HEAP_MEMORY_MAX = 'jvm.memory.heap.max';
8488
export const METRIC_JAVA_HEAP_MEMORY_COMMITTED = 'jvm.memory.heap.committed';

0 commit comments

Comments
 (0)