From 684cfbf889d3696aeeb57957f7a74d504d82824d Mon Sep 17 00:00:00 2001 From: Roman Leventov Date: Wed, 26 Jul 2017 18:56:00 +0300 Subject: [PATCH] Upgrade to server-metrics 0.5.0 (#4480) * Upgrade to server-metrics 0.4.3 * Upgrade to 0.5.0 * Add CpuAcctDeltaMonitor description to docs --- docs/content/configuration/index.md | 7 +++++-- .../druid/_common/common.runtime.properties | 2 +- examples/conf/druid/_common/common.runtime.properties | 2 +- pom.xml | 8 +------- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/content/configuration/index.md b/docs/content/configuration/index.md index bb310ce227a..3d43abca8b8 100644 --- a/docs/content/configuration/index.md +++ b/docs/content/configuration/index.md @@ -188,9 +188,12 @@ The following monitors are available: |Name|Description| |----|-----------| |`io.druid.client.cache.CacheMonitor`|Emits metrics (to logs) about the segment results cache for Historical and Broker nodes. Reports typical cache statistics include hits, misses, rates, and size (bytes and number of entries), as well as timeouts and and errors.| -|`com.metamx.metrics.SysMonitor`|This uses the [SIGAR library](http://www.hyperic.com/products/sigar) to report on various system activities and statuses. Make sure to add the [sigar library jar](https://repository.jboss.org/nexus/content/repositories/thirdparty-uploads/org/hyperic/sigar/1.6.5.132/sigar-1.6.5.132.jar) to your classpath if using this monitor.| +|`com.metamx.metrics.SysMonitor`|This uses the [SIGAR library](http://www.hyperic.com/products/sigar) to report on various system activities and statuses.| |`io.druid.server.metrics.HistoricalMetricsMonitor`|Reports statistics on Historical nodes.| -|`com.metamx.metrics.JvmMonitor`|Reports JVM-related statistics.| +|`com.metamx.metrics.JvmMonitor`|Reports various JVM-related statistics.| +|`com.metamx.metrics.JvmCpuMonitor`|Reports statistics of CPU consumption by the JVM.| +|`com.metamx.metrics.CpuAcctDeltaMonitor`|Reports consumed CPU as per the cpuacct cgroup.| +|`com.metamx.metrics.JvmThreadsMonitor`|Reports Thread statistics in the JVM, like numbers of total, daemon, started, died threads.| |`io.druid.segment.realtime.RealtimeMetricsMonitor`|Reports statistics on Realtime nodes.| |`io.druid.server.metrics.EventReceiverFirehoseMonitor`|Reports how many events have been queued in the EventReceiverFirehose.| |`io.druid.server.metrics.QueryCountStatsMonitor`|Reports how many queries have been successful/failed/interrupted.| diff --git a/examples/conf-quickstart/druid/_common/common.runtime.properties b/examples/conf-quickstart/druid/_common/common.runtime.properties index ba73feb685f..a1dd7e95248 100644 --- a/examples/conf-quickstart/druid/_common/common.runtime.properties +++ b/examples/conf-quickstart/druid/_common/common.runtime.properties @@ -113,6 +113,6 @@ druid.selectors.coordinator.serviceName=druid/coordinator # Monitoring # -druid.monitoring.monitors=["com.metamx.metrics.JvmMonitor"] +druid.monitoring.monitors=["com.metamx.metrics.SysMonitor", "com.metamx.metrics.JvmMonitor", "com.metamx.metrics.JvmCpuMonitor"] druid.emitter=logging druid.emitter.logging.logLevel=info diff --git a/examples/conf/druid/_common/common.runtime.properties b/examples/conf/druid/_common/common.runtime.properties index 641ef03c615..1b2e8fa7bc0 100644 --- a/examples/conf/druid/_common/common.runtime.properties +++ b/examples/conf/druid/_common/common.runtime.properties @@ -112,6 +112,6 @@ druid.selectors.coordinator.serviceName=druid/coordinator # Monitoring # -druid.monitoring.monitors=["com.metamx.metrics.JvmMonitor"] +druid.monitoring.monitors=["com.metamx.metrics.SysMonitor", "com.metamx.metrics.JvmMonitor", "com.metamx.metrics.JvmCpuMonitor"] druid.emitter=logging druid.emitter.logging.logLevel=info diff --git a/pom.xml b/pom.xml index fde1ef36370..4eab80896f8 100644 --- a/pom.xml +++ b/pom.xml @@ -155,13 +155,7 @@ com.metamx server-metrics - 0.2.8 - - - com.metamx - java-util - - + 0.5.0 commons-codec