From c8b2f1cafaf7c54649db3b0a5fb0e91270d6bb44 Mon Sep 17 00:00:00 2001 From: tehmoon Date: Mon, 18 Feb 2019 08:10:04 -0500 Subject: [PATCH] Wrong template for postgresql statement module (#10631) According to: https://github.com/elastic/beats/blob/master/metricbeat/module/postgresql/statement/data.go the default template casts a `long` for a `ms: float` type object --- metricbeat/docs/fields.asciidoc | 36 +++++----- metricbeat/module/postgresql/fields.go | 2 +- .../postgresql/statement/_meta/data.json | 66 +++++++++++-------- .../postgresql/statement/_meta/fields.yml | 36 +++++----- 4 files changed, 75 insertions(+), 65 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 42ba7d7799c..53da6d070ff 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -19753,37 +19753,37 @@ Total number of rows returned by query. -- -*`postgresql.statement.time.total`*:: +*`postgresql.statement.query.time.total.ms`*:: + -- -type: long +type: float Total number of milliseconds spent running query. -- -*`postgresql.statement.time.min`*:: +*`postgresql.statement.query.time.min.ms`*:: + -- -type: long +type: float Minimum number of milliseconds spent running query. -- -*`postgresql.statement.time.max`*:: +*`postgresql.statement.query.time.max.ms`*:: + -- -type: long +type: float Maximum number of milliseconds spent running query. -- -*`postgresql.statement.time.mean`*:: +*`postgresql.statement.query.time.mean.ms`*:: + -- type: long @@ -19793,7 +19793,7 @@ Mean number of milliseconds spent running query. -- -*`postgresql.statement.time.stddev`*:: +*`postgresql.statement.query.time.stddev.ms`*:: + -- type: long @@ -19803,7 +19803,7 @@ Population standard deviation of time spent running query, in milliseconds. -- -*`postgresql.statement.memory.shared.hit`*:: +*`postgresql.statement.query.memory.shared.hit`*:: + -- type: long @@ -19813,7 +19813,7 @@ Total number of shared block cache hits by the query. -- -*`postgresql.statement.memory.shared.read`*:: +*`postgresql.statement.query.memory.shared.read`*:: + -- type: long @@ -19823,7 +19823,7 @@ Total number of shared block cache read by the query. -- -*`postgresql.statement.memory.shared.dirtied`*:: +*`postgresql.statement.query.memory.shared.dirtied`*:: + -- type: long @@ -19833,7 +19833,7 @@ Total number of shared block cache dirtied by the query. -- -*`postgresql.statement.memory.shared.written`*:: +*`postgresql.statement.query.memory.shared.written`*:: + -- type: long @@ -19843,7 +19843,7 @@ Total number of shared block cache written by the query. -- -*`postgresql.statement.memory.local.hit`*:: +*`postgresql.statement.query.memory.local.hit`*:: + -- type: long @@ -19853,7 +19853,7 @@ Total number of local block cache hits by the query. -- -*`postgresql.statement.memory.local.read`*:: +*`postgresql.statement.query.memory.local.read`*:: + -- type: long @@ -19863,7 +19863,7 @@ Total number of local block cache read by the query. -- -*`postgresql.statement.memory.local.dirtied`*:: +*`postgresql.statement.query.memory.local.dirtied`*:: + -- type: long @@ -19873,7 +19873,7 @@ Total number of local block cache dirtied by the query. -- -*`postgresql.statement.memory.local.written`*:: +*`postgresql.statement.query.memory.local.written`*:: + -- type: long @@ -19883,7 +19883,7 @@ Total number of local block cache written by the query. -- -*`postgresql.statement.memory.temp.read`*:: +*`postgresql.statement.query.memory.temp.read`*:: + -- type: long @@ -19893,7 +19893,7 @@ Total number of temp block cache read by the query. -- -*`postgresql.statement.memory.temp.written`*:: +*`postgresql.statement.query.memory.temp.written`*:: + -- type: long diff --git a/metricbeat/module/postgresql/fields.go b/metricbeat/module/postgresql/fields.go index ac394555f73..2ded1e5f4ec 100644 --- a/metricbeat/module/postgresql/fields.go +++ b/metricbeat/module/postgresql/fields.go @@ -32,5 +32,5 @@ func init() { // AssetPostgresql returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/postgresql. func AssetPostgresql() string { - return "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" + return "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" } diff --git a/metricbeat/module/postgresql/statement/_meta/data.json b/metricbeat/module/postgresql/statement/_meta/data.json index 6350be5ca4a..2ef8bdde79c 100644 --- a/metricbeat/module/postgresql/statement/_meta/data.json +++ b/metricbeat/module/postgresql/statement/_meta/data.json @@ -16,38 +16,48 @@ "id": 10 }, "database": { - "oid": "12407" + "oid": 175251 }, "query": { - "id": "3240664890", - "text": "SELECT pg_sleep(?);", - "calls": "2", - "rows": "2", + "text": "ROLLBACK", + "memory": { + "shared": { + "hit": 0, + "read": 0, + "dirtied": 0, + "written": 0 + }, + "temp": { + "read": 0, + "written": 0 + }, + "local": { + "hit": 0, + "read": 0, + "dirtied": 0, + "written": 0 + } + }, + "id": "961354038", + "rows": 0, "time": { - "total": 120066.497, - "min": 60029.533, - "max": 60036.964, - "mean": 60033.2485, - "stddev": 3.71549999999843 + "min": { + "ms": 0 + }, + "total": { + "ms": 0.02900000000000002 + }, + "stddev": { + "ms": 0.0003768830273792263 + }, + "max": { + "ms": 0.001 + }, + "mean": { + "ms": 0.0008285714285714287 + } }, - "memory": { - "shared": { - "hit": 0, - "read": 0, - "dirtied": 0, - "written": 0, - }, - "local": { - "hit": 0, - "read": 0, - "dirtied": 0, - "written": 0, - }, - "temp": { - "read": 0, - "written": 0, - } - } + "calls": 35 } } } diff --git a/metricbeat/module/postgresql/statement/_meta/fields.yml b/metricbeat/module/postgresql/statement/_meta/fields.yml index 0974349e2ca..f8e315354a4 100644 --- a/metricbeat/module/postgresql/statement/_meta/fields.yml +++ b/metricbeat/module/postgresql/statement/_meta/fields.yml @@ -29,63 +29,63 @@ type: long description: > Total number of rows returned by query. - - name: time.total - type: long + - name: query.time.total.ms + type: float description: > Total number of milliseconds spent running query. - - name: time.min - type: long + - name: query.time.min.ms + type: float description: > Minimum number of milliseconds spent running query. - - name: time.max - type: long + - name: query.time.max.ms + type: float description: > Maximum number of milliseconds spent running query. - - name: time.mean + - name: query.time.mean.ms type: long description: > Mean number of milliseconds spent running query. - - name: time.stddev + - name: query.time.stddev.ms type: long description: > Population standard deviation of time spent running query, in milliseconds. - - name: memory.shared.hit + - name: query.memory.shared.hit type: long description: > Total number of shared block cache hits by the query. - - name: memory.shared.read + - name: query.memory.shared.read type: long description: > Total number of shared block cache read by the query. - - name: memory.shared.dirtied + - name: query.memory.shared.dirtied type: long description: > Total number of shared block cache dirtied by the query. - - name: memory.shared.written + - name: query.memory.shared.written type: long description: > Total number of shared block cache written by the query. - - name: memory.local.hit + - name: query.memory.local.hit type: long description: > Total number of local block cache hits by the query. - - name: memory.local.read + - name: query.memory.local.read type: long description: > Total number of local block cache read by the query. - - name: memory.local.dirtied + - name: query.memory.local.dirtied type: long description: > Total number of local block cache dirtied by the query. - - name: memory.local.written + - name: query.memory.local.written type: long description: > Total number of local block cache written by the query. - - name: memory.temp.read + - name: query.memory.temp.read type: long description: > Total number of temp block cache read by the query. - - name: memory.temp.written + - name: query.memory.temp.written type: long description: > Total number of temp block cache written by the query.