diff options
| author | Diego <diegolparra@gmail.com> | 2014-07-22 17:25:57 -0300 |
|---|---|---|
| committer | Diego <diegolparra@gmail.com> | 2014-07-22 17:25:57 -0300 |
| commit | 5c2390231bb3cc26438172c0074753423983fab5 (patch) | |
| tree | b6d9c3d20ccc57967ad845f2084c524212aae668 | |
| parent | f1d995350013ff8ba5e4f4f09bcb023fae347610 (diff) | |
| download | Kamon-5c2390231bb3cc26438172c0074753423983fab5.tar.gz Kamon-5c2390231bb3cc26438172c0074753423983fab5.tar.bz2 Kamon-5c2390231bb3cc26438172c0074753423983fab5.zip | |
= kamon-system-metrics: added scale in Memory and Network metrics
| -rw-r--r-- | kamon-system-metrics/src/main/scala/kamon/metrics/MemoryMetrics.scala | 12 | ||||
| -rw-r--r-- | kamon-system-metrics/src/main/scala/kamon/metrics/NetworkMetrics.scala | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kamon-system-metrics/src/main/scala/kamon/metrics/MemoryMetrics.scala b/kamon-system-metrics/src/main/scala/kamon/metrics/MemoryMetrics.scala index 4f6cb1cd..5591fb97 100644 --- a/kamon-system-metrics/src/main/scala/kamon/metrics/MemoryMetrics.scala +++ b/kamon-system-metrics/src/main/scala/kamon/metrics/MemoryMetrics.scala @@ -82,12 +82,12 @@ object MemoryMetrics extends MetricGroupCategory { val swapFreeConfig = settings.getConfig("swap-free") new MemoryMetricRecorder( - Gauge.fromConfig(usedConfig, system)(() ⇒ mem.getUsed), - Gauge.fromConfig(freeConfig, system)(() ⇒ mem.getFree), - Gauge.fromConfig(bufferConfig, system)(() ⇒ swap.getUsed), - Gauge.fromConfig(cacheConfig, system)(() ⇒ swap.getFree), - Gauge.fromConfig(swapUsedConfig, system)(collectBuffer(mem)), - Gauge.fromConfig(swapFreeConfig, system)(collectCache(mem))) + Gauge.fromConfig(usedConfig, system, Scale.Kilo)(() ⇒ mem.getUsed), + Gauge.fromConfig(freeConfig, system, Scale.Kilo)(() ⇒ mem.getFree), + Gauge.fromConfig(bufferConfig, system, Scale.Kilo)(() ⇒ swap.getUsed), + Gauge.fromConfig(cacheConfig, system, Scale.Kilo)(() ⇒ swap.getFree), + Gauge.fromConfig(swapUsedConfig, system, Scale.Kilo)(collectBuffer(mem)), + Gauge.fromConfig(swapFreeConfig, system, Scale.Kilo)(collectCache(mem))) } private def collectBuffer(mem: Mem) = () ⇒ if (mem.getUsed() != mem.getActualUsed()) mem.getActualUsed() else 0L diff --git a/kamon-system-metrics/src/main/scala/kamon/metrics/NetworkMetrics.scala b/kamon-system-metrics/src/main/scala/kamon/metrics/NetworkMetrics.scala index 62fc3fcd..f6230695 100644 --- a/kamon-system-metrics/src/main/scala/kamon/metrics/NetworkMetrics.scala +++ b/kamon-system-metrics/src/main/scala/kamon/metrics/NetworkMetrics.scala @@ -76,8 +76,8 @@ object NetworkMetrics extends MetricGroupCategory { val txErrorsConfig = settings.getConfig("tx-errors") new NetworkMetricRecorder( - Gauge.fromConfig(rxBytesConfig, system)(collect(sigar, interfaces)(net ⇒ net.getRxBytes)), - Gauge.fromConfig(txBytesConfig, system)(collect(sigar, interfaces)(net ⇒ net.getTxBytes)), + Gauge.fromConfig(rxBytesConfig, system, Scale.Kilo)(collect(sigar, interfaces)(net ⇒ net.getRxBytes)), + Gauge.fromConfig(txBytesConfig, system, Scale.Kilo)(collect(sigar, interfaces)(net ⇒ net.getTxBytes)), Gauge.fromConfig(rxErrorsConfig, system)(collect(sigar, interfaces)(net ⇒ net.getRxErrors)), Gauge.fromConfig(txErrorsConfig, system)(collect(sigar, interfaces)(net ⇒ net.getTxErrors))) } |