jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395614 )
Change subject: Remove apache dependency from ELK role ...................................................................... Remove apache dependency from ELK role Kibana no longer needs an Apche front, it runs its own web server on port 5601 Change-Id: I77834f8676df4d340cbb2d615cfc1041e2491990 --- M puppet/modules/role/manifests/elk.pp D puppet/modules/role/templates/elk/apache.conf.erb 2 files changed, 2 insertions(+), 56 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/puppet/modules/role/manifests/elk.pp b/puppet/modules/role/manifests/elk.pp index 48825b3..40c8371 100644 --- a/puppet/modules/role/manifests/elk.pp +++ b/puppet/modules/role/manifests/elk.pp @@ -6,6 +6,8 @@ # === Parameters # [*vhost_name*] # vhost_name of Kibana web interface. Default 'logstash.local.wmftest.net'. +# Kibana runs on the default 5601 port. +# To access it, the default is thus to browse to http://logstash.local.wmftest.net:5601/ # class role::elk ( $vhost_name, @@ -17,9 +19,6 @@ include ::logstash include ::logstash::output::elasticsearch include ::kibana - include ::apache::mod::headers - include ::apache::mod::proxy - include ::apache::mod::proxy_http ## Configure Logstash logstash::input::syslog { 'syslog': @@ -68,11 +67,6 @@ unless => template('role/elk/check-logstash-template.erb'), require => Service['elasticsearch'], before => Class['::logstash::output::elasticsearch'], - } - - ## Configure Kibana - apache::site { $vhost_name: - content => template('role/elk/apache.conf.erb'), } ## Configure MediaWiki diff --git a/puppet/modules/role/templates/elk/apache.conf.erb b/puppet/modules/role/templates/elk/apache.conf.erb deleted file mode 100644 index f437372..0000000 --- a/puppet/modules/role/templates/elk/apache.conf.erb +++ /dev/null @@ -1,48 +0,0 @@ -ServerName <%= @vhost_name %> - -DocumentRoot <%= scope['::kibana::deploy_dir'] %>/src - -<Directory /> - Options FollowSymLinks - AllowOverride None - Require all denied -</Directory> - -<Directory /etc/kibana> - Require all granted -</Directory> - -<Directory <%= scope['::kibana::deploy_dir'] %>/src> - Require all granted -</Directory> - -alias /config.js /etc/kibana/config.js - -ProxyRequests Off -<Proxy http://127.0.0.1:9200> - ProxySet connectiontimeout=5 timeout=90 retry=0 -</Proxy> - -Header set Cache-Control "public, must-revalidate, max-age=3600" - -# Elasticsearch searches -<LocationMatch "^/(_search|.*/_search)$"> - ProxyPassMatch http://127.0.0.1:9200/$1 - ProxyPassReverse http://127.0.0.1:9200/$1 - Header set Cache-Control "private, must-revalidate, max-age=0" - Header set Expires "Thu, 01 Jan 1970 00:00:00 GMT" -</LocationMatch> - -# Elasticsearch meta-data requests -<LocationMatch "^/(_nodes|_aliases|.*/_aliases|_mapping|.*/_mapping)$"> - ProxyPassMatch http://127.0.0.1:9200/$1 - ProxyPassReverse http://127.0.0.1:9200/$1 - Header set Cache-Control "public, must-revalidate, max-age=900" -</LocationMatch> - -# Storage/retrieval of saved dashboards via elasticsearch -<LocationMatch "^/(kibana-int/dashboard/|kibana-int/temp)(.*)$"> - ProxyPassMatch http://127.0.0.1:9200/$1$2 - ProxyPassReverse http://127.0.0.1:9200/$1$2 - Header set Cache-Control "public, must-revalidate, max-age=900" -</LocationMatch> -- To view, visit https://gerrit.wikimedia.org/r/395614 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77834f8676df4d340cbb2d615cfc1041e2491990 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/vagrant Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org> Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org> Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
