BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/216337
Change subject: [WIP] logstash: jessie support and beta cluster cluster
......................................................................
[WIP] logstash: jessie support and beta cluster cluster
* Add a second host to the beta cluster Logstash cluster
* Tweak service rules to work on jessie (sysv init vs systemd)
Bug: T101541
Change-Id: I293f35c07d83c5b0a833bf3a7fbcdf302ad96abf
---
M hieradata/labs/deployment-prep/host/deployment-logstash1.yaml
A hieradata/labs/deployment-prep/host/deployment-logstash2.yaml
M modules/logstash/manifests/init.pp
3 files changed, 23 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/216337/1
diff --git a/hieradata/labs/deployment-prep/host/deployment-logstash1.yaml
b/hieradata/labs/deployment-prep/host/deployment-logstash1.yaml
index 8e74d15..65d7b4d 100644
--- a/hieradata/labs/deployment-prep/host/deployment-logstash1.yaml
+++ b/hieradata/labs/deployment-prep/host/deployment-logstash1.yaml
@@ -3,13 +3,15 @@
# ES-specific
elasticsearch::auto_create_index: true
elasticsearch::cluster_name: labs-logstash-eqiad
-elasticsearch::expected_nodes: 1
+elasticsearch::expected_nodes: 2
elasticsearch::heap_memory: '5G'
elasticsearch::minimum_master_nodes: 1
elasticsearch::multicast_group: 224.2.2.6
elasticsearch::plugins_dir: /srv/deployment/elasticsearch/plugins
elasticsearch::recover_after_nodes: 1
elasticsearch::recover_after_time: '1m'
+elasticsearch::unicast_hosts:
+ - deployment-logstash2.deployment-prep.eqiad.wmflabs
elasticsearch::disable_dynamic: true
# Logstash specific
diff --git a/hieradata/labs/deployment-prep/host/deployment-logstash2.yaml
b/hieradata/labs/deployment-prep/host/deployment-logstash2.yaml
new file mode 100644
index 0000000..ca97f0e
--- /dev/null
+++ b/hieradata/labs/deployment-prep/host/deployment-logstash2.yaml
@@ -0,0 +1,19 @@
+base::remote_syslog::enable: false
+
+# ES-specific
+elasticsearch::auto_create_index: true
+elasticsearch::cluster_name: labs-logstash-eqiad
+elasticsearch::expected_nodes: 1
+elasticsearch::heap_memory: '5G'
+elasticsearch::minimum_master_nodes: 1
+elasticsearch::multicast_group: 224.2.2.6
+elasticsearch::plugins_dir: /srv/deployment/elasticsearch/plugins
+elasticsearch::recover_after_nodes: 1
+elasticsearch::recover_after_time: '1m'
+elasticsearch::unicast_hosts:
+ - deployment-logstash1.deployment-prep.eqiad.wmflabs
+elasticsearch::disable_dynamic: true
+
+# Logstash specific
+logstash::filter_workers: 1
+logstash::heap_memory_mb: 128
diff --git a/modules/logstash/manifests/init.pp
b/modules/logstash/manifests/init.pp
index 97fac486c..165d68f 100644
--- a/modules/logstash/manifests/init.pp
+++ b/modules/logstash/manifests/init.pp
@@ -47,7 +47,7 @@
service { 'logstash':
ensure => running,
- provider => 'debian',
+ provider => 'init',
enable => true,
hasstatus => true,
hasrestart => true,
--
To view, visit https://gerrit.wikimedia.org/r/216337
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I293f35c07d83c5b0a833bf3a7fbcdf302ad96abf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
