-
Notifications
You must be signed in to change notification settings - Fork 528
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
A few smallish changes to the model.Metricset type, for future-proofing. The goal is to make the type suitable for generating transformation to beat.Events logic later, while making the type better suited to protobuf definition in the short term. model.Metricset.Samples is now a map, instead of a slice of named metrics, and the metrics fields are added as flat dotted field namess rather than hierarchical objects. In the future we will send the samples map as-is (with values, type, and unit) to Elasticsearch and perform transformation to top-level metrics fields and dynamic templates completely in the ingest pipeline. model.Sample is now called model.MetricsetSample. We no longer set "_doc_count" in transformation; this is now part of the type and is set in transaction metrics aggregation for "transaction.duration.histogram", the only metric where it is expected to be set.
- Loading branch information
Showing
30 changed files
with
494 additions
and
1,004 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
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 |
|---|---|---|
|
|
@@ -7,11 +7,7 @@ | |
| "version": "3.14.0" | ||
| }, | ||
| "byte_counter": 1, | ||
| "dotted": { | ||
| "float": { | ||
| "gauge": 6.12 | ||
| } | ||
| }, | ||
| "dotted.float.gauge": 6.12, | ||
| "double_gauge": 3.141592653589793, | ||
| "ecs": { | ||
| "version": "1.10.0" | ||
|
|
@@ -30,19 +26,7 @@ | |
| }, | ||
| "long_gauge": 3147483648, | ||
| "metricset.name": "span_breakdown", | ||
| "negative": { | ||
| "d": { | ||
| "o": { | ||
| "t": { | ||
| "t": { | ||
| "e": { | ||
| "d": -1022 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "negative.d.o.t.t.e.d": -1022, | ||
| "observer": { | ||
| "ephemeral_id": "00000000-0000-0000-0000-000000000000", | ||
| "hostname": "", | ||
|
|
@@ -69,34 +53,20 @@ | |
| }, | ||
| "short_counter": 227, | ||
| "span": { | ||
| "self_time": { | ||
| "count": 1, | ||
| "sum": { | ||
| "us": 633.288 | ||
| } | ||
| }, | ||
| "subtype": "mysql", | ||
| "type": "db" | ||
| }, | ||
| "span.self_time.count": 1, | ||
| "span.self_time.sum.us": 633.288, | ||
| "transaction": { | ||
| "breakdown": { | ||
| "count": 12 | ||
| }, | ||
| "duration": { | ||
| "count": 2, | ||
| "sum": { | ||
| "us": 12 | ||
| } | ||
| }, | ||
| "name": "GET /", | ||
| "self_time": { | ||
| "count": 2, | ||
| "sum": { | ||
| "us": 10 | ||
| } | ||
| }, | ||
| "type": "request" | ||
| }, | ||
| "transaction.breakdown.count": 12, | ||
| "transaction.duration.count": 2, | ||
| "transaction.duration.sum.us": 12, | ||
| "transaction.self_time.count": 2, | ||
| "transaction.self_time.sum.us": 10, | ||
| "user": { | ||
| "email": "[email protected]", | ||
| "id": "axb123hg", | ||
|
|
@@ -112,15 +82,7 @@ | |
| "ecs": { | ||
| "version": "1.10.0" | ||
| }, | ||
| "go": { | ||
| "memstats": { | ||
| "heap": { | ||
| "sys": { | ||
| "bytes": 6520832 | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "go.memstats.heap.sys.bytes": 6520832, | ||
| "host": { | ||
| "ip": "127.0.0.1" | ||
| }, | ||
|
|
@@ -200,22 +162,8 @@ | |
| "name": "node-1" | ||
| } | ||
| }, | ||
| "system": { | ||
| "process": { | ||
| "cgroup": { | ||
| "memory": { | ||
| "mem": { | ||
| "limit": { | ||
| "bytes": 2048 | ||
| }, | ||
| "usage": { | ||
| "bytes": 1024 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "system.process.cgroup.memory.mem.limit.bytes": 2048, | ||
| "system.process.cgroup.memory.mem.usage.bytes": 1024, | ||
| "user": { | ||
| "email": "[email protected]", | ||
| "id": "axb123hg", | ||
|
|
@@ -263,36 +211,14 @@ | |
| "name": "node-1" | ||
| } | ||
| }, | ||
| "system": { | ||
| "process": { | ||
| "cgroup": { | ||
| "cpu": { | ||
| "cfs": { | ||
| "period": { | ||
| "us": 1024 | ||
| }, | ||
| "quota": { | ||
| "us": 2048 | ||
| } | ||
| }, | ||
| "id": 2048, | ||
| "stats": { | ||
| "periods": 2048, | ||
| "throttled": { | ||
| "ns": 2048, | ||
| "periods": 2048 | ||
| } | ||
| } | ||
| }, | ||
| "cpuacct": { | ||
| "id": 2048, | ||
| "total": { | ||
| "ns": 2048 | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "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": "[email protected]", | ||
| "id": "axb123hg", | ||
|
|
@@ -301,7 +227,6 @@ | |
| }, | ||
| { | ||
| "@timestamp": "2017-05-30T18:53:41.366Z", | ||
| "_doc_count": 6, | ||
| "_metric_descriptions": { | ||
| "latency_distribution": { | ||
| "type": "histogram", | ||
|
|
||
Oops, something went wrong.