Tidy up of specification example

docs/CLMC monitoring specification for a basic scenario.md

-# CLMC monitoring specification for a basic scenario
+vagr# CLMC monitoring specification for a basic scenario
 
 ## CONFIGURATION: SLICE
 ### Compute node configuration
@@ -6,7 +6,7 @@
 #### Common context
 | measurement | tag |
 | --- | --- | --- |
-| compute_node_config, | slice_id="SLICE1" | 
+| compute_node_config, | slice_id="SLICE1", | 
 
 #### Specific context
 | tag | tag |
@@ -26,7 +26,7 @@ __What is the relevant information ?__
 #### Common context: network
 | measurement | tag |
 | --- | --- | --- |
-| network_config,| slice_id='SLICE1' |
+| network_config,| slice_id='SLICE1', |
 
 #### Specific context: network
 | tag |
@@ -42,12 +42,12 @@ __What is the relevant information ?__
 #### Common context: Network interfaces
 | measurement | tag |
 | --- | --- | --- |
-| network_interface_config,| slice_id='SLICE1' |
+| network_interface_config,| slice_id='SLICE1', |
 
 #### Specific context: Network interfaces
 | tag | tag |
 | --- | --- |
-| comp_node_id='c1', | port_id='enps03', |
+| comp_node_id='c1', | port_id='enps03' |
 
 #### Configurations: Network interfaces
 | field | field | timestamp |
@@ -68,7 +68,7 @@ __What are the SF states ?__
 #### Common context
 | measurement | tag | tag | tag | tag | tag |
 | --- | --- | --- | --- | --- | --- |
-| sf_instance_surrogate_config, | location='DC1', | sfc='Scenario1_Template', | sfc_i='Scenario1_Instance_I1', | sf='MS_STREAMING', | sf_i='MS_STREAMING_1' | 
+| sf_instance_surrogate_config, | location='DC1', | sfc='Scenario1_Template', | sfc_i='Scenario1_Instance_I1', | sf='MS_STREAMING', | sf_i='MS_STREAMING_1', | 
 
 #### Specific context
 | tag | 
@@ -92,7 +92,6 @@ __What are the SF states ?__
 | surrogate_id='MS_STREAM_1_SURROGATE_1' | 
 
 #### Configurations
-
 __QUESTION__: Do we only allow a 1-to-1 mapping between Media Service SF Instances and Surrogates w.r.t. configurations (i.e: I asked for 2 CPUs, I got 2 CPUs). If yes, we could cut some of the fields below.
 
 | field | field | field | field | timestamp |
@@ -101,11 +100,9 @@ __QUESTION__: Do we only allow a 1-to-1 mapping between Media Service SF Instanc
 
 
 ## MONITORING
-#### Common context: Usage and Performance
+### Common context: Usage and Performance
 All of the specific context measurements below carry the following common context (this has not be replicated for brevity) for both usage and performance measurements. In this example, we illustrate using two surrogate VMs.
 
-#TODO: Label as averages
-
 | measurement | tag | tag | tag | tag | tag | tag | tag |
 | --- | --- | --- | --- | --- | --- | --- | --- | --- |
 | \<measurement>, | location='DC1', | comp_node_id='c1', | sfc='Scenario1_Template', | sfc_i='Scenario1_Instance_I1', | sf='MS_STREAMING', | sf_i='MS_STREAMING_1', |  surrogate_id ='MS_STREAM_1_SURROGATE_1' |
@@ -117,33 +114,38 @@ Also NOTE: the metrics provided in the measurements below are effectively a 'sna
 #### Monitoring values: CPU (Telegraf system metrics)
 | measurement | \<common tags> | field | field | timestamp |
 | --- | --- | --- | --- | --- |
-| cpu | \<common tags> | cpu_time_user=40, | cpu_time_idle=5 | 1515583926868000000 |
+| cpu | \<common tags> | avg_cpu_time_user=40, | avg_cpu_time_idle=5 | 1515583926868000000 |
 
 #### Monitoring values: RAM (Telegraf system metrics)
 | measurement | \<common tags> | field | field | timestamp |
 | --- | --- | --- | --- | --- | --- |
-| mem | \<common tags> | free=880, | total=2048, | 1515583926868000000 |
+| mem | \<common tags> | avg_free=880, | total=2048 | 1515583926868000000 |
 
 #### Monitoring values: Storage (Telegraf system metrics)
 | measurement | \<common tags> | field | field | timestamp |
 | --- | --- | --- | --- | --- | --- | --- |
-| vm_host_storage_usage | \<common tags> | disk_free=8144, | swap_size=1576, read_bytes=4194304, | write_bytes=2097152 | 1515583926868000000 |
+| disk | \<common tags> | avg_free=8144, | total=1576 | 1515583926868000000 |
 
 #### Monitoring values: Network (FLIPS network metrics)
-__ Can we measure network usage for a specific VM from FLIPS monitoring? __
+__Can we measure network usage for a specific VM from FLIPS monitoring?__
+__Some metrics from FLIPS contain 'port' label, others not, is this intended?__
+
+| measurement | \<common tags> | field | field | field | field | field | field | timestamp |
+| --- | --- | --- | --- | --- | --- | --- | --- | --- |
+| net_port_io | \<common tags> | avg_packet_drop_rate=0.3, | avg_packet_error_rate=0.1, | rx_bytes_port_m=13567, | rx_packets_m=768, | tx_bytes_port_m=8102, | tx_packets_port_m=356, | 1515583926868000000 |
 
-| measurement | \<common tags> | field | field | timestamp |
-| --- | --- | --- | --- | --- | --- |
-| vm_host_network_usage | \<common tags> | rx_bytes_port_M=5242880, | tx_bytes_port_M=15728640 | packets_dropped=198, | packets_error=5 | 1515583926868000000 |
 
-#### Monitoring values: Surrogates
+### Monitoring values: Surrogate Service
 
 QUESTIONS
 1. Is the content navigation tag and fully qualified domain name (SDN based)? [Most likely: yes]
 
-| measurement | \<common tags> | tag | timestamp |
-| --- | --- | --- | --- | --- | --- | --- |
-| mpegdash_service_mon | \<common tags> | cont_nav='http://netflix.com/scream' | cont_rep='h264' | req_rate=10, | 'avg_resp_time=40, | peak_resp_time=230, | avg_error_rate=0.2, | avg_throughput=200, | \<userProfileField>=\<value> | quality_delivered='5', startup_delay='1200', dropped_segments='2', 1515583926868000000 |
+#### Monitoring values: service demand and response
+| measurement | \<common tags> | tag | tag | field | field | field | field | field | field | field | field | field | timestamp |
+| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
+| mpegdash_service_mon | \<common tags> | cont_nav='http://netflix.com/scream' | cont_rep='h264' | avg_req_rate=10, | avg_resp_time=40, | peak_resp_time=230, | avg_error_rate=0.2, | avg_throughput=200, | \<userProfileField>=\<value> | avg_quality_delivered=5, | avg_startup_delay=1200, | avg_dropped_segments=2 | 1515583926868000000 |
 
-| surrogate_route_mon | ... | location='DC1', cont_nav='http://netflix.com/scream', http_requests_fqdn_rate=386, avg_network_fqdn_latency=50,  |
+| measurement | \<common tags> | tag | field | field | field | time |
+| --- | --- | --- | --- | --- | --- | --- |
+| surrogate_route_mon | \<common tags> | src_location='DC3', | cont_nav='http://netflix.com/scream', | avg_http_requests_fqdn_rate=386, | avg_network_fqdn_latency=50 | 1515583926868000000 |