From a9f1ac3eb4710832666f26b68c70ff7455624c5b Mon Sep 17 00:00:00 2001
From: MJB <mjb@it-innovation.soton.ac.uk>
Date: Tue, 23 Jan 2018 17:32:23 +0000
Subject: [PATCH] updated template bug #36 and simluation to be consistennt
with the apache logging URL
---
.../influx/telegraf_ipendpoint_template.conf | 34 +++++++++++++++----
src/mediaServiceSim/simulator_v2.py | 4 +--
2 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/scripts/influx/telegraf_ipendpoint_template.conf b/scripts/influx/telegraf_ipendpoint_template.conf
index 9aa2e20..d291028 100644
--- a/scripts/influx/telegraf_ipendpoint_template.conf
+++ b/scripts/influx/telegraf_ipendpoint_template.conf
@@ -12,17 +12,17 @@
# Global tags can be specified here in key="value" format.
[global_tags]
# location of the data centre
- location={{LOCATION}}
+ location="{{LOCATION}}"
# media service template id
- sfc={{SFC_ID}}
+ sfc="{{SFC_ID}}"
# media service instance
- sfc_i={{SFC_ID_INSTANCE}}
+ sfc_i="{{SFC_ID_INSTANCE}}"
# service function type
- sf={{SF_ID}}
+ sf="{{SF_ID}}"
# service function instance id
- sf_i={{SF_ID_INSTANCE}}
+ sf_i="{{SF_ID_INSTANCE}}"
# ipendpoint id aka surrogate instance
- ipendpoint={{IP_ENDPOINT_ID}}
+ ipendpoint="{{IP_ENDPOINT_ID}}"
# Configuration for telegraf agent
[agent]
@@ -119,4 +119,24 @@
## MTLS
#tls_allowed_cacerts = ["/etc/telegraf/clientca.pem"]
-
\ No newline at end of file
+
+# Read Apache status information (mod_status)
+[[inputs.apache]]
+ ## An array of URLs to gather from, must be directed at the machine
+ ## readable version of the mod_status page including the auto query string.
+ ## Default is "http://localhost/server-status?auto".
+ urls = ["http://localhost/server-status?auto"]
+
+ ## Credentials for basic HTTP authentication.
+ # username = "myuser"
+ # password = "mypassword"
+
+ ## Maximum time to receive response.
+ # response_timeout = "5s"
+
+ ## Optional SSL Config
+ # ssl_ca = "/etc/telegraf/ca.pem"
+ # ssl_cert = "/etc/telegraf/cert.pem"
+ # ssl_key = "/etc/telegraf/key.pem"
+ ## Use SSL but skip chain & host verification
+ # insecure_skip_verify = false
\ No newline at end of file
diff --git a/src/mediaServiceSim/simulator_v2.py b/src/mediaServiceSim/simulator_v2.py
index ac8b0c5..0182e75 100644
--- a/src/mediaServiceSim/simulator_v2.py
+++ b/src/mediaServiceSim/simulator_v2.py
@@ -127,7 +127,7 @@ class sim:
peak_response_time = ip_endpoint['request_queue']*request_processing_time/ip_endpoint['cpu']
# mid-range
avg_response_time = (peak_response_time+request_processing_time)/2
- self._sendInfluxData(ip_endpoint['agent_url'], lp.generate_mpegdash_report('https://Netflix.com/scream', ip_endpoint['request_arrival_rate'], avg_response_time, peak_response_time, sim_time))
+ self._sendInfluxData(ip_endpoint['agent_url'], lp.generate_mpegdash_report('http://localhost/server-status?auto', ip_endpoint['request_arrival_rate'], avg_response_time, peak_response_time, sim_time))
# need to calculate this but sent at 5mS for now
network_request_delay = 0.005
@@ -137,7 +137,7 @@ class sim:
e2e_delay = network_request_delay + (avg_response_time/1000) + network_response_delay
- self._sendInfluxData(ip_endpoint['agent_url'], lp.generate_ipendpoint_route('https://Netflix.com/scream', ip_endpoint['request_arrival_rate'], e2e_delay, sim_time))
+ self._sendInfluxData(ip_endpoint['agent_url'], lp.generate_ipendpoint_route('http://localhost/server-status?auto', ip_endpoint['request_arrival_rate'], e2e_delay, sim_time))
# remove requests processed off the queue
ip_endpoint['request_queue'] -= int(requests_processed)
--
GitLab