Skip to content

Commit

Permalink
Fix test
Browse files Browse the repository at this point in the history
  • Loading branch information
Carlos Pérez-Aradros Herce committed Mar 24, 2020
1 parent f4470cf commit fff3faf
Show file tree
Hide file tree
Showing 4 changed files with 267 additions and 262 deletions.
7 changes: 6 additions & 1 deletion x-pack/metricbeat/module/prometheus/collector/_meta/testdata/config.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
type: http
url: "/metrics"
suffix: plain
omit_documented_fields_check: ["prometheus.labels.*"] # this are not mapped by this module but the oss one
omit_documented_fields_check:
# these are not mapped by this module but the oss one
- prometheus.labels.*
# histogram values & counts are not mapped (it's part of the type data)
- '*.histogram.values'
- '*.histogram.counts'
remove_fields_from_comparison: ["prometheus.labels.instance"]
module:
use_types: true
Expand Down
44 changes: 22 additions & 22 deletions x-pack/metricbeat/module/prometheus/collector/_meta/testdata/docs.plain-expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
},
"prometheus": {
"labels": {
"device": "br-0cb306323b90",
"instance": "127.0.0.1:38401",
"device": "br-210476dc4ef8",
"instance": "127.0.0.1:41313",
"job": "prometheus"
},
"node_network_carrier": {
Expand All @@ -36,8 +36,8 @@
},
"prometheus": {
"labels": {
"device": "br-210476dc4ef8",
"instance": "127.0.0.1:38401",
"device": "br-0cb306323b90",
"instance": "127.0.0.1:41313",
"job": "prometheus"
},
"node_network_carrier": {
Expand All @@ -61,11 +61,12 @@
},
"prometheus": {
"labels": {
"instance": "127.0.0.1:38401",
"device": "br-10229e3512d9",
"instance": "127.0.0.1:41313",
"job": "prometheus"
},
"up": {
"value": 1
"node_network_carrier": {
"value": 0
}
},
"service": {
Expand All @@ -85,8 +86,8 @@
},
"prometheus": {
"labels": {
"device": "br-3a285aa5e58c",
"instance": "127.0.0.1:38401",
"device": "br-33d819d5f834",
"instance": "127.0.0.1:41313",
"job": "prometheus"
},
"node_network_carrier": {
Expand All @@ -110,12 +111,11 @@
},
"prometheus": {
"labels": {
"device": "br-33d819d5f834",
"instance": "127.0.0.1:38401",
"instance": "127.0.0.1:41313",
"job": "prometheus"
},
"node_network_carrier": {
"value": 0
"up": {
"value": 1
}
},
"service": {
Expand All @@ -135,8 +135,8 @@
},
"prometheus": {
"labels": {
"device": "br-4e623477470e",
"instance": "127.0.0.1:38401",
"device": "br-38425a39f36b",
"instance": "127.0.0.1:41313",
"job": "prometheus"
},
"node_network_carrier": {
Expand All @@ -160,8 +160,8 @@
},
"prometheus": {
"labels": {
"device": "br-10229e3512d9",
"instance": "127.0.0.1:38401",
"device": "br-3a285aa5e58c",
"instance": "127.0.0.1:41313",
"job": "prometheus"
},
"node_network_carrier": {
Expand All @@ -186,7 +186,7 @@
"prometheus": {
"labels": {
"device": "br-38feb0aad6ab",
"instance": "127.0.0.1:38401",
"instance": "127.0.0.1:41313",
"job": "prometheus"
},
"node_network_carrier": {
Expand All @@ -210,8 +210,8 @@
},
"prometheus": {
"labels": {
"device": "br-425cb4c454a6",
"instance": "127.0.0.1:38401",
"device": "br-4e623477470e",
"instance": "127.0.0.1:41313",
"job": "prometheus"
},
"node_network_carrier": {
Expand All @@ -235,8 +235,8 @@
},
"prometheus": {
"labels": {
"device": "br-38425a39f36b",
"instance": "127.0.0.1:38401",
"device": "br-425cb4c454a6",
"instance": "127.0.0.1:41313",
"job": "prometheus"
},
"node_network_carrier": {
Expand Down
98 changes: 49 additions & 49 deletions ...icbeat/module/prometheus/collector/_meta/testdata/metrics-with-naninf.plain-expected.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,13 @@
"period": 10000
},
"prometheus": {
"go_gc_duration_seconds_count": {
"counter": 13118,
"rate": 0
},
"go_gc_duration_seconds_sum": {
"counter": 3.451780079,
"rate": 0
},
"http_request_duration_seconds": {
"histogram": {
"counts": [
0,
0,
0,
0,
0
],
"values": [
0.5,
1.5,
2.5,
4,
7
]
}
"go_gc_duration_seconds": {
"value": 0.000098154
},
"labels": {
"instance": "127.0.0.1:37675",
"job": "prometheus"
"instance": "127.0.0.1:42061",
"job": "prometheus",
"quantile": "0.75"
}
},
"service": {
Expand All @@ -57,12 +35,13 @@
"period": 10000
},
"prometheus": {
"labels": {
"instance": "127.0.0.1:37675",
"job": "prometheus"
"go_gc_duration_seconds": {
"value": 0.011689149
},
"up": {
"value": 1
"labels": {
"instance": "127.0.0.1:42061",
"job": "prometheus",
"quantile": "1"
}
},
"service": {
Expand All @@ -81,13 +60,12 @@
"period": 10000
},
"prometheus": {
"kafka_consumer_records_lag_records": {
"value": 5
},
"labels": {
"client_id": "consumer4",
"instance": "127.0.0.1:37675",
"instance": "127.0.0.1:42061",
"job": "prometheus"
},
"up": {
"value": 1
}
},
"service": {
Expand All @@ -106,13 +84,35 @@
"period": 10000
},
"prometheus": {
"go_gc_duration_seconds": {
"value": 0.011689149
"go_gc_duration_seconds_count": {
"counter": 13118,
"rate": 0
},
"go_gc_duration_seconds_sum": {
"counter": 3.451780079,
"rate": 0
},
"http_request_duration_seconds": {
"histogram": {
"counts": [
0,
0,
0,
0,
0
],
"values": [
0.5,
1.5,
2.5,
4,
7
]
}
},
"labels": {
"instance": "127.0.0.1:37675",
"job": "prometheus",
"quantile": "1"
"instance": "127.0.0.1:42061",
"job": "prometheus"
}
},
"service": {
Expand All @@ -131,13 +131,13 @@
"period": 10000
},
"prometheus": {
"go_gc_duration_seconds": {
"value": 0.000098154
"kafka_consumer_records_lag_records": {
"value": 5
},
"labels": {
"instance": "127.0.0.1:37675",
"job": "prometheus",
"quantile": "0.75"
"client_id": "consumer4",
"instance": "127.0.0.1:42061",
"job": "prometheus"
}
},
"service": {
Expand All @@ -161,7 +161,7 @@
"rate": 0
},
"labels": {
"instance": "127.0.0.1:37675",
"instance": "127.0.0.1:42061",
"job": "prometheus",
"method": "GET"
}
Expand All @@ -183,7 +183,7 @@
},
"prometheus": {
"labels": {
"instance": "127.0.0.1:37675",
"instance": "127.0.0.1:42061",
"job": "prometheus",
"listener_name": "http"
},
Expand Down
Loading

0 comments on commit fff3faf

Please sign in to comment.