From ca0137c326f1903386ce72c98ba74f53c4779435 Mon Sep 17 00:00:00 2001
From: Rowan Powell <rp17@it-innovation.soton.ac.uk>
Date: Tue, 30 Jan 2018 13:05:29 +0000
Subject: [PATCH] Removed telegraf outputting to log file
---
Vagrantfile | 51 ++++++++++++++++++-
.../influx/telegraf_ipendpoint_template.conf | 9 ----
2 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/Vagrantfile b/Vagrantfile
index add5135..7e6c3e1 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -46,6 +46,28 @@ ipendpoints = {
:ipendpoint_id => "adaptive_streaming_I1_ipendpoint2",
:influxdb_url => "http://192.168.50.10:8086",
:database_name => "CLMCMetrics"
+ },
+ "NGINXEndpoint" => {
+ :ip_address => "192.168.50.13",
+ :location => "DC2",
+ :sfc_id => "MS_Template_1",
+ :sfc_id_instance => "MS_I1",
+ :sf_id => "NGINX",
+ :sf_id_instance => "NGINX_I1",
+ :ipendpoint_id => "NGINX_I1_NGINXEndpoint",
+ :influxdb_url => "http://192.168.50.10:8086",
+ :database_name => "CLMCMetrics"
+ },
+ "MONGOEndpoint" => {
+ :ip_address => "192.168.50.14",
+ :location => "DC2",
+ :sfc_id => "MS_Template_1",
+ :sfc_id_instance => "MS_I1",
+ :sf_id => "MONGO",
+ :sf_id_instance => "MONGO_I1",
+ :ipendpoint_id => "MONGO_I1_MONGOEndpoint",
+ :influxdb_url => "http://192.168.50.10:8086",
+ :database_name => "CLMCMetrics"
}
}
@@ -76,7 +98,7 @@ Vagrant.configure("2") do |config|
# start the CLMC service
config.vm.provision :shell, :path => 'scripts/influx/start-clmc-service.sh'
end
-
+ # Apache Server 1
config.vm.define "ipendpoint1" do |my|
config.vm.network :private_network, ip: "#{ipendpoints['ipendpoint1'][:ip_address]}", virtualbox__intnet: "clmc-net"
@@ -94,7 +116,7 @@ Vagrant.configure("2") do |config|
# Install CLMC agent 1
config.vm.provision :shell, :path => 'scripts/influx/install-clmc-agent.sh', :args => "/vagrant/scripts/influx/telegraf_ipendpoint_template.conf #{ipendpoints['ipendpoint1'][:location]} #{ipendpoints['ipendpoint1'][:sfc_id]} #{ipendpoints['ipendpoint1'][:sfc_id_instance]} #{ipendpoints['ipendpoint1'][:sf_id]} #{ipendpoints['ipendpoint1'][:sf_id_instance]} #{ipendpoints['ipendpoint1'][:ipendpoint_id]} #{ipendpoints['ipendpoint1'][:influxdb_url]} #{ipendpoints['ipendpoint1'][:database_name]}"
end
-
+ # Apache Server 2
config.vm.define "ipendpoint2" do |my|
config.vm.network :private_network, ip: "#{ipendpoints['ipendpoint2'][:ip_address]}", virtualbox__intnet: "clmc-net"
@@ -113,4 +135,29 @@ Vagrant.configure("2") do |config|
# Install CLMC agent
config.vm.provision :shell, :path => 'scripts/influx/install-clmc-agent.sh', :args => "/vagrant/scripts/influx/telegraf_ipendpoint_template.conf #{ipendpoints['ipendpoint2'][:location]} #{ipendpoints['ipendpoint2'][:sfc_id]} #{ipendpoints['ipendpoint2'][:sfc_id_instance]} #{ipendpoints['ipendpoint2'][:sf_id]} #{ipendpoints['ipendpoint2'][:sf_id_instance]} #{ipendpoints['ipendpoint2'][:ipendpoint_id]} #{ipendpoints['ipendpoint2'][:influxdb_url]} #{ipendpoints['ipendpoint2'][:database_name]}"
end
+
+ # NGINX VM
+
+ config.vm.define "NGINX_Service" do |my|
+
+ config.vm.network :private_network, ip: "#{ipendpoints['NGINXEndpoint'][:ip_address]}", virtualbox__intnet: "clmc-net"
+
+ my.vm.provider "virtualbox" do |v|
+ v.customize ["modifyvm", :id, "--memory", 512]
+ v.customize ["modifyvm", :id, "--cpus", 1]
+ end
+
+ # open apache port
+ config.vm.network "forwarded_port", guest: 80, host: 8081
+
+ # install the apache service
+ config.vm.provision :shell, :path => 'scripts/apache/install-nginx.sh'
+
+ # Install CLMC agent
+ config.vm.provision :shell, :path => 'scripts/influx/install-clmc-agent.sh', :args => "/vagrant/scripts/influx/telegraf_ipendpoint_template.conf #{ipendpoints['NGINXEndpoint'][:location]} #{ipendpoints['ipendpoint2'][:sfc_id]} #{ipendpoints['NGINXEndpoint'][:sfc_id_instance]} #{ipendpoints['NGINXEndpoint'][:sf_id]} #{ipendpoints['NGINXEndpoint'][:sf_id_instance]} #{ipendpoints['NGINXEndpoint'][:ipendpoint_id]} #{ipendpoints['NGINXEndpoint'][:influxdb_url]} #{ipendpoints['NGINXEndpoint'][:database_name]}"
+ end
+
+ # MONGODB VM
+
+
end
diff --git a/scripts/influx/telegraf_ipendpoint_template.conf b/scripts/influx/telegraf_ipendpoint_template.conf
index d291028..99f3349 100644
--- a/scripts/influx/telegraf_ipendpoint_template.conf
+++ b/scripts/influx/telegraf_ipendpoint_template.conf
@@ -90,15 +90,6 @@
# user_agent = "telegraf"
# Set UDP payload size, defaults to InfluxDB UDP Client default (512 bytes)
# udp_payload = 512
-[[outputs.file]]
- ## Files to write to, "stdout" is a specially handled file.
- files = ["stdout", "/tmp/metrics.out"]
-
- ## Data format to output.
- ## Each data format has its own unique set of configuration options, read
- ## more about them here:
- ## https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md
- data_format = "influx"
###############################################################################
--
GitLab