Updated e2e documentation and network graph images

docs/Measuring-E2E-MS-Performance.md

@@ -69,13 +69,13 @@ The semantics of the row is that a packet traversing the path from SFR-A through
 * Media service measurement - assumption is that we have a measurement for media service response time, containing at least the following information:
 
 | sf_instance (tag) | sfr (tag) | endpoint (tag) | response_time | time |
-| --- | --- | --- | --- |
+| --- | --- | --- | --- | --- |
 | media SF instance ID (FQDN) | SFR that connects the SFI endpoint to the FLAME network | SFI EP identifier | response time for the media service (ms) | timestamp of measurement |
 
 Note that all FLAME service function EPs are expected to contain this and other decision context related data in their global tags, see the [CLMC monitoring documentation](monitoring.md) for further information. Above, the **sf_instance**, **sfr** and **endpoint** tag values identify a unique response time measurement. The response time field value is the time elapsed (measured in milliseconds) for a specific SFI/EP implementation only, and it does not take into account any of the network measurements. An example row would be:
 
 | sf_instance (tag) | sfr (tag) | endpoint (tag) | response_time | time |
-| --- | --- | --- | --- | --- | --- |
+| --- | --- | --- | --- | --- |
 | media-service.ict-flame.eu | SFR-B | server1 | 27 | 1525334761282000 |
 
 The semantics of the row is that the response time for a SFI with an identity of _media-service.ict-flame.eu_ that is implemented by endpoint _server1_ and connected to the FLAME network through service function router *SFR-B* will have an averaged response time of 27 ms.
@@ -250,9 +250,9 @@ The aggregation process provides similar functionality to that of an INFLUX cont
 SELECT mean(delay) as "net_delay" FROM "E2EMetrics"."autogen"."network_delays" WHERE time >= now() - 10s and time < now() GROUP BY path_ID, source_SFR, target_SFR
 ``` 
 
-* Media service response time query - to obtain the response time values of the media service instances and group them by **FQDN**, **sf_instance** and **sfr** identifiers: 
+* Media service response time query - to obtain the response time values of the media service instances and group them by **endpoint**, **sf_instance** and **sfr** identifiers: 
 ```
-SELECT mean(response_time) as "response_time" FROM "E2EMetrics"."autogen"."service_delays" WHERE time >= now() - 10s and time < now() GROUP BY FQDN, sf_instance, sfr
+SELECT mean(response_time) as "response_time" FROM "E2EMetrics"."autogen"."service_delays" WHERE time >= now() - 10s and time < now() GROUP BY endpoint, sf_instance, sfr
 ```
 
 The results of the queries are then matched against each other on the **target** and **sfr** tag values (for *network_delays* and *service_delays* respectively): 
@@ -283,7 +283,7 @@ time                net_delay
 
 ```
 name: service_delays
-tags: FQDN=ms-A.ict-flame.eu, sfr=SFR-B, sf_instance=test-sf-clmc-agent-build_INSTANCE
+tags: endpoint=server1, sfr=SFR-B, sf_instance=ms-A.ict-flame.eu
 time                response_time
 ----                -------------
 1524833145975682287 11
@@ -291,8 +291,8 @@ time                response_time
 
 The E2E aggregation process will merge those rows, because there is a match on network delay target SFR and service delay SFR - namely **SFR-B**.
 
-| path_ID (tag) | source_SFR (tag) | target_SFR (tag) | FQDN (tag) | sf_instance (tag) | delay_forward | delay_reverse | delay_service | time |
+| path_ID (tag) | source_SFR (tag) | target_SFR (tag) | endpoint (tag) | sf_instance (tag) | delay_forward | delay_reverse | delay_service | time |
 | --- | --- | --- | --- | --- | --- | --- | --- | --- |
-| SFR-A---SFR-B | SFR-A | SFR-B | ms-A.ict-flame.eu | test-sf-clmc-agent-build_INSTANCE | 9.2 | 10.3 | 11 | 1524833145975682287 |
+| SFR-A---SFR-B | SFR-A | SFR-B | server1 | ms-A.ict-flame.eu | 9.2 | 10.3 | 11 | 1524833145975682287 |
 
 The resulting row would then be posted back to influx in the **e2e_delays** measurement.
\ No newline at end of file