From b16a2c03b479d446d7da5452f60f582bd3fd8d81 Mon Sep 17 00:00:00 2001 From: Andrew Morin Date: Mon, 1 Feb 2016 08:51:22 -0500 Subject: [PATCH] Changes for Compendium: * Update ES version to 1.6.2 * Add KOPF plugin * Add mounted backups folder * Add path.repo to backups folder * Point to new Vagrant box that contains the updates --- .gitignore | 4 ++++ Vagrantfile | 4 +++- backups/README.md | 1 + conf/elasticsearch.yml.erb | 2 ++ lib/upgrade.sh | 3 ++- 5 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 backups/README.md diff --git a/.gitignore b/.gitignore index a268d1f..94f89ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ .vagrant/ conf/* logs/ +backups/index +backups/indices +backups/metadata* +backups/snapshot* \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile index 9479f4a..4b86af1 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -16,8 +16,10 @@ Vagrant.configure("2") do |config| cluster_ram = utils.get_cluster_info 'cluster_ram' cluster_ram = cluster_ram.to_i - config.vm.box = 'ypereirareis/debian-elasticsearch-amd64' + config.vm.box = 'cpdm-vagrant-es' + config.vm.box_url = "http://cnsr/downloads/images/cpdm-vagrant-es.box" config.vm.synced_folder ".", "/vagrant", :id => "vagrant-root", :mount_options => ['dmode=777', 'fmode=777'] + config.vm.synced_folder "./backups", "/mnt/backups/elasticsearch", :mount_options => ['dmode=777', 'fmode=777'] config.vm.provider 'virtualbox' do |vbox| vbox.customize ['modifyvm', :id, '--memory', cluster_ram] diff --git a/backups/README.md b/backups/README.md new file mode 100644 index 0000000..b8b953e --- /dev/null +++ b/backups/README.md @@ -0,0 +1 @@ +Backup storage folder, mounted by VMs diff --git a/conf/elasticsearch.yml.erb b/conf/elasticsearch.yml.erb index 6fd0774..e332175 100644 --- a/conf/elasticsearch.yml.erb +++ b/conf/elasticsearch.yml.erb @@ -379,3 +379,5 @@ http.port: 9200 marvel.agent.enabled: <%= @node_marvel_enabled %> marvel.agent.exporter.es.hosts: ["<%= @cluster_ip.strip % 11 %>:9200"] +path.repo: ["/mnt/backups/elasticsearch"] + diff --git a/lib/upgrade.sh b/lib/upgrade.sh index 6401136..794926a 100644 --- a/lib/upgrade.sh +++ b/lib/upgrade.sh @@ -1,5 +1,5 @@ # Setting ES version to install -ES_VERSION="elasticsearch-1.4.3" +ES_VERSION="elasticsearch-1.6.2" ES_PLUGIN_INSTALL_CMD="elasticsearch/bin/plugin -install" # Removing all previous potentially installed version @@ -29,3 +29,4 @@ ${ES_PLUGIN_INSTALL_CMD} karmi/elasticsearch-paramedic ${ES_PLUGIN_INSTALL_CMD} lukas-vlcek/bigdesk/2.5.0 ${ES_PLUGIN_INSTALL_CMD} elasticsearch/marvel/latest ${ES_PLUGIN_INSTALL_CMD} royrusso/elasticsearch-HQ +${ES_PLUGIN_INSTALL_CMD} lmenezes/elasticsearch-kopf/1.0 \ No newline at end of file