diff --git a/scripts/influx/configure-tick-stack-vm.sh b/scripts/influx/install-clmc-agent.sh similarity index 73% rename from scripts/influx/configure-tick-stack-vm.sh rename to scripts/influx/install-clmc-agent.sh index 433e036f7fb31c073a254fc82d4e87be917de2a4..4a49b802a1271c1d2cd3b603a653ee1345f3fea2 100644 --- a/scripts/influx/configure-tick-stack-vm.sh +++ b/scripts/influx/install-clmc-agent.sh @@ -1,7 +1,7 @@ #!/bin/bash #///////////////////////////////////////////////////////////////////////// #// -#// (c) University of Southampton IT Innovation Centre, 2018 +#// (c) University of Southampton IT Innovation Centre, 2017 #// #// Copyright in this software belongs to University of Southampton #// IT Innovation Centre of Gamma House, Enterprise Road, @@ -18,17 +18,18 @@ #// PURPOSE, except where stated in the Licence Agreement supplied with #// the software. #// -#// Created By : Simon Crowle -#// Created Date : 03/11/2018 +#// Created By : Michael Boniface +#// Created Date : 13/12/2017 #// Created for Project : FLAME #// #///////////////////////////////////////////////////////////////////////// -echo Configuring TICK stack services... +# Install telegraf +wget https://dl.influxdata.com/telegraf/releases/telegraf_1.3.2-1_amd64.deb +dpkg -i telegraf_1.3.2-1_amd64.deb -# Configure Telegraf -systemctl stop telegraf - -cp ./config/telegraf/telegraf.conf /etc/telegraf/ +# Copy configuration +cp $1 /etc/telegraf/telegraf.conf +# Start telegraf systemctl start telegraf \ No newline at end of file diff --git a/scripts/influx/install-tick-stack-vm.sh b/scripts/influx/install-clmc-service.sh similarity index 92% rename from scripts/influx/install-tick-stack-vm.sh rename to scripts/influx/install-clmc-service.sh index 0a490315a4fda915a3746afe390b246e13fd2fb6..98b28580ea72f4bc52abb29ed5c428f4d4507ed1 100644 --- a/scripts/influx/install-tick-stack-vm.sh +++ b/scripts/influx/install-clmc-service.sh @@ -32,10 +32,6 @@ dpkg -i influxdb_1.2.4_amd64.deb wget https://dl.influxdata.com/kapacitor/releases/kapacitor_1.3.1_amd64.deb dpkg -i kapacitor_1.3.1_amd64.deb -# install Telegraf -wget https://dl.influxdata.com/telegraf/releases/telegraf_1.3.2-1_amd64.deb -dpkg -i telegraf_1.3.2-1_amd64.deb - # install Chronograf wget https://dl.influxdata.com/chronograf/releases/chronograf_1.3.3.0_amd64.deb dpkg -i chronograf_1.3.3.0_amd64.deb \ No newline at end of file diff --git a/scripts/influx/install-tick-stack-docker-compose.sh b/scripts/influx/install-tick-stack-docker-compose.sh deleted file mode 100644 index 7acc2906313f3612e82247554878a92af4b71410..0000000000000000000000000000000000000000 --- a/scripts/influx/install-tick-stack-docker-compose.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -#///////////////////////////////////////////////////////////////////////// -#// -#// (c) University of Southampton IT Innovation Centre, 2017 -#// -#// Copyright in this software belongs to University of Southampton -#// IT Innovation Centre of Gamma House, Enterprise Road, -#// Chilworth Science Park, Southampton, SO16 7NS, UK. -#// -#// This software may not be used, sold, licensed, transferred, copied -#// or reproduced in whole or in part in any manner or form or in or -#// on any media by any person other than in accordance with the terms -#// of the Licence Agreement supplied with the software, or otherwise -#// without the prior written consent of the copyright owners. -#// -#// This software is distributed WITHOUT ANY WARRANTY, without even the -#// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -#// PURPOSE, except where stated in the Licence Agreement supplied with -#// the software. -#// -#// Created By : Michael Boniface -#// Created Date : 13/12/2017 -#// Created for Project : FLAME -#// -#///////////////////////////////////////////////////////////////////////// - -# install docker -apt-get -y update -apt-get -y install apt-transport-https ca-certificates curl software-properties-common -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - -add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" -apt-get -y update -apt-get install docker-ce - -# to get a specific version look at the cache and run the install with that version -# apt-cache madison docker-ce -# apt-get install docker-ce=<VERSION> - -# test docker -# docker run hello-world - -# install docker compose -curl -L https://github.com/docker/compose/releases/download/1.17.0/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose -chmod +x /usr/local/bin/docker-compose -# test compose -docker-compose version 1.17.0, build 1719ceb - -# install tick stack -git clone https://github.com/influxdata/TICK-docker.git /opt -cd /opt/TICK-docker/1.3 -docker-compose up -d diff --git a/scripts/influx/start-tick-stack-services.sh b/scripts/influx/start-clmc-service.sh similarity index 91% rename from scripts/influx/start-tick-stack-services.sh rename to scripts/influx/start-clmc-service.sh index 603fc75dbcd974196c91b55fd2de11b4b2a380ee..f92c6b5eaf0c93b5a98585b4aab4182d09e2360e 100644 --- a/scripts/influx/start-tick-stack-services.sh +++ b/scripts/influx/start-clmc-service.sh @@ -28,8 +28,4 @@ echo Starting TICK stack services... systemctl start influxdb systemctl start kapacitor -#systemctl start telegraf -systemctl start chronograf - -# test influx -#curl "http://localhost:8086/query?q=show+databases" \ No newline at end of file +systemctl start chronograf \ No newline at end of file diff --git a/scripts/influx/start-telegraf.sh b/scripts/influx/start-telegraf.sh deleted file mode 100644 index e12bb9ea9d5286e8df029559a2591089ec88c8a4..0000000000000000000000000000000000000000 --- a/scripts/influx/start-telegraf.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -#///////////////////////////////////////////////////////////////////////// -#// -#// (c) University of Southampton IT Innovation Centre, 2018 -#// -#// Copyright in this software belongs to University of Southampton -#// IT Innovation Centre of Gamma House, Enterprise Road, -#// Chilworth Science Park, Southampton, SO16 7NS, UK. -#// -#// This software may not be used, sold, licensed, transferred, copied -#// or reproduced in whole or in part in any manner or form or in or -#// on any media by any person other than in accordance with the terms -#// of the Licence Agreement supplied with the software, or otherwise -#// without the prior written consent of the copyright owners. -#// -#// This software is distributed WITHOUT ANY WARRANTY, without even the -#// implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -#// PURPOSE, except where stated in the Licence Agreement supplied with -#// the software. -#// -#// Created By : Simon Crowle -#// Created Date : 03/11/2018 -#// Created for Project : FLAME -#// -#///////////////////////////////////////////////////////////////////////// - -echo Starting Telegraf services... -systemctl start telegraf \ No newline at end of file diff --git a/scripts/influx/telegraf.conf b/scripts/influx/telegraf_ipendpoint1.conf similarity index 91% rename from scripts/influx/telegraf.conf rename to scripts/influx/telegraf_ipendpoint1.conf index c683737e70a640699d8c23123e86bb9fc4e3501d..7844869d3dff11c749c209facb63b284e4556dbc 100644 --- a/scripts/influx/telegraf.conf +++ b/scripts/influx/telegraf_ipendpoint1.conf @@ -11,9 +11,12 @@ # Global tags can be specified here in key="value" format. [global_tags] - # dc = "us-east-1" # will tag all metrics with dc=us-east-1 - # rack = "1a" - auth = "IT-Inn" + location="DC1" + sfc="MS_Template_1" + sfc_i="MS_I1" + sf="adaptive_streaming" + sf_i="adaptive_streaming_I1" + ipendpoint="adaptive_streaming_I1_ipendpoint1" # Configuration for telegraf agent [agent] @@ -65,7 +68,7 @@ # Multiple urls can be specified but it is assumed that they are part of the same # cluster, this means that only ONE of the urls will be written to each interval. # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example - urls = ["http://localhost:8086"] # required + urls = ["http://192.168.50.10:8086"] # required # The target database for metrics (telegraf will create it if not exists) database = "CLMCMetrics" # required # Precision of writes, valid values are "ns", "us" (or "µs"), "ms", "s", "m", "h". @@ -95,15 +98,6 @@ ############################################################################### # INPUTS # ############################################################################### -# Read metrics about cpu usage -[[inputs.cpu]] - ## Whether to report per-cpu stats or not - percpu = true - ## Whether to report total system cpu stats or not - totalcpu = true - ## If true, collect raw CPU time metrics. - collect_cpu_time = false - # # Influx HTTP write listener [[inputs.http_listener]] ## Address and port to host HTTP listener on diff --git a/scripts/influx/telegraf_ipendpoint2.conf b/scripts/influx/telegraf_ipendpoint2.conf new file mode 100644 index 0000000000000000000000000000000000000000..e0d62af95e5fa42e7462441b263dc295c428b26f --- /dev/null +++ b/scripts/influx/telegraf_ipendpoint2.conf @@ -0,0 +1,116 @@ +# Telegraf configuration + +# Telegraf is entirely plugin driven. All metrics are gathered from the +# declared inputs, and sent to the declared outputs. + +# Plugins must be declared in here to be active. +# To deactivate a plugin, comment out the name and any variables. + +# Use 'telegraf -config telegraf.conf -test' to see what metrics a config +# file would generate. + +# Global tags can be specified here in key="value" format. +[global_tags] + location="DC2" + sfc="MS_Template_1" + sfc_i="MS_I1" + sf="adaptive_streaming" + sf_i="adaptive_streaming_I1" + ipendpoint="adaptive_streaming_I1_ipendpoint2" + +# Configuration for telegraf agent +[agent] + ## Default data collection interval for all inputs + interval = "10s" + ## Rounds collection interval to 'interval' + ## ie, if interval="10s" then always collect on :00, :10, :20, etc. + round_interval = true + + ## Telegraf will cache metric_buffer_limit metrics for each output, and will + ## flush this buffer on a successful write. + metric_buffer_limit = 1000 + ## Flush the buffer whenever full, regardless of flush_interval. + flush_buffer_when_full = true + + ## Collection jitter is used to jitter the collection by a random amount. + ## Each plugin will sleep for a random time within jitter before collecting. + ## This can be used to avoid many plugins querying things like sysfs at the + ## same time, which can have a measurable effect on the system. + collection_jitter = "0s" + + ## Default flushing interval for all outputs. You shouldn't set this below + ## interval. Maximum flush_interval will be flush_interval + flush_jitter + flush_interval = "10s" + ## Jitter the flush interval by a random amount. This is primarily to avoid + ## large write spikes for users running a large number of telegraf instances. + ## ie, a jitter of 5s and interval 10s means flushes will happen every 10-15s + flush_jitter = "0s" + + ## Logging configuration: + ## Run telegraf in debug mode + debug = false + ## Run telegraf in quiet mode + quiet = false + ## Specify the log file name. The empty string means to log to stdout. + logfile = "G:/Telegraf/telegraf.log" + + ## Override default hostname, if empty use os.Hostname() + hostname = "" + + +############################################################################### +# OUTPUTS # +############################################################################### + +# Configuration for influxdb server to send metrics to +[[outputs.influxdb]] + # The full HTTP or UDP endpoint URL for your InfluxDB instance. + # Multiple urls can be specified but it is assumed that they are part of the same + # cluster, this means that only ONE of the urls will be written to each interval. + # urls = ["udp://127.0.0.1:8089"] # UDP endpoint example + urls = ["http://192.168.50.10:8086"] # required + # The target database for metrics (telegraf will create it if not exists) + database = "CLMCMetrics" # required + # Precision of writes, valid values are "ns", "us" (or "µs"), "ms", "s", "m", "h". + # note: using second precision greatly helps InfluxDB compression + precision = "s" + + ## Write timeout (for the InfluxDB client), formatted as a string. + ## If not provided, will default to 5s. 0s means no timeout (not recommended). + timeout = "5s" + # username = "telegraf" + # password = "metricsmetricsmetricsmetrics" + # Set the user agent for HTTP POSTs (can be useful for log differentiation) + # 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" + + +############################################################################### +# INPUTS # +############################################################################### +# # Influx HTTP write listener +[[inputs.http_listener]] + ## Address and port to host HTTP listener on + service_address = ":8186" + + ## timeouts + read_timeout = "10s" + write_timeout = "10s" + + ## HTTPS + #tls_cert= "/etc/telegraf/cert.pem" + #tls_key = "/etc/telegraf/key.pem" + + ## MTLS + #tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"] + \ No newline at end of file diff --git a/src/mediaServiceSim/LineProtocolGenerator.pyc b/src/mediaServiceSim/LineProtocolGenerator.pyc deleted file mode 100644 index 1701c03b9385cc1425c3fa5d41d61ece154e0044..0000000000000000000000000000000000000000 Binary files a/src/mediaServiceSim/LineProtocolGenerator.pyc and /dev/null differ diff --git a/src/mediaServiceSim/__pycache__/LineProtocolGenerator.cpython-35.pyc b/src/mediaServiceSim/__pycache__/LineProtocolGenerator.cpython-35.pyc deleted file mode 100644 index ac11f6a88b988c0bd96dbc026a0b0facd6e6c2b0..0000000000000000000000000000000000000000 Binary files a/src/mediaServiceSim/__pycache__/LineProtocolGenerator.cpython-35.pyc and /dev/null differ diff --git a/src/mediaServiceSim/__pycache__/LineProtocolGenerator.cpython-36.pyc b/src/mediaServiceSim/__pycache__/LineProtocolGenerator.cpython-36.pyc deleted file mode 100644 index b8bb4785ef85f853c379898f7b6b17715734a63b..0000000000000000000000000000000000000000 Binary files a/src/mediaServiceSim/__pycache__/LineProtocolGenerator.cpython-36.pyc and /dev/null differ