diff --git a/Vagrantfile b/Vagrantfile index 47524d810802f3645e4d3c754121685030dcf66c..58aab66c906a42dc41851f968184241d3fdc914d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -97,7 +97,8 @@ Vagrant.configure("2") do |config| instance_config.vm.provision :shell, :path => "clmctest/services/#{host["service_name"]}/install.sh", env: {"REPO_ROOT" => "/vagrant"} # CLMC agent install - instance_config.vm.provision :shell, :path => "scripts/clmc-agent/install.sh" + instance_config.vm.provision "file", source: "reporc", destination: "/vagrant/reporc" + instance_config.vm.provision :shell, :path => "scripts/clmc-agent/install.sh", env: {"REPO_ROOT" => "/vagrant"} # CLMC agent service specific input configuration instance_config.vm.provision :shell, inline: <<-SHELL diff --git a/scripts/clmc-agent/build-telegraf.sh b/scripts/clmc-agent/build-telegraf.sh index 4a4ca1b35e822827834263566f6546d3b8b93769..4e071c6d6d9e78e7b07bcc6be9c6b74586dc473f 100644 --- a/scripts/clmc-agent/build-telegraf.sh +++ b/scripts/clmc-agent/build-telegraf.sh @@ -1,17 +1,19 @@ #!/bin/bash # install build prequisites -sudo apt-get install ruby ruby-dev rubygems build-essential rpm -y -sudo gem install --no-ri --no-rdoc fpm +apt-get install ruby ruby-dev rubygems build-essential rpm -y +gem install --no-ri --no-rdoc fpm # install go -wget https://dl.google.com/go/go1.10.2.linux-amd64.tar.gz +wget https://dl.google.com/go/go1.10.2.linux-amd64.tar.gz -O go1.10.2.linux-amd64.tar.gz tar -C /usr/local -xzf go1.10.2.linux-amd64.tar.gz +GORC=~/gorc +GOPATH=~/go # set the environment variables -echo 'PATH=$PATH:/usr/local/go/bin' > /tmp/gorc -echo 'GOPATH=/tmp/go' >> /tmp/gorc -source /tmp/gorc +echo 'PATH=$PATH:/usr/local/go/bin' > ${GORC} +echo 'GOPATH=${GOPATH}' >> ${GORC} +source ${GORC} mkdir $GOPATH @@ -25,11 +27,11 @@ git remote add it-innovation https://github.com/it-innovation/telegraf.git git pull --rebase it-innovation master # build telegraf -chmod 755 ./scripts/*.sh make # build the packages -make package +# chmod 755 ./scripts/*.sh +# make package # git push it-innovation diff --git a/scripts/clmc-agent/install.sh b/scripts/clmc-agent/install.sh index 91bf2504d8ea91f00bf37300a17c54995a311387..335e2722a3b01f385557e694d6b482713831db8f 100755 --- a/scripts/clmc-agent/install.sh +++ b/scripts/clmc-agent/install.sh @@ -29,15 +29,30 @@ set -euo pipefail echo "Installing Telegraf agent" -TELEGRAF_VERSION=1.6.2-1 +TELEGRAF_VERSION=1.7.0~5618bb0-0 TELEGRAF_CHECKSUM=dc24932fa1aef9392582880c077dd2493b9f2c66babd7733a0654540bbb5003b # Install telegraf -wget https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}_amd64.deb 2> /dev/null -sha256sum telegraf_${TELEGRAF_VERSION}_amd64.deb | grep $TELEGRAF_CHECKSUM > /dev/null -if [ $? == 1 ]; then - echo "Telegraf download failed checksum" - exit 1 +## wget https://dl.influxdata.com/telegraf/releases/telegraf_${TELEGRAF_VERSION}_amd64.deb 2> /dev/null + +# load the runtime configuration for the artefact repository +if [ ! -f ${REPO_ROOT}/reporc ]; then + echo "Cannot download FLIPS binaries as reporc file containing artefact repository credentials does not exist within user's home folder" + exit 1 fi -dpkg -i telegraf_${TELEGRAF_VERSION}_amd64.deb +source ${REPO_ROOT}/reporc + +echo "Setting the envrionemtn variables" +echo "USER: ${REPO_USER}" +echo "PASS: ${REPO_PASS}" + +wget --user ${REPO_USER} --password ${REPO_PASS} https://flame-nexus.it-innovation.soton.ac.uk/repository/flame-general/it-innovation/telegraf/${TELEGRAF_VERSION}/telegraf-${TELEGRAF_VERSION}.deb -O telegraf-${TELEGRAF_VERSION}.deb + + +#sha256sum telegraf_${TELEGRAF_VERSION}_amd64.deb | grep $TELEGRAF_CHECKSUM > /dev/null +#if [ $? == 1 ]; then +# echo "Telegraf download failed checksum" +# exit 1 +#fi +dpkg -i telegraf-${TELEGRAF_VERSION}.deb