Merge lp:~thomnico/charms/precise/elasticsearch/canonical-se into lp:~charmers/charms/precise/elasticsearch/trunk

[Nicolas Thomas]

Updated to use the repo provided by elasticsearch hence upgraded,

Adapted to new CLI/service .. much cleaner IMHO.

[Cory Johns (johnsca)]

Nicolas,

Thanks for your change submission. I do agree that this is much cleaner. However I see an issue with a user upgrading from revision 28 to this revision: since there is no upgrade-charm logic to handle the change in the location of the service, config, and possibly data files, a user attempting to upgrade this charm could end up in a state of conflict. Unfortunately, I can't give my +1 for this change unless an upgrade-charm hook is added to handle this.

Additionally, I believe there is an Ansible-based charm also being reviewed, which would be another route for cleaning up the elasticsearch charm. Please take a look at the discussion on https://bugs.launchpad.net/charms/+bug/822979 regarding the charm at https://code.launchpad.net/~michael.nelson/charms/precise/elasticsearch/trunk to see if you might prefer to use your efforts to help with that.

[Nicolas Thomas (thomnico)]

Writting an upgrade hook should be a breath using pakcages..

I'm more interrested to have a working logstash/elastcisearch/kibana
bundle than anything.

If moving to ansible count me out .. let me know if following that route.

On 09/06/2014 17:46, Cory Johns wrote:
> Nicolas,
>
> Thanks for your change submission. I do agree that this is much cleaner. However I see an issue with a user upgrading from revision 28 to this revision: since there is no upgrade-charm logic to handle the change in the location of the service, config, and possibly data files, a user attempting to upgrade this charm could end up in a state of conflict. Unfortunately, I can't give my +1 for this change unless an upgrade-charm hook is added to handle this.
>
> Additionally, I believe there is an Ansible-based charm also being reviewed, which would be another route for cleaning up the elasticsearch charm. Please take a look at the discussion on https://bugs.launchpad.net/charms/+bug/822979 regarding the charm at https://code.launchpad.net/~michael.nelson/charms/precise/elasticsearch/trunk to see if you might prefer to use your efforts to help with that.
>

--
Best Regards,
Nicolas Thomas Sales Engineer - Canonical
http://insights.ubuntu.com/?p=889
GPG FPR: D592 4185 F099 9031 6590 6292 492F C740 F03A 7EB9

[Whit Morriss (whitmo)]

Nicolas,

The ansible based charm will eventually be the official trusty charm.

WRT to this patch: it looks generally looks good for precise. It does removes the ability to optionally use a cached a copy of the elasticsearch binary (desired for speed of deployment or where network access is limited), so we would need to add that feature back to merge.

review: Disapprove

[Stuart Bishop (stub)]

Removing this from the reviewers queue, as the charm appears to be going in an incompatible direction.

Yes, to be accepted into the charm store it would need update-charm logic to migrate existing installations (assuming there are any working existing installations...).

Please request a fresh review from 'charmers' if you feel this should still be reviewed and landed in the charm-store.

review: Abstain

[Nicolas Thomas (thomnico)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I understood that Ansible is now the direction ... you can then cancel
this..

On 10/09/2014 23:52, José Antonio Rey wrote:
> The proposal to merge
> lp:~thomnico/charms/precise/elasticsearch/canonical-se into
> lp:charms/elasticsearch has been updated.
>
> Status: Needs review => Work in progress
>
> For more details, see:
> https://code.launchpad.net/~thomnico/charms/precise/elasticsearch/canonical-se/+merge/219110
>
>
- --
Best Regards,
Nicolas Thomas - Solution Architect - Canonical
http://insights.ubuntu.com/?p=889
GPG FPR: D592 4185 F099 9031 6590 6292 492F C740 F03A 7EB9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQEcBAEBAgAGBQJUK/Z0AAoJEEkvx0DwOn65lmUIAK/wGv9kTgZzXRW07hxCmqFp
tUzXP4aMUpBVKeEiEGxs+EFiiqZVA/Zykz+/xRKWRAOPm1qgmhG6ndJqQosim7wz
Zs44fmWpvhDvJ+CcpPSXjoJXUW9Ir7kKczr3Hu6QvCa4fnbqqYe19NVbTv8ofhNI
YPqLJAufng0auxfRuXgIgWdVz+0DyCAIrkSpkS5zX0tlns/nMScL9ZT3vfCb3laW
Kni6d/Og8kD6m3s0gjLtpzjy5n33tSjVYqsR0GNojaTLX8mWtBR+Q6urD07yJS4j
rWtt3GetMZo+sNPnnjJ0ncyRhcsWRqeGZWAnRCJnJGlMuZfEKo8nNHF5qNDMh9k=
=FWz6
-----END PGP SIGNATURE-----

Unmerged revisions

29. By Nicolas Thomas on 2014-05-10

move to use the repositories provided by elasticsearch hence upgrade version.
Adapt to the correct filesystem.
TODO test the EC2 autodetect feature.

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-11-04 04:06:00 +0000
+++ hooks/config-changed	2014-05-10 21:52:43 +0000
@@ -6,6 +6,6 @@
 
 if [[ ${ZENMASTERS} != "false" ]]; then
   juju-log "Updating- discovery.zen.ping.unicast.hosts: \"${ZENMASTERS}\""
-  echo "discovery.zen.ping.unicast.hosts: \"${ZENMASTERS}\"" >> /opt/elasticsearch/config/elasticsearch.yml
-  /opt/elasticsearch/bin/service/elasticsearch condrestart
+  echo "discovery.zen.ping.unicast.hosts: \"${ZENMASTERS}\"" >> /etc/elasticsearch/elasticsearch.yml
+  service elasticsearch force-reload
 fi  

=== modified file 'hooks/install'
--- hooks/install	2013-09-29 13:21:22 +0000
+++ hooks/install	2014-05-10 21:52:43 +0000
@@ -5,28 +5,18 @@
 HOME=`dirname $0`
 . $HOME/common.sh
 
-juju-log "Check if we've installed elasticsearch before"
-
-if [ ! -f "/opt/elasticsearch-$VERSION/bin/elasticsearch" ]; then
-	juju-log "Installing OpenJDK"
-	apt-get install -y default-jre-headless wget curl
-
-  juju-log "Downloading elasticsearch"
-
-  # Check if a local copy of the jar exists
-  if [ -f $HOME/../files/charm/elasticsearch-$VERSION.tar.gz ]
-  then
-    juju-log "elasticsearch binary found local,copy to /tmp"
-    install -o root -g root -m 0644 $HOME/../files/charm/elasticsearch-$VERSION.tar.gz /tmp/elasticsearch-$VERSION.tar.gz
-  else
-    # Download and checksum
-    juju-log "elasticsearch wrapper binary not found local ... download"
-    wget -q -O /tmp/elasticsearch-$VERSION.tar.gz "${DOWNLOADURL}/elasticsearch-$VERSION.tar.gz"
-    if [[ $(sha1sum "/tmp/elasticsearch-$VERSION.tar.gz" | cut -d " " -f 1) != ${CHECKSUM} ]]; then
-      juju-log --log-level CRITICAL "Checksum of elasticsearch-$VERSION.tar.gz failed"
-      exit 1
-    fi
-  fi
+juju-log "Setup elasticsearch repository"
+
+wget -O - http://packages.elasticsearch.org/GPG-KEY-elasticsearch | apt-key add -
+
+echo "deb http://packages.elasticsearch.org/elasticsearch/1.0/debian stable main" > /etc/apt/sources.list.d/elasticsearch.list
+
+apt-get update
+
+	juju-log "Installing "
+	apt-get install -y default-jre-headless wget curl elasticsearch
+
+
 
 	juju-log "Installing service wrapper"
   if [ -f $HOME/../files/charm/es-wrapper.tar.gz ]
@@ -42,35 +32,22 @@
       exit 1
     fi
   fi
-  juju-log "untar elasticsearch"
-  cd /opt
-  tar xzvf /tmp/elasticsearch-$VERSION.tar.gz
-  ln -s elasticsearch-$VERSION elasticsearch
-  rm /tmp/elasticsearch-$VERSION.tar.gz
-  juju-log "untar elasticsearch service wrapper"
-  tar xzvf /tmp/es-wrapper.tar.gz
-  rm /tmp/es-wrapper.tar.gz
-  mv *servicewrapper*/service elasticsearch/bin/
-  rm -Rf *servicewrapper*
-
-  cd /opt/elasticsearch
-
-  juju-log "Setup elasticsearch as a service"
-  /opt/elasticsearch/bin/service/elasticsearch install
-
-  juju-log "Update elasticsearch config"
-  sed -i "s/<Path to ElasticSearch Home>/\/opt\/elasticsearch/" bin/service/elasticsearch.conf
-  sed -i "s/set\.default\.ES_HEAP_SIZE=.*/set.default.ES_HEAP_SIZE=${HEAP_SIZE}/" bin/service/elasticsearch.conf
-  sed -i "s/wrapper.app.parameter.1.*/wrapper.app.parameter.1=$BOOTSTRAP_CLASS/" bin/service/elasticsearch.conf
-  sed -i "s/# cluster.name:.*/cluster.name: $CLUSTER_NAME/" config/elasticsearch.yml
+
+
 
   # If Amazon install some magic stuff to allow auto-discovery of other ES nodes.
   if [ ! -z "$ACCESS_KEY" ] && [ ! -z "$SECRET_KEY" ]; then
-    juju-log "Install elasticsearch aws plugin"
-    bin/plugin -install elasticsearch/elasticsearch-cloud-aws/1.4.0 > /dev/null
+      PLUGIN="echo ` /usr/share/elasticsearch/bin/plugin  -l |grep head`"
+      if [ ! -z "$PLUGIN" ]
+	 then
+	 # install elasticsearch head
+       juju-log "Install elasticsearch aws plugin"
+      /usr/share/elasticsearch/bin/plugin -install mobz/elasticsearch-head
+      fi
 
-    juju-log "Update elastisearch config for ec2"
-    cat >> config/elasticsearch.yml << EOF
+      juju-log "Install elasticsearch aws plugin"
+      juju-log "Update elastisearch config for ec2"
+      cat >> config/elasticsearch.yml << EOF
 ################################ EC2 Discovery ################################
 
 cloud:
@@ -82,10 +59,5 @@
 discovery:
   type: ec2
 EOF
-  fi
-
-# install elasticsearch head
-/opt/elasticsearch/bin/plugin -install mobz/elasticsearch-head
-
 
 fi

=== modified file 'hooks/start'
--- hooks/start	2014-01-23 21:09:52 +0000
+++ hooks/start	2014-05-10 21:52:43 +0000
@@ -9,7 +9,8 @@
 
 open-port 9200/tcp
 open-port 9300/tcp
-/opt/elasticsearch/bin/service/elasticsearch start
+service elasticsearch start
+
 
 # load up logstash template. 
 # https://github.com/logstash/logstash/wiki/Elasticsearch-Storage-Optimization

=== modified file 'hooks/stop'
--- hooks/stop	2012-11-11 18:34:00 +0000
+++ hooks/stop	2014-05-10 21:52:43 +0000
@@ -12,4 +12,4 @@
 
 #close-port 9200/tcp
 #close-port 9300/tcp
-/opt/elasticsearch/bin/service/elasticsearch stop
+service elasticsearch stop
\ No newline at end of file

=== modified file 'revision'
--- revision	2013-09-29 13:21:22 +0000
+++ revision	2014-05-10 21:52:43 +0000
@@ -1,1 +1,1 @@
-28
+30