From 92df41c61dfd4261a6c615f8e5c5cf54f79b2774 Mon Sep 17 00:00:00 2001 From: leventov Date: Mon, 7 Nov 2016 19:06:37 -0600 Subject: [PATCH 1/3] Upgrade to server-metrics 0.4.3 --- docs/content/configuration/index.md | 6 ++++-- .../druid/_common/common.runtime.properties | 2 +- examples/conf/druid/_common/common.runtime.properties | 2 +- pom.xml | 8 +------- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/docs/content/configuration/index.md b/docs/content/configuration/index.md index 4a259b1d5500..91c7c51ea4de 100644 --- a/docs/content/configuration/index.md +++ b/docs/content/configuration/index.md @@ -182,9 +182,11 @@ 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.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 ba73feb685fc..a1dd7e95248d 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 641ef03c6151..1b2e8fa7bc08 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 4a53f0ec1326..b2dd151a4981 100644 --- a/pom.xml +++ b/pom.xml @@ -154,13 +154,7 @@ com.metamx server-metrics - 0.2.8 - - - com.metamx - java-util - - + 0.4.3 commons-codec From 693822608f2c7f9d77fd62e0c38bc445d42703a0 Mon Sep 17 00:00:00 2001 From: leventov Date: Tue, 25 Jul 2017 19:03:01 +0300 Subject: [PATCH 2/3] Upgrade to 0.5.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2dd151a4981..10a7ea2c99f3 100644 --- a/pom.xml +++ b/pom.xml @@ -154,7 +154,7 @@ com.metamx server-metrics - 0.4.3 + 0.5.0 commons-codec From f04c129f06683e583b11d73a7ad9c5ae6f128b27 Mon Sep 17 00:00:00 2001 From: leventov Date: Tue, 25 Jul 2017 19:05:55 +0300 Subject: [PATCH 3/3] Add CpuAcctDeltaMonitor description to docs --- docs/content/configuration/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/content/configuration/index.md b/docs/content/configuration/index.md index 91c7c51ea4de..470f4e5a1088 100644 --- a/docs/content/configuration/index.md +++ b/docs/content/configuration/index.md @@ -186,6 +186,7 @@ The following monitors are available: |`io.druid.server.metrics.HistoricalMetricsMonitor`|Reports statistics on Historical nodes.| |`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.|