Gehel has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395565 )
Change subject: logstash: decommission logstash100[1-3]
......................................................................
logstash: decommission logstash100[1-3]
Bug: T175830
Change-Id: I28615bd637dd1811af02b99af5c4d71003736286
---
M conftool-data/node/eqiad.yaml
M hieradata/role/common/logstash/collector.yaml
M hieradata/role/common/logstash/elasticsearch.yaml
M manifests/site.pp
4 files changed, 2 insertions(+), 12 deletions(-)
Approvals:
RobH: Looks good to me, but someone else must approve
jenkins-bot: Verified
Gehel: Looks good to me, approved
diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml
index 593299a..83e79e6 100644
--- a/conftool-data/node/eqiad.yaml
+++ b/conftool-data/node/eqiad.yaml
@@ -299,9 +299,6 @@
wdqs1004.eqiad.wmnet: [wdqs]
wdqs1005.eqiad.wmnet: [wdqs]
logstash:
- logstash1001.eqiad.wmnet: [kibana, logstash, logstash-log4j,
logstash-gelf, logstash-json, logstash-syslog, logstash-udp2log]
- logstash1002.eqiad.wmnet: [kibana, logstash, logstash-log4j,
logstash-gelf, logstash-json, logstash-syslog, logstash-udp2log]
- logstash1003.eqiad.wmnet: [kibana, logstash, logstash-log4j,
logstash-gelf, logstash-json, logstash-syslog, logstash-udp2log]
logstash1007.eqiad.wmnet: [kibana, logstash, logstash-log4j,
logstash-gelf, logstash-json, logstash-syslog, logstash-udp2log]
logstash1008.eqiad.wmnet: [kibana, logstash, logstash-log4j,
logstash-gelf, logstash-json, logstash-syslog, logstash-udp2log]
logstash1009.eqiad.wmnet: [kibana, logstash, logstash-log4j,
logstash-gelf, logstash-json, logstash-syslog, logstash-udp2log]
diff --git a/hieradata/role/common/logstash/collector.yaml
b/hieradata/role/common/logstash/collector.yaml
index c533845..c0717f0 100644
--- a/hieradata/role/common/logstash/collector.yaml
+++ b/hieradata/role/common/logstash/collector.yaml
@@ -33,9 +33,6 @@
logstash::cluster_hosts:
- - logstash1001.eqiad.wmnet
- - logstash1002.eqiad.wmnet
- - logstash1003.eqiad.wmnet
- logstash1004.eqiad.wmnet
- logstash1005.eqiad.wmnet
- logstash1006.eqiad.wmnet
diff --git a/hieradata/role/common/logstash/elasticsearch.yaml
b/hieradata/role/common/logstash/elasticsearch.yaml
index 0f56951..79672b0 100644
--- a/hieradata/role/common/logstash/elasticsearch.yaml
+++ b/hieradata/role/common/logstash/elasticsearch.yaml
@@ -7,7 +7,7 @@
# ES-specific
# NOTE: cluster_name must be kept in sync with the backend
-# node config in hieradata/role/common/logstash.yaml
+# node config in hieradata/role/common/collector.yaml
elasticsearch::auto_create_index: true
elasticsearch::cluster_name: production-logstash-eqiad
elasticsearch::expected_nodes: 3
@@ -20,9 +20,6 @@
- logstash1005.eqiad.wmnet
- logstash1006.eqiad.wmnet
logstash::cluster_hosts:
- - logstash1001.eqiad.wmnet
- - logstash1002.eqiad.wmnet
- - logstash1003.eqiad.wmnet
- logstash1004.eqiad.wmnet
- logstash1005.eqiad.wmnet
- logstash1006.eqiad.wmnet
diff --git a/manifests/site.pp b/manifests/site.pp
index 29233b2..c1e433d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1376,8 +1376,7 @@
}
node /^logstash100[1-3]\.eqiad\.wmnet$/ {
- role(logstash::collector, kibana, logstash::apifeatureusage)
- include ::lvs::realserver
+ role(spare::system)
}
node /^logstash100[4-6]\.eqiad\.wmnet$/ {
--
To view, visit https://gerrit.wikimedia.org/r/395565
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28615bd637dd1811af02b99af5c4d71003736286
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
