Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/244248
Change subject: Add statsd param to hadoop jmxtrans classes
......................................................................
Add statsd param to hadoop jmxtrans classes
Bug: T90642
Change-Id: I279d9958871e741cc87671aed5e5956303545ae7
---
M manifests/hadoop/jmxtrans/datanode.pp
M manifests/hadoop/jmxtrans/master.pp
M manifests/hadoop/jmxtrans/namenode.pp
M manifests/hadoop/jmxtrans/nodemanager.pp
M manifests/hadoop/jmxtrans/resourcemanager.pp
M manifests/hadoop/jmxtrans/worker.pp
6 files changed, 34 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/cdh
refs/changes/48/244248/1
diff --git a/manifests/hadoop/jmxtrans/datanode.pp
b/manifests/hadoop/jmxtrans/datanode.pp
index 7b4ce86..f69704e 100644
--- a/manifests/hadoop/jmxtrans/datanode.pp
+++ b/manifests/hadoop/jmxtrans/datanode.pp
@@ -8,6 +8,7 @@
# $jmx_port - DataNode JMX port. Default: 9981
# $ganglia - Ganglia host:port
# $graphite - Graphite host:port
+# $statsd - statsd host:port
# $outfile - outfile to which Kafka stats will be written.
# $objects - objects parameter to pass to jmxtrans::metrics. Only use
# this if you need to override the default ones that this
@@ -22,6 +23,7 @@
$jmx_port = $cdh::hadoop::defaults::datanode_jmxremote_port,
$ganglia = undef,
$graphite = undef,
+ $statsd = undef,
$outfile = undef,
$objects = undef,
) inherits cdh::hadoop::defaults
@@ -36,6 +38,7 @@
outfile => $outfile,
ganglia => $ganglia,
graphite => $graphite,
+ statsd => $statsd,
}
@@ -170,6 +173,8 @@
ganglia_group_name => $group_name,
graphite => $graphite,
graphite_root_prefix => $group_name,
+ statsd => $statsd,
+ statsd_root_prefix => $group_name,
objects => $datanode_objects,
}
}
diff --git a/manifests/hadoop/jmxtrans/master.pp
b/manifests/hadoop/jmxtrans/master.pp
index 64d2447..7b70ddb 100644
--- a/manifests/hadoop/jmxtrans/master.pp
+++ b/manifests/hadoop/jmxtrans/master.pp
@@ -3,6 +3,7 @@
class cdh::hadoop::jmxtrans::master(
$ganglia = undef,
$graphite = undef,
+ $statsd = undef,
$outfile = undef,
)
{
@@ -10,5 +11,6 @@
ganglia => $ganglia,
graphite => $graphite,
outfile => $outfile,
+ statsd => $statsd,
}
}
\ No newline at end of file
diff --git a/manifests/hadoop/jmxtrans/namenode.pp
b/manifests/hadoop/jmxtrans/namenode.pp
index f667f57..3b2d29d 100644
--- a/manifests/hadoop/jmxtrans/namenode.pp
+++ b/manifests/hadoop/jmxtrans/namenode.pp
@@ -8,6 +8,7 @@
# $jmx_port - NameNode JMX port. Default: 9980
# $ganglia - Ganglia host:port
# $graphite - Graphite host:port
+# $statsd - statsd host:port
# $outfile - outfile to which Kafka stats will be written.
# $objects - objects parameter to pass to jmxtrans::metrics. Only use
# this if you need to override the default ones that this
@@ -22,6 +23,7 @@
$jmx_port = $cdh::hadoop::defaults::namenode_jmxremote_port,
$ganglia = undef,
$graphite = undef,
+ $statsd = undef,
$outfile = undef,
$objects = undef,
) inherits cdh::hadoop::defaults
@@ -31,11 +33,12 @@
# query for metrics from Hadoop NameNode's JVM
jmxtrans::metrics::jvm { 'hadoop-hdfs-namenode':
- jmx => $jmx,
- group_prefix => "${group_name}.",
- outfile => $outfile,
- ganglia => $ganglia,
- graphite => $graphite,
+ jmx => $jmx,
+ group_prefix => "${group_name}.",
+ outfile => $outfile,
+ ganglia => $ganglia,
+ graphite => $graphite,
+ statsd => $statsd,
}
$namenode_objects = $objects ? {
@@ -205,6 +208,8 @@
ganglia_group_name => $group_name,
graphite => $graphite,
graphite_root_prefix => $group_name,
+ statsd => $statsd,
+ statsd_root_prefix => $group_name,
objects => $namenode_objects,
}
}
diff --git a/manifests/hadoop/jmxtrans/nodemanager.pp
b/manifests/hadoop/jmxtrans/nodemanager.pp
index 81b30ac..6d9b914 100644
--- a/manifests/hadoop/jmxtrans/nodemanager.pp
+++ b/manifests/hadoop/jmxtrans/nodemanager.pp
@@ -8,6 +8,7 @@
# $jmx_port - NodeManager JMX port. Default: 9983
# $ganglia - Ganglia host:port
# $graphite - Graphite host:port
+# $statsd - statsd host:port
# $outfile - outfile to which Kafka stats will be written.
# $objects - objects parameter to pass to jmxtrans::metrics. Only use
# this if you need to override the default ones that this
@@ -22,6 +23,7 @@
$jmx_port = $cdh::hadoop::defaults::nodemanager_jmxremote_port,
$ganglia = undef,
$graphite = undef,
+ $statsd = undef,
$outfile = undef,
$objects = undef,
) inherits cdh::hadoop::defaults
@@ -36,6 +38,7 @@
outfile => $outfile,
ganglia => $ganglia,
graphite => $graphite,
+ statsd => $statsd,
}
@@ -161,6 +164,8 @@
ganglia_group_name => $group_name,
graphite => $graphite,
graphite_root_prefix => $group_name,
+ statsd => $statsd,
+ statsd_root_prefix => $group_name,
objects => $nodemanager_objects,
}
}
diff --git a/manifests/hadoop/jmxtrans/resourcemanager.pp
b/manifests/hadoop/jmxtrans/resourcemanager.pp
index 1d6f3ba..4768efa 100644
--- a/manifests/hadoop/jmxtrans/resourcemanager.pp
+++ b/manifests/hadoop/jmxtrans/resourcemanager.pp
@@ -8,6 +8,7 @@
# $jmx_port - ResourceManager JMX port. Default: 9983
# $ganglia - Ganglia host:port
# $graphite - Graphite host:port
+# $statsd - statsd host:port
# $outfile - outfile to which Kafka stats will be written.
# $objects - objects parameter to pass to jmxtrans::metrics. Only use
# this if you need to override the default ones that this
@@ -22,6 +23,7 @@
$jmx_port = $cdh::hadoop::defaults::resourcemanager_jmxremote_port,
$ganglia = undef,
$graphite = undef,
+ $statsd = undef,
$outfile = undef,
$objects = undef,
) inherits cdh::hadoop::defaults
@@ -31,11 +33,12 @@
# query for metrics from Hadoop ResourceManager's JVM
jmxtrans::metrics::jvm { 'hadoop-hdfs-resourcemanager':
- jmx => $jmx,
- group_prefix => "${group_name}.",
- outfile => $outfile,
- ganglia => $ganglia,
- graphite => $graphite,
+ jmx => $jmx,
+ group_prefix => "${group_name}.",
+ outfile => $outfile,
+ ganglia => $ganglia,
+ graphite => $graphite,
+ statsd => $statsd,
}
@@ -368,6 +371,8 @@
ganglia_group_name => $group_name,
graphite => $graphite,
graphite_root_prefix => $group_name,
+ statsd => $statsd,
+ statsd_root_prefix => $group_name,
objects => $resourcemanager_objects,
}
}
diff --git a/manifests/hadoop/jmxtrans/worker.pp
b/manifests/hadoop/jmxtrans/worker.pp
index 04d305f..5b2ab18 100644
--- a/manifests/hadoop/jmxtrans/worker.pp
+++ b/manifests/hadoop/jmxtrans/worker.pp
@@ -3,12 +3,14 @@
class cdh::hadoop::jmxtrans::worker(
$ganglia = undef,
$graphite = undef,
+ $statsd = undef,
$outfile = undef,
)
{
class { ['cdh::hadoop::jmxtrans::datanode',
'cdh::hadoop::jmxtrans::nodemanager']:
ganglia => $ganglia,
graphite => $graphite,
+ statsd => $statsd,
outfile => $outfile,
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/244248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I279d9958871e741cc87671aed5e5956303545ae7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
