Skip to content

Commit

Permalink
[MetricBeat] Add up metric for health status (elastic#15948)
Browse files Browse the repository at this point in the history 
* Add UP metric, useful for instance availability monitoring

(cherry picked from commit 1c32be3)
  • Loading branch information
@premendrasingh
premendrasingh authored and Carlos Pérez-Aradros Herce committed Feb 3, 2020
1 parent a07d70e commit 20880fb
Show file tree
Hide file tree
Showing 9 changed files with 4,345 additions and 4,176 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,8 @@ 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 support for Unix socket in Memcached metricbeat module. {issue}13685[13685] {pull}15822[15822]
- Make the `system/cpu` metricset collect normalized CPU metrics by default. {issue}15618[15618] {pull}15729[15729]
- Add `up` metric to prometheus metrics collected from host {pull}15948[15948]
- Add citadel metricset for Istio Metricbeat module {pull}15990[15990]
- Add support for processors in light modules. {issue}14740[14740] {pull}15923[15923]

*Packetbeat*
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/prometheus/collector/_meta/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"address": "127.0.0.1:55555",
"type": "prometheus"
}
}
}
26 changes: 25 additions & 1 deletion 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,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
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

0 comments on commit 20880fb

Please sign in to comment.