Elukey has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/390393 )
Change subject: druid: remove com.metamx.metrics.JvmMonitor from default
monitors
......................................................................
druid: remove com.metamx.metrics.JvmMonitor from default monitors
Bug: T177459
Change-Id: I441b84fc619de746acee7d579ecf76b367ede326
---
M hieradata/role/common/druid/analytics/worker.yaml
M hieradata/role/common/druid/public/worker.yaml
M modules/druid/manifests/init.pp
3 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/390393/1
diff --git a/hieradata/role/common/druid/analytics/worker.yaml
b/hieradata/role/common/druid/analytics/worker.yaml
index a0e77b3..59fd334 100644
--- a/hieradata/role/common/druid/analytics/worker.yaml
+++ b/hieradata/role/common/druid/analytics/worker.yaml
@@ -105,7 +105,7 @@
druid.segmentCache.locations:
'[{"path":"/var/lib/druid/segment-cache","maxSize"\:2748779069440}]'
druid.historical.cache.useCache: true
druid.historical.cache.populateCache: true
- druid.monitoring.monitors:
["io.druid.server.metrics.HistoricalMetricsMonitor",
"com.metamx.metrics.JvmMonitor"]
+ druid.monitoring.monitors:
["io.druid.server.metrics.HistoricalMetricsMonitor"]
profile::druid::historical::env:
DRUID_HEAP_OPTS: "-Xmx12g -Xms12g"
DRUID_EXTRA_JVM_OPTS: "-XX:NewSize=6g -XX:MaxNewSize=6g
-XX:MaxDirectMemorySize=32g -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails
-XX:+PrintGCTimeStamps"
diff --git a/hieradata/role/common/druid/public/worker.yaml
b/hieradata/role/common/druid/public/worker.yaml
index 665a0df..fac2bbf 100644
--- a/hieradata/role/common/druid/public/worker.yaml
+++ b/hieradata/role/common/druid/public/worker.yaml
@@ -99,7 +99,7 @@
druid.segmentCache.locations:
'[{"path":"/var/lib/druid/segment-cache","maxSize"\:2748779069440}]'
druid.historical.cache.useCache: true
druid.historical.cache.populateCache: true
- druid.monitoring.monitors:
["io.druid.server.metrics.HistoricalMetricsMonitor",
"com.metamx.metrics.JvmMonitor"]
+ druid.monitoring.monitors:
["io.druid.server.metrics.HistoricalMetricsMonitor"]
profile::druid::historical::env:
DRUID_HEAP_OPTS: "-Xmx12g -Xms12g"
DRUID_EXTRA_JVM_OPTS: "-XX:NewSize=6g -XX:MaxNewSize=6g
-XX:MaxDirectMemorySize=32g -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails
-XX:+PrintGCTimeStamps"
diff --git a/modules/druid/manifests/init.pp b/modules/druid/manifests/init.pp
index ec87e3d..a15d2b3 100644
--- a/modules/druid/manifests/init.pp
+++ b/modules/druid/manifests/init.pp
@@ -134,9 +134,6 @@
# it is present in common.runtime.properties.
# Default: /var/lib/druid/indexing-logs
#
-# [*druid.monitoring.monitors*]
-# Default: ["com.metamx.metrics.JvmMonitor"]
-#
# [*druid.emitter*]
# Default: logging
#
@@ -249,7 +246,6 @@
'druid.startup.logging.logProperties' => true,
'druid.zk.service.host' => 'localhost:2181',
'druid.zk.paths.base' => '/druid',
- 'druid.monitoring.monitors' =>
['com.metamx.metrics.JvmMonitor'],
'druid.emitter' => 'logging',
'druid.emitter.logging.logLevel' => 'info',
}
--
To view, visit https://gerrit.wikimedia.org/r/390393
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I441b84fc619de746acee7d579ecf76b367ede326
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
