summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorK Jonathan Harker <k.jonathan.harker@hpe.com>2016-04-13 12:02:43 -0700
committerK Jonathan Harker <k.jonathan.harker@hpe.com>2016-04-13 12:09:46 -0700
commit3906807caf619c2a04aeea50061358ff28cd132f (patch)
treeaa217d007b728b744fc106c7c45a6d330dab9be4
parent0c7f9c5e482161bff07cb15bf07278eda29b25b7 (diff)
Remove support for Kibana2
The ruby version of Kibana reached its end-of-life in May 2015, remove support for it from this puppet module. Change-Id: I164ab9228e8ac8ada95d1ce2c0ee809cc01c9aa3
Notes
Notes (review): Code-Review+1: Anita Kuno <anteaya@anteaya.info> Code-Review+2: yolanda.robla <yolanda.robla-mota@hpe.com> Code-Review+1: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com> Code-Review+2: Spencer Krum <nibz@spencerkrum.com> Workflow+1: Spencer Krum <nibz@spencerkrum.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 06 May 2016 03:51:58 +0000 Reviewed-on: https://review.openstack.org/305448 Project: openstack-infra/puppet-kibana Branch: refs/heads/master
-rw-r--r--manifests/init.pp5
-rw-r--r--manifests/ruby.pp81
2 files changed, 1 insertions, 85 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index b6136ad..b8532a5 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -21,7 +21,7 @@ class kibana (
21 $js_vhost_aliases = [], 21 $js_vhost_aliases = [],
22 $js_vhost_name = $::fqdn, 22 $js_vhost_name = $::fqdn,
23 $js_vhost_template = 'kibana/dual-elasticsearch.vhost.erb', 23 $js_vhost_template = 'kibana/dual-elasticsearch.vhost.erb',
24 $version = 'ruby', 24 $version = 'js',
25) { 25) {
26 26
27 group { 'kibana': 27 group { 'kibana':
@@ -47,9 +47,6 @@ class kibana (
47 } 47 }
48 48
49 case $version { 49 case $version {
50 'ruby': {
51 include ::kibana::ruby
52 }
53 'js': { 50 'js': {
54 class { '::kibana::js': 51 class { '::kibana::js':
55 vhost_name => $js_vhost_name, 52 vhost_name => $js_vhost_name,
diff --git a/manifests/ruby.pp b/manifests/ruby.pp
deleted file mode 100644
index b7cef76..0000000
--- a/manifests/ruby.pp
+++ /dev/null
@@ -1,81 +0,0 @@
1# Copyright 2015 Hewlett-Packard Development Company, L.P.
2#
3# Licensed under the Apache License, Version 2.0 (the "License"); you may
4# not use this file except in compliance with the License. You may obtain
5# a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
11# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
12# License for the specific language governing permissions and limitations
13# under the License.
14#
15# Class to install kibana frontend to logstash.
16#
17class kibana::ruby (
18 $git_revision = 'v0.2.0',
19) {
20
21 vcsrepo { '/opt/kibana/kibana':
22 ensure => latest,
23 provider => git,
24 source => 'https://github.com/rashidkpc/Kibana2.git',
25 revision => $git_revision,
26 require => File['/opt/kibana'],
27 }
28
29 package { 'bundler':
30 ensure => latest,
31 provider => 'gem',
32 }
33
34 if $::osfamily == 'Debian' {
35 package { 'ruby-dev':
36 ensure => installed,
37 before => Exec['install_kibana'],
38 }
39 package { 'build-essential':
40 ensure => installed,
41 before => Exec['install_kibana'],
42 }
43 }
44
45 exec { 'install_kibana':
46 command => 'bundle install',
47 path => ['/usr/bin', '/usr/local/bin'],
48 cwd => '/opt/kibana/kibana',
49 logoutput => true,
50 refreshonly => true,
51 subscribe => Vcsrepo['/opt/kibana/kibana'],
52 require => [
53 User['kibana'],
54 Package['bundler'],
55 ],
56 }
57
58 file { '/opt/kibana/kibana/KibanaConfig.rb':
59 ensure => present,
60 content => template('kibana/config.rb.erb'),
61 replace => true,
62 owner => 'kibana',
63 group => 'kibana',
64 require => Vcsrepo['/opt/kibana/kibana'],
65 }
66
67 file { '/etc/init/kibana.conf':
68 ensure => present,
69 source => 'puppet:///modules/kibana/kibana.init',
70 }
71
72 service { 'kibana':
73 ensure => running,
74 require => [
75 File['/etc/init/kibana.conf'],
76 File['/opt/kibana/kibana/KibanaConfig.rb'],
77 Exec['install_kibana'],
78 ],
79 }
80
81}