[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch - statsd plugin isn't used anymore

[Gehel (Code Review)]

Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/342052 )

Change subject: elasticsearch - statsd plugin isn't used anymore
..


elasticsearch - statsd plugin isn't used anymore

metrics are now collected via diamond

Change-Id: I70b9715d7ea638d3645395468a0b8338858d0951
---
M hieradata/labs/deployment-prep/common.yaml
M modules/elasticsearch/manifests/init.pp
M modules/elasticsearch/templates/elasticsearch_2.yml.erb
M modules/elasticsearch/templates/elasticsearch_5.yml.erb
4 files changed, 0 insertions(+), 18 deletions(-)

Approvals:
  jenkins-bot: Verified
  DCausse: Looks good to me, but someone else must approve
  Gehel: Looks good to me, approved



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index c1c1c26..41281f5 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -190,7 +190,6 @@
 "elasticsearch::heap_memory": 4G
 "elasticsearch::recover_after_nodes": 3
 "elasticsearch::bulk_thread_pool_executors": 5
-"elasticsearch::statsd_host": labmon1001.eqiad.wmnet
 "elasticsearch::unicast_hosts":
 - deployment-elastic05
 - deployment-elastic06
diff --git a/modules/elasticsearch/manifests/init.pp 
b/modules/elasticsearch/manifests/init.pp
index 3d95cab..dd7540a 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -56,7 +56,6 @@
 # - $bulk_thread_pool_capacity: queue depth for bulk actions of each node.
 # - $bulk_thread_pool_executors: number of executors for bulk actions on each
 #   node.
-# - $statsd_host: host to send statsd data to
 # - $load_fixed_bitset_filters_eagerly: set to false to disable loading
 #bitsets in memory when opening indices will slowdown queries but can
 #significantly reduce heap usage.
@@ -95,7 +94,6 @@
 $filter_cache_size = '10%',
 $bulk_thread_pool_executors = undef,
 $bulk_thread_pool_capacity = undef,
-$statsd_host = undef,
 $load_fixed_bitset_filters_eagerly = true,
 $graylog_hosts = undef,
 $graylog_port = 12201,
diff --git a/modules/elasticsearch/templates/elasticsearch_2.yml.erb 
b/modules/elasticsearch/templates/elasticsearch_2.yml.erb
index b46bebd..49e7ece 100644
--- a/modules/elasticsearch/templates/elasticsearch_2.yml.erb
+++ b/modules/elasticsearch/templates/elasticsearch_2.yml.erb
@@ -454,13 +454,6 @@
 <% end -%>
 <% end -%>
 
-<% if @statsd_host -%>
-##
-# Statsd plugin configuration
-##
-metrics.statsd.host: <%= @statsd_host %>
-<% end -%>
-
 
 ##
 # Merge Threads
diff --git a/modules/elasticsearch/templates/elasticsearch_5.yml.erb 
b/modules/elasticsearch/templates/elasticsearch_5.yml.erb
index 600ca56..87aea61 100644
--- a/modules/elasticsearch/templates/elasticsearch_5.yml.erb
+++ b/modules/elasticsearch/templates/elasticsearch_5.yml.erb
@@ -417,14 +417,6 @@
 <% end -%>
 <% end -%>
 
-<% if @statsd_host -%>
-##
-# Statsd plugin configuration
-##
-metrics.statsd.host: <%= @statsd_host %>
-<% end -%>
-
-
 
 <% unless @load_fixed_bitset_filters_eagerly -%>
 ##

-- 
To view, visit https://gerrit.wikimedia.org/r/342052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I70b9715d7ea638d3645395468a0b8338858d0951
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: elasticsearch - statsd plugin isn't used anymore

[Gehel (Code Review)]

Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/342052 )

Change subject: elasticsearch - statsd plugin isn't used anymore
..

elasticsearch - statsd plugin isn't used anymore

metrics are now collected via diamond

Change-Id: I70b9715d7ea638d3645395468a0b8338858d0951
---
M modules/elasticsearch/templates/elasticsearch_5.yml.erb
1 file changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/342052/1

diff --git a/modules/elasticsearch/templates/elasticsearch_5.yml.erb 
b/modules/elasticsearch/templates/elasticsearch_5.yml.erb
index 23e84a6..11e4539 100644
--- a/modules/elasticsearch/templates/elasticsearch_5.yml.erb
+++ b/modules/elasticsearch/templates/elasticsearch_5.yml.erb
@@ -417,14 +417,6 @@
 <% end -%>
 <% end -%>
 
-<% if @statsd_host -%>
-##
-# Statsd plugin configuration
-##
-metrics.statsd.host: <%= @statsd_host %>
-<% end -%>
-
-
 
 <% unless @load_fixed_bitset_filters_eagerly -%>
 ##

-- 
To view, visit https://gerrit.wikimedia.org/r/342052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I70b9715d7ea638d3645395468a0b8338858d0951
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits