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

Assert new jvm metrics #6996

Merged
merged 6 commits into from
Jun 26, 2020
Merged

Assert new jvm metrics #6996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b6fc642
Add new jmx metric
AlexandreYang Jun 26, 2020
9f9418e
Fix style
AlexandreYang Jun 26, 2020
2802a81
Use rate for cassandra
AlexandreYang Jun 26, 2020
563a30e
Add new metrics and fix canssandra
AlexandreYang Jun 26, 2020
2795984
Add JMX_E2E_METRICS
AlexandreYang Jun 26, 2020
d5f6495
Fix style
AlexandreYang Jun 26, 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
169 changes: 78 additions & 91 deletions cassandra/tests/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# All rights reserved
# Licensed under a 3-clause BSD style license (see LICENSE)
from datadog_checks.dev import get_docker_hostname, get_here
from datadog_checks.dev.jmx import JMX_E2E_METRICS, JVM_E2E_METRICS

CHECK_NAME = "cassandra"

Expand All @@ -16,94 +17,80 @@
"cassandra.total_blocked_tasks",
"""

CASSANDRA_E2E_METRICS = [
"cassandra.bloom_filter_false_ratio",
"cassandra.bytes_flushed.count",
"cassandra.cas_commit_latency.75th_percentile",
"cassandra.cas_commit_latency.95th_percentile",
"cassandra.cas_commit_latency.one_minute_rate",
"cassandra.cas_prepare_latency.75th_percentile",
"cassandra.cas_prepare_latency.95th_percentile",
"cassandra.cas_prepare_latency.one_minute_rate",
"cassandra.cas_propose_latency.75th_percentile",
"cassandra.cas_propose_latency.95th_percentile",
"cassandra.cas_propose_latency.one_minute_rate",
"cassandra.col_update_time_delta_histogram.75th_percentile",
"cassandra.col_update_time_delta_histogram.95th_percentile",
"cassandra.col_update_time_delta_histogram.min",
"cassandra.compaction_bytes_written.count",
"cassandra.compression_ratio",
"cassandra.currently_blocked_tasks.count",
"cassandra.db.droppable_tombstone_ratio",
"cassandra.dropped.one_minute_rate",
"cassandra.exceptions.count",
"cassandra.key_cache_hit_rate",
"cassandra.latency.75th_percentile",
"cassandra.latency.95th_percentile",
"cassandra.latency.one_minute_rate",
"cassandra.live_disk_space_used.count",
"cassandra.live_ss_table_count",
"cassandra.load.count",
"cassandra.max_partition_size",
"cassandra.max_row_size",
"cassandra.mean_partition_size",
"cassandra.mean_row_size",
"cassandra.net.down_endpoint_count",
"cassandra.net.up_endpoint_count",
"cassandra.pending_compactions",
"cassandra.pending_flushes.count",
"cassandra.pending_tasks",
"cassandra.range_latency.75th_percentile",
"cassandra.range_latency.95th_percentile",
"cassandra.range_latency.one_minute_rate",
"cassandra.read_latency.75th_percentile",
"cassandra.read_latency.95th_percentile",
"cassandra.read_latency.99th_percentile",
"cassandra.read_latency.one_minute_rate",
"cassandra.row_cache_hit.count",
"cassandra.row_cache_hit_out_of_range.count",
"cassandra.row_cache_miss.count",
"cassandra.snapshots_size",
"cassandra.ss_tables_per_read_histogram.75th_percentile",
"cassandra.ss_tables_per_read_histogram.95th_percentile",
"cassandra.tombstone_scanned_histogram.75th_percentile",
"cassandra.tombstone_scanned_histogram.95th_percentile",
"cassandra.total_blocked_tasks.count",
"cassandra.total_commit_log_size",
"cassandra.total_disk_space_used.count",
"cassandra.view_lock_acquire_time.75th_percentile",
"cassandra.view_lock_acquire_time.95th_percentile",
"cassandra.view_lock_acquire_time.one_minute_rate",
"cassandra.view_read_time.75th_percentile",
"cassandra.view_read_time.95th_percentile",
"cassandra.view_read_time.one_minute_rate",
"cassandra.waiting_on_free_memtable_space.75th_percentile",
"cassandra.waiting_on_free_memtable_space.95th_percentile",
"cassandra.write_latency.75th_percentile",
"cassandra.write_latency.95th_percentile",
"cassandra.write_latency.99th_percentile",
"cassandra.write_latency.one_minute_rate",
# JVM Metrics
"jvm.buffer_pool.direct.capacity",
"jvm.buffer_pool.direct.count",
"jvm.buffer_pool.direct.used",
"jvm.buffer_pool.mapped.capacity",
"jvm.buffer_pool.mapped.count",
"jvm.buffer_pool.mapped.used",
"jvm.cpu_load.process",
"jvm.cpu_load.system",
"jvm.gc.eden_size",
"jvm.gc.old_gen_size",
"jvm.gc.survivor_size",
"jvm.heap_memory",
"jvm.heap_memory_committed",
"jvm.heap_memory_init",
"jvm.heap_memory_max",
"jvm.loaded_classes",
"jvm.non_heap_memory",
"jvm.non_heap_memory_committed",
"jvm.non_heap_memory_init",
"jvm.non_heap_memory_max",
"jvm.os.open_file_descriptors",
"jvm.thread_count",
]
# For some reason, those two metrics are not provided by cassandra.
CASSANDRA_JVM_METRICS_NOT_PRESENT = {'jvm.gc.cms.count', 'jvm.gc.parnew.time'}

CASSANDRA_JVM_E2E_METRICS = list(set(JVM_E2E_METRICS) - CASSANDRA_JVM_METRICS_NOT_PRESENT)

CASSANDRA_E2E_METRICS = (
[
"cassandra.bloom_filter_false_ratio",
"cassandra.bytes_flushed.count",
"cassandra.cas_commit_latency.75th_percentile",
"cassandra.cas_commit_latency.95th_percentile",
"cassandra.cas_commit_latency.one_minute_rate",
"cassandra.cas_prepare_latency.75th_percentile",
"cassandra.cas_prepare_latency.95th_percentile",
"cassandra.cas_prepare_latency.one_minute_rate",
"cassandra.cas_propose_latency.75th_percentile",
"cassandra.cas_propose_latency.95th_percentile",
"cassandra.cas_propose_latency.one_minute_rate",
"cassandra.col_update_time_delta_histogram.75th_percentile",
"cassandra.col_update_time_delta_histogram.95th_percentile",
"cassandra.col_update_time_delta_histogram.min",
"cassandra.compaction_bytes_written.count",
"cassandra.compression_ratio",
"cassandra.currently_blocked_tasks.count",
"cassandra.db.droppable_tombstone_ratio",
"cassandra.dropped.one_minute_rate",
"cassandra.exceptions.count",
"cassandra.key_cache_hit_rate",
"cassandra.latency.75th_percentile",
"cassandra.latency.95th_percentile",
"cassandra.latency.one_minute_rate",
"cassandra.live_disk_space_used.count",
"cassandra.live_ss_table_count",
"cassandra.load.count",
"cassandra.max_partition_size",
"cassandra.max_row_size",
"cassandra.mean_partition_size",
"cassandra.mean_row_size",
"cassandra.net.down_endpoint_count",
"cassandra.net.up_endpoint_count",
"cassandra.pending_compactions",
"cassandra.pending_flushes.count",
"cassandra.pending_tasks",
"cassandra.range_latency.75th_percentile",
"cassandra.range_latency.95th_percentile",
"cassandra.range_latency.one_minute_rate",
"cassandra.read_latency.75th_percentile",
"cassandra.read_latency.95th_percentile",
"cassandra.read_latency.99th_percentile",
"cassandra.read_latency.one_minute_rate",
"cassandra.row_cache_hit.count",
"cassandra.row_cache_hit_out_of_range.count",
"cassandra.row_cache_miss.count",
"cassandra.snapshots_size",
"cassandra.ss_tables_per_read_histogram.75th_percentile",
"cassandra.ss_tables_per_read_histogram.95th_percentile",
"cassandra.tombstone_scanned_histogram.75th_percentile",
"cassandra.tombstone_scanned_histogram.95th_percentile",
"cassandra.total_blocked_tasks.count",
"cassandra.total_commit_log_size",
"cassandra.total_disk_space_used.count",
"cassandra.view_lock_acquire_time.75th_percentile",
"cassandra.view_lock_acquire_time.95th_percentile",
"cassandra.view_lock_acquire_time.one_minute_rate",
"cassandra.view_read_time.75th_percentile",
"cassandra.view_read_time.95th_percentile",
"cassandra.view_read_time.one_minute_rate",
"cassandra.waiting_on_free_memtable_space.75th_percentile",
"cassandra.waiting_on_free_memtable_space.95th_percentile",
"cassandra.write_latency.75th_percentile",
"cassandra.write_latency.95th_percentile",
"cassandra.write_latency.99th_percentile",
"cassandra.write_latency.one_minute_rate",
]
+ CASSANDRA_JVM_E2E_METRICS
+ JMX_E2E_METRICS
)
2 changes: 1 addition & 1 deletion cassandra/tests/test_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
@pytest.mark.e2e
def test(dd_agent_check):
instance = {}
aggregator = dd_agent_check(instance)
aggregator = dd_agent_check(instance, rate=True)

for metric in CASSANDRA_E2E_METRICS:
aggregator.assert_metric(metric)
Expand Down
8 changes: 8 additions & 0 deletions datadog_checks_dev/datadog_checks/dev/jmx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
'jvm.cpu_load.system',
'jvm.gc.cms.count',
'jvm.gc.eden_size',
'jvm.gc.metaspace_size',
'jvm.gc.old_gen_size',
'jvm.gc.parnew.time',
'jvm.gc.survivor_size',
Expand All @@ -28,3 +29,10 @@
'jvm.os.open_file_descriptors',
'jvm.thread_count',
]

JMX_E2E_METRICS = [
'jmx.gc.major_collection_count',
'jmx.gc.major_collection_time',
'jmx.gc.minor_collection_count',
'jmx.gc.minor_collection_time',
]
30 changes: 4 additions & 26 deletions hazelcast/tests/metrics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# (C) Datadog, Inc. 2020-present
# All rights reserved
# Licensed under a 3-clause BSD style license (see LICENSE)
METRICS = (
from datadog_checks.dev.jmx import JVM_E2E_METRICS

METRICS = [
'hazelcast.imap.local_backup_count',
'hazelcast.imap.local_backup_entry_count',
'hazelcast.imap.local_backup_entry_memory_cost',
Expand Down Expand Up @@ -223,28 +225,4 @@
'hazelcast.member.used_metadata',
'hazelcast.member.used_native',
'hazelcast.member.write_queue_size',
'jvm.buffer_pool.direct.capacity',
'jvm.buffer_pool.direct.count',
'jvm.buffer_pool.direct.used',
'jvm.buffer_pool.mapped.capacity',
'jvm.buffer_pool.mapped.count',
'jvm.buffer_pool.mapped.used',
'jvm.cpu_load.process',
'jvm.cpu_load.system',
'jvm.gc.cms.count',
'jvm.gc.eden_size',
'jvm.gc.old_gen_size',
'jvm.gc.parnew.time',
'jvm.gc.survivor_size',
'jvm.heap_memory',
'jvm.heap_memory_committed',
'jvm.heap_memory_init',
'jvm.heap_memory_max',
'jvm.loaded_classes',
'jvm.non_heap_memory',
'jvm.non_heap_memory_committed',
'jvm.non_heap_memory_init',
'jvm.non_heap_memory_max',
'jvm.os.open_file_descriptors',
'jvm.thread_count',
)
] + JVM_E2E_METRICS
27 changes: 2 additions & 25 deletions ignite/tests/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,9 @@
# (C) Datadog, Inc. 2020-present
# All rights reserved
# Licensed under Simplified BSD License (see LICENSE)
from datadog_checks.dev.jmx import JVM_E2E_METRICS

GAUGES = [
'jvm.thread_count',
'jvm.gc.survivor_size',
'jvm.heap_memory_committed',
'jvm.non_heap_memory_committed',
'jvm.buffer_pool.direct.count',
'jvm.cpu_load.process',
'jvm.non_heap_memory_max',
'jvm.gc.cms.count',
'jvm.gc.eden_size',
'jvm.heap_memory',
'jvm.buffer_pool.mapped.count',
'jvm.buffer_pool.mapped.capacity',
'jvm.non_heap_memory_init',
'jvm.buffer_pool.direct.capacity',
'jvm.os.open_file_descriptors',
'jvm.loaded_classes',
'jvm.gc.parnew.time',
'jvm.non_heap_memory',
'jvm.buffer_pool.direct.used',
'jvm.buffer_pool.mapped.used',
'jvm.heap_memory_init',
'jvm.gc.old_gen_size',
'jvm.cpu_load.system',
'jvm.heap_memory_max',
'ignite.cache.offheap_miss_percentage',
'ignite.jobs.wait_time.maximum',
'ignite.cache.size',
Expand Down Expand Up @@ -176,7 +153,7 @@
'ignite.jobs.waiting.average',
'ignite.checkpoint.last_copied_on_write_pages',
'ignite.wal.last_rollover',
]
] + JVM_E2E_METRICS

COUNTS = [
"ignite.cache.commits",
Expand Down
55 changes: 20 additions & 35 deletions jboss_wildfly/tests/test_check.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,55 +4,40 @@

import pytest

from datadog_checks.dev.jmx import JVM_E2E_METRICS


@pytest.mark.e2e
def test_e2e(dd_agent_check):
instance = {}
aggregator = dd_agent_check(instance)
metrics = [
'jvm.non_heap_memory_max',
'jboss.jdbc_connections.active',
'jboss.jdbc_connections.count',
'jboss.jdbc_connections.idle',
'jboss.jdbc_connections.request_wait',
'jboss.jdbc_preparedstatementcache.hit',
'jboss.jdbc_preparedstatementcache.miss',
'jboss.jdbc_preparedstatementcache.size',
'jvm.heap_memory_committed',
'jvm.gc.eden_size',
'jboss.jdbc_xacommit.count',
'jboss.jdbc_xarecover.count',
'jboss.jdbc_xarollback.count',
'jboss.transactions.aborted',
'jvm.heap_memory',
'jboss.transactions.resource_rollbacks',
'jboss.jdbc_xacommit.count',
'jvm.loaded_classes',
'jvm.gc.parnew.time',
'jboss.transactions.timed_out',
'jboss.transactions.application_rollbacks',
'jboss.transactions.committed',
'jboss.transactions.count',
'jboss.transactions.heuristics',
'jboss.transactions.nested',
'jboss.undertow_listener.request_count',
'jboss.undertow_listener.error_count',
'jboss.jdbc_connections.count',
'jvm.cpu_load.system',
'jvm.non_heap_memory_init',
'jboss.transactions.inflight',
'jvm.thread_count',
'jvm.os.open_file_descriptors',
'jboss.jdbc_preparedstatementcache.hit',
'jvm.non_heap_memory',
'jboss.transactions.nested',
'jboss.transactions.resource_rollbacks',
'jboss.transactions.system_rollbacks',
'jboss.transactions.timed_out',
'jboss.undertow_listener.bytes_received',
'jboss.jdbc_connections.idle',
'jboss.undertow_listener.processing_time',
'jboss.transactions.application_rollbacks',
'jvm.cpu_load.process',
'jboss.undertow_listener.bytes_sent',
'jboss.jdbc_xarollback.count',
'jboss.transactions.committed',
'jvm.gc.survivor_size',
'jvm.non_heap_memory_committed',
'jboss.jdbc_preparedstatementcache.miss',
'jboss.jdbc_connections.active',
'jboss.transactions.count',
'jvm.heap_memory_init',
'jvm.heap_memory_max',
'jboss.jdbc_connections.request_wait',
'jvm.gc.cms.count',
]
'jboss.undertow_listener.error_count',
'jboss.undertow_listener.processing_time',
'jboss.undertow_listener.request_count',
] + JVM_E2E_METRICS
for metric in metrics:
aggregator.assert_metric(metric)

Expand Down
Loading