Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/402787 )
Change subject: logstash: create compound role
......................................................................
logstash: create compound role
Change-Id: I42647a09dc824d6efd86537a105fafed03ffa230
---
R hieradata/role/common/logstash.yaml
D hieradata/role/common/logstash/apifeatureusage.yaml
D hieradata/role/common/logstash/elasticsearch.yaml
R hieradata/role/eqiad/logstash.yaml
M manifests/site.pp
A modules/role/manifests/logstash.pp
6 files changed, 12 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/402787/1
diff --git a/hieradata/role/common/logstash/collector.yaml
b/hieradata/role/common/logstash.yaml
similarity index 94%
rename from hieradata/role/common/logstash/collector.yaml
rename to hieradata/role/common/logstash.yaml
index 0afd970..0f96405 100644
--- a/hieradata/role/common/logstash/collector.yaml
+++ b/hieradata/role/common/logstash.yaml
@@ -1,3 +1,6 @@
+role::logstash::apifeatureusage::elastic_hosts:
+ - search.svc.codfw.wmnet
+ - search.svc.eqiad.wmnet
cluster: logstash
admin::groups:
- logstash-roots
@@ -52,4 +55,3 @@
- cn=ops,ou=groups,dc=wikimedia,dc=org
- cn=nda,ou=groups,dc=wikimedia,dc=org
- cn=wmf,ou=groups,dc=wikimedia,dc=org
-
diff --git a/hieradata/role/common/logstash/apifeatureusage.yaml
b/hieradata/role/common/logstash/apifeatureusage.yaml
deleted file mode 100644
index be0a322..0000000
--- a/hieradata/role/common/logstash/apifeatureusage.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-role::logstash::apifeatureusage::elastic_hosts:
- - search.svc.codfw.wmnet
- - search.svc.eqiad.wmnet
diff --git a/hieradata/role/common/logstash/elasticsearch.yaml
b/hieradata/role/common/logstash/elasticsearch.yaml
deleted file mode 100644
index 932f0ff..0000000
--- a/hieradata/role/common/logstash/elasticsearch.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-# General configs
-cluster: logstash
-admin::groups:
- - logstash-roots
- - elasticsearch-roots
-
-# ES-specific
-# NOTE: cluster_name must be kept in sync with the backend
-# node config in hieradata/role/common/collector.yaml
-elasticsearch::auto_create_index: true
-elasticsearch::cluster_name: production-logstash-eqiad
-elasticsearch::expected_nodes: 3
-elasticsearch::heap_memory: '30G'
-elasticsearch::minimum_master_nodes: 2
-elasticsearch::recover_after_nodes: 2
-elasticsearch::recover_after_time: '1m'
-elasticsearch::unicast_hosts:
- - logstash1004.eqiad.wmnet
- - logstash1005.eqiad.wmnet
- - logstash1006.eqiad.wmnet
-logstash::cluster_hosts:
- - logstash1004.eqiad.wmnet
- - logstash1005.eqiad.wmnet
- - logstash1006.eqiad.wmnet
- - logstash1007.eqiad.wmnet
- - logstash1008.eqiad.wmnet
- - logstash1009.eqiad.wmnet
-elasticsearch::data_dir: '/var/lib/elasticsearch'
diff --git a/hieradata/role/eqiad/kibana.yaml
b/hieradata/role/eqiad/logstash.yaml
similarity index 100%
rename from hieradata/role/eqiad/kibana.yaml
rename to hieradata/role/eqiad/logstash.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 3b4fa25..8c5f1a0 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1267,11 +1267,12 @@
# logstash collectors (Ganeti VM)
node 'logstash1007.eqiad.wmnet' {
- role(logstash::collector, kibana, logstash::apifeatureusage,
logstash::eventlogging)
+ role(logstash)
+ include ::role::logstash::eventlogging
include ::lvs::realserver
}
node /^logstash100[8-9]\.eqiad\.wmnet$/ {
- role(logstash::collector, kibana, logstash::apifeatureusage)
+ role(logstash)
include ::lvs::realserver
}
diff --git a/modules/role/manifests/logstash.pp
b/modules/role/manifests/logstash.pp
new file mode 100644
index 0000000..3e17e07
--- /dev/null
+++ b/modules/role/manifests/logstash.pp
@@ -0,0 +1,6 @@
+class role::logstash {
+ system::role { 'logstash': }
+ include ::role::logstash::collector
+ include ::role::kibana
+ include ::role::logstash::apifeatureusage
+}
--
To view, visit https://gerrit.wikimedia.org/r/402787
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42647a09dc824d6efd86537a105fafed03ffa230
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
