-
Notifications
You must be signed in to change notification settings - Fork 525
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add dynamic_templates to app_metrics data stream (#6043)
Add a "histogram" dynamic template to the application metrics (`metrics-apm.app-*`) data stream index template, so we can dynamically map histogram metrics when using data streams.
- Loading branch information
Showing
13 changed files
with
392 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| - name: histogram | ||
| type: histogram | ||
| - name: kubernetes | ||
| title: Kubernetes | ||
| type: group | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletions
2
apmpackage/apm/data_stream/internal_metrics/fields/fields.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| - name: histogram | ||
| type: histogram | ||
| - name: kubernetes | ||
| title: Kubernetes | ||
| type: group | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
317 changes: 317 additions & 0 deletions
317
systemtest/approvals/TestApprovedMetrics/data_streams_enabled.approved.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,317 @@ | ||
| { | ||
| "events": [ | ||
| { | ||
| "@timestamp": "2017-05-30T18:53:41.364Z", | ||
| "agent": { | ||
| "name": "elastic-node", | ||
| "version": "3.14.0" | ||
| }, | ||
| "data_stream.dataset": "apm.app.1234_service_12a3", | ||
| "data_stream.namespace": "default", | ||
| "data_stream.type": "metrics", | ||
| "ecs": { | ||
| "version": "dynamic" | ||
| }, | ||
| "event": { | ||
| "agent_id_status": "missing", | ||
| "ingested": "dynamic" | ||
| }, | ||
| "go.memstats.heap.sys.bytes": 6520832, | ||
| "host": { | ||
| "ip": "127.0.0.1" | ||
| }, | ||
| "labels": { | ||
| "tag1": "one", | ||
| "tag2": 2 | ||
| }, | ||
| "metricset.name": "app", | ||
| "observer": { | ||
| "ephemeral_id": "dynamic", | ||
| "hostname": "dynamic", | ||
| "id": "dynamic", | ||
| "type": "apm-server", | ||
| "version": "dynamic", | ||
| "version_major": "dynamic" | ||
| }, | ||
| "process": { | ||
| "pid": 1234 | ||
| }, | ||
| "processor": { | ||
| "event": "metric", | ||
| "name": "metric" | ||
| }, | ||
| "service": { | ||
| "language": { | ||
| "name": "ecmascript" | ||
| }, | ||
| "name": "1234_service-12a3", | ||
| "node": { | ||
| "name": "node-1" | ||
| } | ||
| }, | ||
| "user": { | ||
| "email": "user@mail.com", | ||
| "id": "axb123hg", | ||
| "name": "logged-in-user" | ||
| } | ||
| }, | ||
| { | ||
| "@timestamp": "2017-05-30T18:53:41.366Z", | ||
| "agent": { | ||
| "name": "elastic-node", | ||
| "version": "3.14.0" | ||
| }, | ||
| "data_stream.dataset": "apm.app.1234_service_12a3", | ||
| "data_stream.namespace": "default", | ||
| "data_stream.type": "metrics", | ||
| "ecs": { | ||
| "version": "dynamic" | ||
| }, | ||
| "event": { | ||
| "agent_id_status": "missing", | ||
| "ingested": "dynamic" | ||
| }, | ||
| "host": { | ||
| "ip": "127.0.0.1" | ||
| }, | ||
| "labels": { | ||
| "tag1": "one", | ||
| "tag2": 2 | ||
| }, | ||
| "metricset.name": "app", | ||
| "observer": { | ||
| "ephemeral_id": "dynamic", | ||
| "hostname": "dynamic", | ||
| "id": "dynamic", | ||
| "type": "apm-server", | ||
| "version": "dynamic", | ||
| "version_major": "dynamic" | ||
| }, | ||
| "process": { | ||
| "pid": 1234 | ||
| }, | ||
| "processor": { | ||
| "event": "metric", | ||
| "name": "metric" | ||
| }, | ||
| "service": { | ||
| "language": { | ||
| "name": "ecmascript" | ||
| }, | ||
| "name": "1234_service-12a3", | ||
| "node": { | ||
| "name": "node-1" | ||
| } | ||
| }, | ||
| "system.process.cgroup.memory.mem.limit.bytes": 2048, | ||
| "system.process.cgroup.memory.mem.usage.bytes": 1024, | ||
| "user": { | ||
| "email": "user@mail.com", | ||
| "id": "axb123hg", | ||
| "name": "logged-in-user" | ||
| } | ||
| }, | ||
| { | ||
| "@timestamp": "2017-05-30T18:53:41.366Z", | ||
| "agent": { | ||
| "name": "elastic-node", | ||
| "version": "3.14.0" | ||
| }, | ||
| "data_stream.dataset": "apm.app.1234_service_12a3", | ||
| "data_stream.namespace": "default", | ||
| "data_stream.type": "metrics", | ||
| "ecs": { | ||
| "version": "dynamic" | ||
| }, | ||
| "event": { | ||
| "agent_id_status": "missing", | ||
| "ingested": "dynamic" | ||
| }, | ||
| "host": { | ||
| "ip": "127.0.0.1" | ||
| }, | ||
| "labels": { | ||
| "tag1": "one", | ||
| "tag2": 2 | ||
| }, | ||
| "metricset.name": "app", | ||
| "observer": { | ||
| "ephemeral_id": "dynamic", | ||
| "hostname": "dynamic", | ||
| "id": "dynamic", | ||
| "type": "apm-server", | ||
| "version": "dynamic", | ||
| "version_major": "dynamic" | ||
| }, | ||
| "process": { | ||
| "pid": 1234 | ||
| }, | ||
| "processor": { | ||
| "event": "metric", | ||
| "name": "metric" | ||
| }, | ||
| "service": { | ||
| "language": { | ||
| "name": "ecmascript" | ||
| }, | ||
| "name": "1234_service-12a3", | ||
| "node": { | ||
| "name": "node-1" | ||
| } | ||
| }, | ||
| "system.process.cgroup.cpu.cfs.period.us": 1024, | ||
| "system.process.cgroup.cpu.cfs.quota.us": 2048, | ||
| "system.process.cgroup.cpu.id": 2048, | ||
| "system.process.cgroup.cpu.stats.periods": 2048, | ||
| "system.process.cgroup.cpu.stats.throttled.ns": 2048, | ||
| "system.process.cgroup.cpu.stats.throttled.periods": 2048, | ||
| "system.process.cgroup.cpuacct.id": 2048, | ||
| "system.process.cgroup.cpuacct.total.ns": 2048, | ||
| "user": { | ||
| "email": "user@mail.com", | ||
| "id": "axb123hg", | ||
| "name": "logged-in-user" | ||
| } | ||
| }, | ||
| { | ||
| "@timestamp": "2017-05-30T18:53:41.366Z", | ||
| "agent": { | ||
| "name": "elastic-node", | ||
| "version": "3.14.0" | ||
| }, | ||
| "data_stream.dataset": "apm.app.1234_service_12a3", | ||
| "data_stream.namespace": "default", | ||
| "data_stream.type": "metrics", | ||
| "ecs": { | ||
| "version": "dynamic" | ||
| }, | ||
| "event": { | ||
| "agent_id_status": "missing", | ||
| "ingested": "dynamic" | ||
| }, | ||
| "host": { | ||
| "ip": "127.0.0.1" | ||
| }, | ||
| "labels": { | ||
| "tag1": "one", | ||
| "tag2": 2 | ||
| }, | ||
| "latency_distribution": { | ||
| "counts": [ | ||
| 1, | ||
| 2, | ||
| 3 | ||
| ], | ||
| "values": [ | ||
| 1.1, | ||
| 2.2, | ||
| 3.3 | ||
| ] | ||
| }, | ||
| "metricset.name": "app", | ||
| "observer": { | ||
| "ephemeral_id": "dynamic", | ||
| "hostname": "dynamic", | ||
| "id": "dynamic", | ||
| "type": "apm-server", | ||
| "version": "dynamic", | ||
| "version_major": "dynamic" | ||
| }, | ||
| "process": { | ||
| "pid": 1234 | ||
| }, | ||
| "processor": { | ||
| "event": "metric", | ||
| "name": "metric" | ||
| }, | ||
| "service": { | ||
| "language": { | ||
| "name": "ecmascript" | ||
| }, | ||
| "name": "1234_service-12a3", | ||
| "node": { | ||
| "name": "node-1" | ||
| } | ||
| }, | ||
| "user": { | ||
| "email": "user@mail.com", | ||
| "id": "axb123hg", | ||
| "name": "logged-in-user" | ||
| } | ||
| }, | ||
| { | ||
| "@timestamp": "2017-05-30T18:53:42.281Z", | ||
| "agent": { | ||
| "name": "elastic-node", | ||
| "version": "3.14.0" | ||
| }, | ||
| "data_stream.dataset": "apm.internal", | ||
| "data_stream.namespace": "default", | ||
| "data_stream.type": "metrics", | ||
| "ecs": { | ||
| "version": "dynamic" | ||
| }, | ||
| "event": { | ||
| "agent_id_status": "missing", | ||
| "ingested": "dynamic" | ||
| }, | ||
| "host": { | ||
| "ip": "127.0.0.1" | ||
| }, | ||
| "labels": { | ||
| "code": 200, | ||
| "some": "abc", | ||
| "success": true, | ||
| "tag1": "one", | ||
| "tag2": 2 | ||
| }, | ||
| "metricset.name": "span_breakdown", | ||
| "observer": { | ||
| "ephemeral_id": "dynamic", | ||
| "hostname": "dynamic", | ||
| "id": "dynamic", | ||
| "type": "apm-server", | ||
| "version": "dynamic", | ||
| "version_major": "dynamic" | ||
| }, | ||
| "process": { | ||
| "pid": 1234 | ||
| }, | ||
| "processor": { | ||
| "event": "metric", | ||
| "name": "metric" | ||
| }, | ||
| "service": { | ||
| "language": { | ||
| "name": "ecmascript" | ||
| }, | ||
| "name": "1234_service-12a3", | ||
| "node": { | ||
| "name": "node-1" | ||
| } | ||
| }, | ||
| "span": { | ||
| "self_time": { | ||
| "count": 1, | ||
| "sum.us": 633 | ||
| }, | ||
| "subtype": "mysql", | ||
| "type": "db" | ||
| }, | ||
| "transaction": { | ||
| "breakdown.count": 12, | ||
| "duration": { | ||
| "count": 2, | ||
| "sum.us": 12 | ||
| }, | ||
| "name": "GET /", | ||
| "type": "request" | ||
| }, | ||
| "user": { | ||
| "email": "user@mail.com", | ||
| "id": "axb123hg", | ||
| "name": "logged-in-user" | ||
| } | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.