Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MetricBeat] Add up metric for health status #15948

Merged
merged 14 commits into from
Feb 3, 2020
Merged

[MetricBeat] Add up metric for health status #15948

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e71efc9
Add UP metric, useful for instance availability monitoring
premendrasingh Jan 26, 2020
a14d1d6
Merge remote-tracking branch 'beats_upstream/master' into add_up_metric
premendrasingh Jan 28, 2020
10ff353
Update change log to reflect changes in this PR
premendrasingh Jan 28, 2020
e629005
Remove last commit
premendrasingh Jan 28, 2020
413f2d5
Merge remote-tracking branch 'beats_upstream/master' into add_up_metric
premendrasingh Jan 29, 2020
a9a0db4
Update change log to reflect changes in PR 15948
premendrasingh Jan 30, 2020
77f9518
Applied mage fmt, as requested
premendrasingh Jan 30, 2020
2c393a4
Add instance label to up metric, update test case data files
premendrasingh Jan 31, 2020
6b0754b
Merge remote-tracking branch 'beats_upstream/master' into add_up_metric
premendrasingh Feb 1, 2020
2da0cfd
Merge remote-tracking branch 'beats_upstream/master' into add_up_metric
premendrasingh Feb 1, 2020
572fce3
Regenerated files for cockroachdb-status and ibmmq-status
premendrasingh Feb 1, 2020
9496ef6
Update data.json
exekias Feb 3, 2020
3a576ad
Update data.json
exekias Feb 3, 2020
605d91d
Merge branch 'master' into add_up_metric
Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add `key/value` mode for SQL module. {issue}15770[15770] {pull]15845[15845]
- Add STAN dashboard {pull}15654[15654]
- Add support for Unix socket in Memcached metricbeat module. {issue}13685[13685] {pull}15822[15822]
- Add `up` metric to prometheus metrics collected from host {pull}15948[15948]
- Add support for processors in light modules. {issue}14740[14740] {pull}15923[15923]

*Packetbeat*
Expand Down
6 changes: 2 additions & 4 deletions metricbeat/module/prometheus/collector/_meta/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@
},
"prometheus": {
"labels": {
"job": "prometheus",
"listener_name": "http"
"job": "prometheus"
},
"metrics": {
"net_conntrack_listener_conn_accepted_total": 3,
"net_conntrack_listener_conn_closed_total": 0
"up": 1
}
},
"service": {
Expand Down
26 changes: 25 additions & 1 deletion metricbeat/module/prometheus/collector/_meta/testdata/docs.plain-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,31 @@
},
"prometheus": {
"labels": {
"instance": "127.0.0.1:54322",
"instance": "127.0.0.1:55922",
"job": "prometheus"
},
"metrics": {
"up": 1
}
},
"service": {
"address": "127.0.0.1:55555",
"type": "prometheus"
}
},
{
"event": {
"dataset": "prometheus.collector",
"duration": 115000,
"module": "prometheus"
},
"metricset": {
"name": "collector",
"period": 10000
},
"prometheus": {
"labels": {
"instance": "127.0.0.1:55922",
"job": "prometheus",
"listener_name": "http"
},
Expand Down
202 changes: 113 additions & 89 deletions ...icbeat/module/prometheus/collector/_meta/testdata/etcd-3.3.10-partial.plain-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
},
"prometheus": {
"labels": {
"action": "set",
"instance": "127.0.0.1:54324",
"job": "prometheus"
"instance": "127.0.0.1:55924",
"job": "prometheus",
"version": "go1.10.4"
},
"metrics": {
"etcd_debugging_store_writes_total": 2
"go_info": 1
}
},
"service": {
Expand All @@ -36,75 +36,12 @@
},
"prometheus": {
"labels": {
"instance": "127.0.0.1:54324",
"job": "prometheus"
"instance": "127.0.0.1:55924",
"job": "prometheus",
"server_go_version": "go1.10.4"
},
"metrics": {
"etcd_debugging_mvcc_db_compaction_keys_total": 0,
"etcd_debugging_mvcc_db_total_size_in_bytes": 20480,
"etcd_debugging_mvcc_delete_total": 0,
"etcd_debugging_mvcc_events_total": 0,
"etcd_debugging_mvcc_keys_total": 0,
"etcd_debugging_mvcc_pending_events_total": 0,
"etcd_debugging_mvcc_put_total": 0,
"etcd_debugging_mvcc_range_total": 0,
"etcd_debugging_mvcc_slow_watcher_total": 0,
"etcd_debugging_mvcc_txn_total": 0,
"etcd_debugging_mvcc_watch_stream_total": 0,
"etcd_debugging_mvcc_watcher_total": 0,
"etcd_debugging_server_lease_expired_total": 0,
"etcd_debugging_store_expires_total": 0,
"etcd_debugging_store_watch_requests_total": 0,
"etcd_debugging_store_watchers": 0,
"etcd_grpc_proxy_cache_hits_total": 0,
"etcd_grpc_proxy_cache_keys_total": 0,
"etcd_grpc_proxy_cache_misses_total": 0,
"etcd_grpc_proxy_events_coalescing_total": 0,
"etcd_grpc_proxy_watchers_coalescing_total": 0,
"etcd_mvcc_db_total_size_in_bytes": 20480,
"etcd_mvcc_db_total_size_in_use_in_bytes": 16384,
"etcd_network_client_grpc_received_bytes_total": 0,
"etcd_network_client_grpc_sent_bytes_total": 0,
"etcd_server_has_leader": 1,
"etcd_server_health_failures": 0,
"etcd_server_health_success": 0,
"etcd_server_heartbeat_send_failures_total": 0,
"etcd_server_is_leader": 1,
"etcd_server_leader_changes_seen_total": 1,
"etcd_server_proposals_applied_total": 4,
"etcd_server_proposals_committed_total": 4,
"etcd_server_proposals_failed_total": 0,
"etcd_server_proposals_pending": 0,
"etcd_server_quota_backend_bytes": 2147483648,
"etcd_server_read_indexes_failed_total": 0,
"etcd_server_slow_apply_total": 0,
"etcd_server_slow_read_indexes_total": 0,
"go_goroutines": 76,
"go_memstats_alloc_bytes": 5187216,
"go_memstats_alloc_bytes_total": 5818832,
"go_memstats_buck_hash_sys_bytes": 1444537,
"go_memstats_frees_total": 5341,
"go_memstats_gc_cpu_fraction": 0.06982921260067133,
"go_memstats_gc_sys_bytes": 413696,
"go_memstats_heap_alloc_bytes": 5187216,
"go_memstats_heap_idle_bytes": 811008,
"go_memstats_heap_inuse_bytes": 6660096,
"go_memstats_heap_objects": 27762,
"go_memstats_heap_released_bytes": 0,
"go_memstats_heap_sys_bytes": 7471104,
"go_memstats_last_gc_time_seconds": 1553430281.4931297,
"go_memstats_lookups_total": 55,
"go_memstats_mallocs_total": 33103,
"go_memstats_mcache_inuse_bytes": 6944,
"go_memstats_mcache_sys_bytes": 16384,
"go_memstats_mspan_inuse_bytes": 58520,
"go_memstats_mspan_sys_bytes": 65536,
"go_memstats_next_gc_bytes": 8478800,
"go_memstats_other_sys_bytes": 1289791,
"go_memstats_stack_inuse_bytes": 1114112,
"go_memstats_stack_sys_bytes": 1114112,
"go_memstats_sys_bytes": 11815160,
"go_threads": 13
"etcd_server_go_version": 1
}
},
"service": {
Expand All @@ -124,12 +61,12 @@
},
"prometheus": {
"labels": {
"instance": "127.0.0.1:54324",
"job": "prometheus",
"version": "go1.10.4"
"action": "create",
"instance": "127.0.0.1:55924",
"job": "prometheus"
},
"metrics": {
"go_info": 1
"etcd_debugging_store_writes_total": 1
}
},
"service": {
Expand All @@ -149,12 +86,11 @@
},
"prometheus": {
"labels": {
"action": "getRecursive",
"instance": "127.0.0.1:54324",
"instance": "127.0.0.1:55924",
"job": "prometheus"
},
"metrics": {
"etcd_debugging_store_reads_total": 1
"up": 1
}
},
"service": {
Expand All @@ -174,12 +110,12 @@
},
"prometheus": {
"labels": {
"instance": "127.0.0.1:54324",
"instance": "127.0.0.1:55924",
"job": "prometheus",
"server_go_version": "go1.10.4"
"server_id": "8e9e05c52164694d"
},
"metrics": {
"etcd_server_go_version": 1
"etcd_server_id": 1
}
},
"service": {
Expand All @@ -199,12 +135,12 @@
},
"prometheus": {
"labels": {
"instance": "127.0.0.1:54324",
"job": "prometheus",
"server_id": "8e9e05c52164694d"
"action": "set",
"instance": "127.0.0.1:55924",
"job": "prometheus"
},
"metrics": {
"etcd_server_id": 1
"etcd_debugging_store_writes_total": 2
}
},
"service": {
Expand All @@ -224,7 +160,7 @@
},
"prometheus": {
"labels": {
"instance": "127.0.0.1:54324",
"instance": "127.0.0.1:55924",
"job": "prometheus",
"server_version": "3.3.10"
},
Expand All @@ -249,12 +185,100 @@
},
"prometheus": {
"labels": {
"action": "create",
"instance": "127.0.0.1:54324",
"action": "getRecursive",
"instance": "127.0.0.1:55924",
"job": "prometheus"
},
"metrics": {
"etcd_debugging_store_writes_total": 1
"etcd_debugging_store_reads_total": 1
}
},
"service": {
"address": "127.0.0.1:55555",
"type": "prometheus"
}
},
{
"event": {
"dataset": "prometheus.collector",
"duration": 115000,
"module": "prometheus"
},
"metricset": {
"name": "collector",
"period": 10000
},
"prometheus": {
"labels": {
"instance": "127.0.0.1:55924",
"job": "prometheus"
},
"metrics": {
"etcd_debugging_mvcc_db_compaction_keys_total": 0,
"etcd_debugging_mvcc_db_total_size_in_bytes": 20480,
"etcd_debugging_mvcc_delete_total": 0,
"etcd_debugging_mvcc_events_total": 0,
"etcd_debugging_mvcc_keys_total": 0,
"etcd_debugging_mvcc_pending_events_total": 0,
"etcd_debugging_mvcc_put_total": 0,
"etcd_debugging_mvcc_range_total": 0,
"etcd_debugging_mvcc_slow_watcher_total": 0,
"etcd_debugging_mvcc_txn_total": 0,
"etcd_debugging_mvcc_watch_stream_total": 0,
"etcd_debugging_mvcc_watcher_total": 0,
"etcd_debugging_server_lease_expired_total": 0,
"etcd_debugging_store_expires_total": 0,
"etcd_debugging_store_watch_requests_total": 0,
"etcd_debugging_store_watchers": 0,
"etcd_grpc_proxy_cache_hits_total": 0,
"etcd_grpc_proxy_cache_keys_total": 0,
"etcd_grpc_proxy_cache_misses_total": 0,
"etcd_grpc_proxy_events_coalescing_total": 0,
"etcd_grpc_proxy_watchers_coalescing_total": 0,
"etcd_mvcc_db_total_size_in_bytes": 20480,
"etcd_mvcc_db_total_size_in_use_in_bytes": 16384,
"etcd_network_client_grpc_received_bytes_total": 0,
"etcd_network_client_grpc_sent_bytes_total": 0,
"etcd_server_has_leader": 1,
"etcd_server_health_failures": 0,
"etcd_server_health_success": 0,
"etcd_server_heartbeat_send_failures_total": 0,
"etcd_server_is_leader": 1,
"etcd_server_leader_changes_seen_total": 1,
"etcd_server_proposals_applied_total": 4,
"etcd_server_proposals_committed_total": 4,
"etcd_server_proposals_failed_total": 0,
"etcd_server_proposals_pending": 0,
"etcd_server_quota_backend_bytes": 2147483648,
"etcd_server_read_indexes_failed_total": 0,
"etcd_server_slow_apply_total": 0,
"etcd_server_slow_read_indexes_total": 0,
"go_goroutines": 76,
"go_memstats_alloc_bytes": 5187216,
"go_memstats_alloc_bytes_total": 5818832,
"go_memstats_buck_hash_sys_bytes": 1444537,
"go_memstats_frees_total": 5341,
"go_memstats_gc_cpu_fraction": 0.06982921260067133,
"go_memstats_gc_sys_bytes": 413696,
"go_memstats_heap_alloc_bytes": 5187216,
"go_memstats_heap_idle_bytes": 811008,
"go_memstats_heap_inuse_bytes": 6660096,
"go_memstats_heap_objects": 27762,
"go_memstats_heap_released_bytes": 0,
"go_memstats_heap_sys_bytes": 7471104,
"go_memstats_last_gc_time_seconds": 1553430281.4931297,
"go_memstats_lookups_total": 55,
"go_memstats_mallocs_total": 33103,
"go_memstats_mcache_inuse_bytes": 6944,
"go_memstats_mcache_sys_bytes": 16384,
"go_memstats_mspan_inuse_bytes": 58520,
"go_memstats_mspan_sys_bytes": 65536,
"go_memstats_next_gc_bytes": 8478800,
"go_memstats_other_sys_bytes": 1289791,
"go_memstats_stack_inuse_bytes": 1114112,
"go_memstats_stack_sys_bytes": 1114112,
"go_memstats_sys_bytes": 11815160,
"go_threads": 13
}
},
"service": {
Expand Down
Loading