Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395970 )
Change subject: elasticsearch: use the canonical definition of logstash host
......................................................................
elasticsearch: use the canonical definition of logstash host
Bug: T182304
Change-Id: I7f0689a6f808f6a17849303b81900abf1520b834
---
M hieradata/common.yaml
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/codfw/elasticsearch/cirrus.yaml
M hieradata/role/eqiad/elasticsearch/cirrus.yaml
M hieradata/role/eqiad/elasticsearch/relforge.yaml
M modules/profile/manifests/elasticsearch.pp
6 files changed, 5 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/395970/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 4b8594c..099761c 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -517,6 +517,7 @@
# Logging: logstash, udp2log
logstash_host: "logstash.svc.eqiad.wmnet"
logstash_syslog_port: 10514
+logstash_gelf_port: 12201
udp2log_aggregator: "udplog:8420"
tcpircbot_host: 'icinga.wikimedia.org'
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 9930669..31cbe6f 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -144,6 +144,7 @@
"udp2log_aggregator": deployment-fluorine02.deployment-prep.eqiad.wmflabs:8420
"logstash_host": deployment-logstash2.deployment-prep.eqiad.wmflabs
"logstash_syslog_port": 10514
+"logstash_gelf_port": 12201
mediawiki_memcached_servers:
- 10.68.23.25:11211:1 # deployment-memc04
- 10.68.23.49:11211:1 # deployment-memc05
@@ -230,8 +231,6 @@
- deployment-elastic06
- deployment-elastic07
"profile::elasticsearch::cluster_name": beta-search
-"profile::elasticsearch::graylog_hosts":
- - deployment-logstash2.deployment-prep.eqiad.wmflabs
"profile::elasticsearch::reindex_remote_whitelist": ''
profile::elasticsearch::search_shard_count_limit: 1000
# By default elasticsearch sets this to ((# of available_processors * 3) / 2)
+ 1,
diff --git a/hieradata/role/codfw/elasticsearch/cirrus.yaml
b/hieradata/role/codfw/elasticsearch/cirrus.yaml
index ed089c7..7bbd947 100644
--- a/hieradata/role/codfw/elasticsearch/cirrus.yaml
+++ b/hieradata/role/codfw/elasticsearch/cirrus.yaml
@@ -53,9 +53,6 @@
# We should be able to run "OK" with 11 servers.
profile::elasticsearch::recover_after_nodes: 11
-profile::elasticsearch::graylog_hosts:
- - logstash.svc.eqiad.wmnet
-
profile::elasticsearch::certificate_name: 'search.svc.codfw.wmnet'
profile::base::dns_alt_names: 'search.svc.codfw.wmnet'
diff --git a/hieradata/role/eqiad/elasticsearch/cirrus.yaml
b/hieradata/role/eqiad/elasticsearch/cirrus.yaml
index 7592320..eee5704 100644
--- a/hieradata/role/eqiad/elasticsearch/cirrus.yaml
+++ b/hieradata/role/eqiad/elasticsearch/cirrus.yaml
@@ -54,9 +54,6 @@
# We should be able to run "OK" with 24 servers.
profile::elasticsearch::recover_after_nodes: 24
-profile::elasticsearch::graylog_hosts:
- - logstash.svc.eqiad.wmnet
-
profile::elasticsearch::certificate_name: 'search.svc.eqiad.wmnet'
profile::base::dns_alt_names: 'search.svc.eqiad.wmnet'
diff --git a/hieradata/role/eqiad/elasticsearch/relforge.yaml
b/hieradata/role/eqiad/elasticsearch/relforge.yaml
index 39e498d..4ef87a4 100644
--- a/hieradata/role/eqiad/elasticsearch/relforge.yaml
+++ b/hieradata/role/eqiad/elasticsearch/relforge.yaml
@@ -13,9 +13,6 @@
profile::elasticsearch::heap_memory: '30G'
profile::elasticsearch::minimum_master_nodes: 1
-profile::elasticsearch::graylog_hosts:
- - logstash.svc.eqiad.wmnet
-
profile::elasticsearch::certificate_name: 'relforge.svc.eqiad.wmnet'
profile::base::dns_alt_names: 'relforge.svc.eqiad.wmnet'
diff --git a/modules/profile/manifests/elasticsearch.pp
b/modules/profile/manifests/elasticsearch.pp
index 1b816c0..ca99991 100644
--- a/modules/profile/manifests/elasticsearch.pp
+++ b/modules/profile/manifests/elasticsearch.pp
@@ -20,7 +20,8 @@
$minimum_master_nodes =
hiera('profile::elasticsearch::minimum_master_nodes'),
$heap_memory = hiera('profile::elasticsearch::heap_memory'),
$expected_nodes = hiera('profile::elasticsearch::expected_nodes'),
- $graylog_hosts = hiera('profile::elasticsearch::graylog_hosts'),
+ $graylog_hosts = hiera('logstash_host'),
+ $graylog_port = hiera('logstash_gelf_port'),
$rack = hiera('profile::elasticsearch::rack'),
$row = hiera('profile::elasticsearch::row'),
$awareness_attributes =
hiera('profile::elasticsearch::awareness_attributes'),
@@ -106,6 +107,7 @@
expected_nodes => $expected_nodes,
master_eligible => $master_eligible,
graylog_hosts => $graylog_hosts,
+ graylog_port => $graylog_port,
version => 5,
search_shard_count_limit => $search_shard_count_limit,
reindex_remote_whitelist => $reindex_remote_whitelist,
--
To view, visit https://gerrit.wikimedia.org/r/395970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f0689a6f808f6a17849303b81900abf1520b834
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
