From c9a2df1d178d2f5cf8bde7e8ab4b9443e66774dd Mon Sep 17 00:00:00 2001
From: Nikolay Stanchev <ns17@it-innovation.soton.ac.uk>
Date: Mon, 3 Sep 2018 12:18:06 +0100
Subject: [PATCH] Updates global tags to include namespace
---
docs/AlertsSpecification.md | 42 +++++++++----------
docs/clmc-information-model.md | 28 ++++++-------
docs/clmc-service.md | 32 +++++++-------
docs/dashboards.md | 4 +-
docs/monitoring.md | 42 +++++++++----------
scripts/clmc-agent/telegraf.conf | 14 +++----
.../alertsapi/alerts_specification_schema.py | 2 +-
src/service/clmcservice/alertsapi/views.py | 8 ++--
src/service/clmcservice/graphapi/conftest.py | 6 +--
src/service/clmcservice/graphapi/tests.py | 14 +++----
src/service/clmcservice/graphapi/utilities.py | 8 ++--
src/service/clmcservice/graphapi/views.py | 4 +-
.../invalid/alerts_test_config-1.yaml | 14 +++----
.../invalid/alerts_test_config-10.yaml | 14 +++----
.../invalid/alerts_test_config-2.yaml | 8 ++--
.../invalid/alerts_test_config-3.yaml | 6 +--
.../invalid/alerts_test_config-4.yaml | 6 +--
.../invalid/alerts_test_config-5.yaml | 6 +--
.../invalid/alerts_test_config-6.yaml | 10 ++---
.../invalid/alerts_test_config-7.yaml | 10 ++---
.../invalid/alerts_test_config-8.yaml | 18 ++++----
.../invalid/alerts_test_config-9.yaml | 8 ++--
.../valid/alerts_test_config-1.yaml | 8 ++--
.../valid/alerts_test_config-2.yaml | 12 +++---
.../valid/alerts_test_config-3.yaml | 8 ++--
.../valid/alerts_test_config-4.yaml | 6 +--
.../valid/alerts_test_config-5.yaml | 8 ++--
.../invalid/alerts_test_config-1.yaml | 8 ++--
.../invalid/alerts_test_config-2.yaml | 8 ++--
.../invalid/alerts_test_config-3.yaml | 10 ++---
.../invalid/alerts_test_config-4.yaml | 8 ++--
.../valid/alerts_test_config-1.yaml | 24 +++++------
.../valid/alerts_test_config-2.yaml | 2 +-
.../valid/alerts_test_config-4.yaml | 12 +++---
.../clmctest/alerts/alerts_test_config.yaml | 28 +++++++------
src/test/clmctest/dashboards/dc_dash.json | 6 +--
src/test/clmctest/dashboards/minio_dash.json | 28 ++++++-------
src/test/clmctest/dashboards/nginx_dash.json | 32 +++++++-------
src/test/clmctest/dashboards/sf_dash.json | 20 ++++-----
.../clmctest/inputs/test_telegraf_agents.py | 2 +-
.../clmctest/monitoring/test_simresults.py | 36 ++++++++--------
41 files changed, 286 insertions(+), 284 deletions(-)
diff --git a/docs/AlertsSpecification.md b/docs/AlertsSpecification.md
index a2ea4c8..e4e1cc7 100644
--- a/docs/AlertsSpecification.md
+++ b/docs/AlertsSpecification.md
@@ -73,7 +73,7 @@ topology_template:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
+ flame_location: watershed
comparison_operator: gt
action:
implementation:
@@ -94,8 +94,8 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
+ flame_sfp: storage
+ flame_sf: storage-users
location: watershed
comparison_operator: lt
action:
@@ -116,12 +116,12 @@ topology_template:
threshold: 100 # requests have increased by at least 100
granularity: 120
resource_type:
- sfc: companyA-VR
- sfci: companyA-VR-premium
- sfp: storage
- sf: storage-users
- server: watershed
- location: watershed
+ flame_sfc: companyA-VR
+ flame_sfci: companyA-VR-premium
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_server: watershed
+ flame_location: watershed
comparison_operator: gte
action:
implementation:
@@ -136,9 +136,9 @@ topology_template:
threshold: -100 # requests have decreased by at least 100
granularity: 120
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lte
action:
implementation:
@@ -157,7 +157,7 @@ topology_template:
threshold: 0 # if requests are less than or equal to 0 (in other words, no measurements are reported)
granularity: 60 # check for for missing data for the last 60 seconds
resource_type:
- sfp: storage
+ flame_sfp: storage
action:
implementation:
- http://sfemc.flame.eu/notify
@@ -239,9 +239,9 @@ the format is still the same for consistency. Therefore, using `<measurement>.*`
the event_type is set to **threshold**.
* **resource_type** - provides context for the given event - key-value pairs for the global tags of the CLMC Information Model.
-This includes any of the following: `"sfc", "sfci", "sfp", "sf", "sfe", "server", "location"`. Keep in mind that
-filtering for **sfc** and **sfci** is automatically generated by extracting the metadata values from the alerts specification.
-For more information on the global tags, please check the [documentation](monitoring.md).
+This includes any of the following: `"flame_sfc", "flame_sfci", "flame_sfp", "flame_sf", "flame_sfe", "flame_server", "flame_location"`.
+Keep in mind that filtering for **sfc** and **sfci** is automatically generated by extracting the metadata values from the alerts specification.
+For more information on the global tags, please check the [documentation](monitoring.md).
* **comparison_operator** - the logical operator to use for comparison - lt (less than), gt (greater than), lte (less than or equal to), etc.
@@ -264,7 +264,7 @@ result of the comparison operation is true, an alert is triggered. For example:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
+ flame_location: watershed
comparison_operator: gt
action:
implementation:
@@ -307,9 +307,9 @@ threshold. If the result of the comparison operation is true, an alert is trigge
threshold: -100
granularity: 120
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lte
action:
implementation:
@@ -342,7 +342,7 @@ For example:
threshold: 0
granularity: 60
resource_type:
- sfp: storage
+ flame_sfp: storage
action:
implementation:
- http://sfemc.flame.eu/notify
diff --git a/docs/clmc-information-model.md b/docs/clmc-information-model.md
index 18f772e..a579b8c 100644
--- a/docs/clmc-information-model.md
+++ b/docs/clmc-information-model.md
@@ -254,13 +254,13 @@ The measurement model considers three monitoring views on an endpoint with field
All of the measurements on a endpoint share a common context that includes tag values:
-* sfc – an orchestration template (a.k.a. Service Function Chain)
-* sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
-* sfp – the package a service function is using (a.k.a. Service Function Package)
-* sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
-* sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
-* server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
-* location – the location of the server - physical machine that hosts the cluster VM
+* flame_sfc – an orchestration template (a.k.a. Service Function Chain)
+* flame_sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
+* flame_sfp – the package a service function is using (a.k.a. Service Function Package)
+* flame_sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
+* flame_sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
+* flame_server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
+* flame_location – the location of the server - physical machine that hosts the cluster VM
By including this context with service, network and host measurements it is possible to support range of temporal queries associated with SFC’s. By adopting the same convention for identifiers it is possible to combine measurements across service, network and host to create new series that allows exploration of different aspects of the VM instance, including cross-layer queries.
@@ -368,13 +368,13 @@ ipendpoint measurements measure the configuration, usage and performance of VM/C
Common tags
-* sfc – an orchestration template (a.k.a. Service Function Chain)
-* sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
-* sfp – the package a service function is using (a.k.a. Service Function Package)
-* sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
-* sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
-* server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
-* location – the location of the server - physical machine that hosts the cluster VM
+* flame_sfc – an orchestration template (a.k.a. Service Function Chain)
+* flame_sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
+* flame_sfp – the package a service function is using (a.k.a. Service Function Package)
+* flame_sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
+* flame_sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
+* flame_server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
+* flame_location – the location of the server - physical machine that hosts the cluster VM
**endpoint_config**
diff --git a/docs/clmc-service.md b/docs/clmc-service.md
index 48e9c44..7b1cc1d 100644
--- a/docs/clmc-service.md
+++ b/docs/clmc-service.md
@@ -165,13 +165,13 @@ configuration files of the service can be found in the **src/service** folder.
These parameters are then filled in the following influx query template:
```
- SELECT {0} AS mean_response_time, {1} AS mean_request_size, {2} AS mean_response_size FROM "{3}"."{4}".{5} WHERE sfc=\'{6}\' and sfci=\'{7}\' and time>={8} and time<{9} GROUP BY sfe, location, sf
+ SELECT {0} AS mean_response_time, {1} AS mean_request_size, {2} AS mean_response_size FROM "{3}"."{4}".{5} WHERE "flame_sfc"=\'{6}\' and "flame_sfci"=\'{7}\' and time>={8} and time<{9} GROUP BY "flame_sfe", "flame_location", "flame_sf"
```
E.g. for the minio service function, the following query will be used to retrieve the data from influx (request url is */graph/build?from=1528385420&to=1528385860*):
```
- SELECT mean(sum)/mean(count) AS mean_response_time, mean(request_size)/mean(count) AS mean_request_size, mean(response_size)/mean(count) AS mean_response_size FROM "MSDemo"."autogen".minio_http_requests_duration_seconds WHERE sfc='MSDemo' and sfci='MSDemo_1' and time>=1528385420000000000 and time<1528385860000000000 GROUP BY sfe, location, sf
+ SELECT mean(sum)/mean(count) AS mean_response_time, mean(request_size)/mean(count) AS mean_request_size, mean(response_size)/mean(count) AS mean_response_size FROM "MSDemo"."autogen".minio_http_requests_duration_seconds WHERE "flame_sfc"='MSDemo' and "flame_sfci"='MSDemo_1' and time>=1528385420000000000 and time<1528385860000000000 GROUP BY "flame_sfe", "flame_location", "flame_sf"
```
N.B. database name is assumed to be the SFC identifier
@@ -272,13 +272,13 @@ configuration files of the service can be found in the **src/service** folder.
"response_time": 15.75,
"round_trip_time": 81.75,
"global_tags": {
- "sfe": "minio_1_ep1",
- "sfc": "MSDemo",
- "sfci": "MSDemo_1",
- "sfp": "minio",
- "sf": "minio_1",
- "location": "DC1",
- "server": "DC1"
+ "flame_sfe": "minio_1_ep1",
+ "flame_sfc": "MSDemo",
+ "flame_sfci": "MSDemo_1",
+ "flame_sfp": "minio",
+ "flame_sf": "minio_1",
+ "flame_location": "DC1",
+ "flame_server": "DC1"
}
}
```
@@ -300,13 +300,13 @@ configuration files of the service can be found in the **src/service** folder.
"response_time": 3,
"round_trip_time": 3,
"global_tags": {
- "sfe": "minio_1_ep1",
- "sfc": "MSDemo",
- "sfci": "MSDemo_1",
- "sfp": "minio",
- "sf": "minio_1",
- "location": "DC1",
- "server": "DC1"
+ "flame_sfe": "minio_1_ep1",
+ "flame_sfc": "MSDemo",
+ "flame_sfci": "MSDemo_1",
+ "flame_sfp": "minio",
+ "flame_sf": "minio_1",
+ "flame_location": "DC1",
+ "flame_server": "DC1"
}
}
```
diff --git a/docs/dashboards.md b/docs/dashboards.md
index 04e10a7..2f4f8dd 100644
--- a/docs/dashboards.md
+++ b/docs/dashboards.md
@@ -35,7 +35,7 @@ Each column displays the total network traffic sent and received in MB over time
To get the top chart, a nested select statement is used:
```sql
-select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last("bytes_recv") / 1048576 AS "RX_MB", last("bytes_sent") / 1048576 AS "TX_MB" FROM "MSDemo"."autogen"."net" WHERE time > :dashboardTime: AND "sfp"=:sf1: GROUP BY time(1m), sfe FILL(null)) group by time(1m)
+select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last("bytes_recv") / 1048576 AS "RX_MB", last("bytes_sent") / 1048576 AS "TX_MB" FROM "MSDemo"."autogen"."net" WHERE time > :dashboardTime: AND "flame_sfp"=:sf1: GROUP BY time(1m), "flame_sfe" FILL(null)) group by time(1m)
```
(The constant 1048576 is 1024*1024)
@@ -45,7 +45,7 @@ The inner select groups by sfe (servince function endpoint) and time, taking the
The derivative of the first chart requires a further nested select:
```sql
-select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last("bytes_recv") / 1048576 AS "RX_MB", last("bytes_sent") / 1048576 AS "TX_MB" FROM "MSDemo"."autogen"."net" WHERE time > :dashboardTime: AND "sfp"=:sf1: GROUP BY time(1m), sfe FILL(null)) group by time(1m))
+select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last("bytes_recv") / 1048576 AS "RX_MB", last("bytes_sent") / 1048576 AS "TX_MB" FROM "MSDemo"."autogen"."net" WHERE time > :dashboardTime: AND "flame_sfp"=:sf1: GROUP BY time(1m), "flame_sfe" FILL(null)) group by time(1m))
```
The outer-most select taakes the derivative of the first chart for each data set separately. The derivative function is parameterised to understand it is over a 1m period but then the result is divided by 60 to give an average MB/s in each 1 minute period.
diff --git a/docs/monitoring.md b/docs/monitoring.md
index 75b6562..fe1bd9e 100644
--- a/docs/monitoring.md
+++ b/docs/monitoring.md
@@ -184,13 +184,13 @@ The measurement model considers three monitoring views on a surrogate with field
All of the measurements on a surrogate share a common context that includes tag values:
-* sfc – an orchestration template (a.k.a. Service Function Chain)
-* sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
-* sfp – the package a service function is using (a.k.a. Service Function Package)
-* sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
-* sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
-* server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
-* location – the location of the server - physical machine that hosts the cluster VM
+* flame_sfc – an orchestration template (a.k.a. Service Function Chain)
+* flame_sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
+* flame_sfp – the package a service function is using (a.k.a. Service Function Package)
+* flame_sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
+* flame_sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
+* flame_server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
+* flame_location – the location of the server - physical machine that hosts the cluster VM
By including this context with service, network and host measurements it is possible to support range of temporal queries associated with SFC’s. By adopting the same convention for identifiers it is possible to combine measurements across service, network and host to create new series that allows exploration of different aspects of the VM instance, including cross-layer queries.
@@ -426,7 +426,7 @@ The following queries illustrate how to calculate _mean time between failures_ (
_Q. What is the Mean Time Between Failures (MTBF) of endpoint 'adaptive_streaming_I1_apache1'?_
```
-select mean(connected_mst) as "apache1_MTBF(s)" from "endpoint_config" where connected_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
+select mean(connected_mst) as "apache1_MTBF(s)" from "endpoint_config" where connected_mst <> 0 and "flame_sfe" = 'adaptive_streaming_I1_apache1'
```
```
@@ -439,12 +439,12 @@ time apache1_MTBF(s)
_Q. What is the Mean Down Time (MDT) of endpoint 'adaptive_streaming_I1_apache1'?_
```
-select mean(unplaced_mst) as "unplaced_mdt" into "endpoint_config_mdt" from "endpoint_config" where unplaced_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
-select mean(placing_mst) as "placing_mdt" into "endpoint_config_mdt" from "endpoint_config" where placing_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
-select mean(placed_mst) as "placed_mdt" into "endpoint_config_mdt" from "endpoint_config" where placed_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
-select mean(booting_mst) as "booting_mdt" into "endpoint_config_mdt" from "endpoint_config" where booting_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
-select mean(booted_mst) as "booted_mdt" into "endpoint_config_mdt" from "endpoint_config" where booted_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
-select mean(connecting_mst) as "connecting_mdt" into "endpoint_config_mdt" from "endpoint_config" where connecting_mst <> 0 and sfe = 'adaptive_streaming_I1_apache1'
+select mean(unplaced_mst) as "unplaced_mdt" into "endpoint_config_mdt" from "endpoint_config" where unplaced_mst <> 0 and "flame_sfe" = 'adaptive_streaming_I1_apache1'
+select mean(placing_mst) as "placing_mdt" into "endpoint_config_mdt" from "endpoint_config" where placing_mst <> 0 and "flame_sfe" = 'adaptive_streaming_I1_apache1'
+select mean(placed_mst) as "placed_mdt" into "endpoint_config_mdt" from "endpoint_config" where placed_mst <> 0 and "flame_sfe" = 'adaptive_streaming_I1_apache1'
+select mean(booting_mst) as "booting_mdt" into "endpoint_config_mdt" from "endpoint_config" where booting_mst <> 0 and "flame_sfe" = 'adaptive_streaming_I1_apache1'
+select mean(booted_mst) as "booted_mdt" into "endpoint_config_mdt" from "endpoint_config" where booted_mst <> 0 and "flame_sfe" = 'adaptive_streaming_I1_apache1'
+select mean(connecting_mst) as "connecting_mdt" into "endpoint_config_mdt" from "endpoint_config" where connecting_mst <> 0 and "flame_sfe" = 'adaptive_streaming_I1_apache1'
select (unplaced_mdt + placing_mdt + placed_mdt + booting_mdt + booted_mdt + connecting_mdt) as "MDT(s)" from "endpoint_config_mdt"
```
@@ -536,13 +536,13 @@ ipendpoint measurements measure the configuration, usage and performance of VM/C
Common tags
-* sfc – an orchestration template (a.k.a. Service Function Chain)
-* sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
-* sfp – the package a service function is using (a.k.a. Service Function Package)
-* sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
-* sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
-* server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
-* location – the location of the server - physical machine that hosts the cluster VM
+* flame_sfc – an orchestration template (a.k.a. Service Function Chain)
+* flame_sfci – an instance of the orchestration template (a.k.a. Service Function Chain Instance)
+* flame_sfp – the package a service function is using (a.k.a. Service Function Package)
+* flame_sf – the service function defined in the TOSCA resource specification (a.k.a. Service Function)
+* flame_sfe – an authoritative copy of the SF - either VM or container (a.k.a. Service Function Endpoint)
+* flame_server – a cluster VM inside which service function endpoints are placed (at the current stage, the value of this tag is the same as the *location* tag)
+* flame_location – the location of the server - physical machine that hosts the cluster VM
#### ipendpoint Measurements
diff --git a/scripts/clmc-agent/telegraf.conf b/scripts/clmc-agent/telegraf.conf
index 29ca0ae..039502c 100644
--- a/scripts/clmc-agent/telegraf.conf
+++ b/scripts/clmc-agent/telegraf.conf
@@ -35,19 +35,19 @@
# Global tags can be specified here in key="value" format.
[global_tags]
# location of the data centre
- location="${LOCATION}"
+ "flame_location"="${LOCATION}"
# hostname of cluster/server (potentially virtualized) that boots up service function containers
- server = "${LOCATION}"
+ "flame_server" = "${LOCATION}"
# media service template id (defined in the TOSCA resource spec.)
- sfc="${SFC_ID}"
+ "flame_sfc"="${SFC_ID}"
# media service instance id (defined in the TOSCA resource spec.)
- sfci="${SFC_INSTANCE_ID}"
+ "flame_sfci"="${SFC_INSTANCE_ID}"
# service function package id (packaging time)
- sfp="${SF_PACKAGE_ID}"
+ "flame_sfp"="${SF_PACKAGE_ID}"
# service function id (defined in the TOSCA resource spec.)
- sf="${SF_ID}"
+ "flame_sf"="${SF_ID}"
# service function IP endpoint id aka surrogate instance
- sfe="${SF_ENDPOINT_ID}"
+ "flame_sfe"="${SF_ENDPOINT_ID}"
# Configuration for telegraf agent
[agent]
diff --git a/src/service/clmcservice/alertsapi/alerts_specification_schema.py b/src/service/clmcservice/alertsapi/alerts_specification_schema.py
index a09bee8..6f6b1e0 100644
--- a/src/service/clmcservice/alertsapi/alerts_specification_schema.py
+++ b/src/service/clmcservice/alertsapi/alerts_specification_schema.py
@@ -62,7 +62,7 @@ URL_REGEX = compile(
IGNORECASE)
# Global tags allowed to be used for filtering in the trigger condition
-CLMC_INFORMATION_MODEL_GLOBAL_TAGS = ("sfc", "sfci", "sfp", "sf", "sfe", "server", "location")
+CLMC_INFORMATION_MODEL_GLOBAL_TAGS = {"flame_sfc", "flame_sfci", "flame_sfp", "flame_sf", "flame_sfe", "flame_server", "flame_location"}
ALERTS_SPECIFICATION_SCHEMA = Schema({
"tosca_definitions_version": And(str, lambda v: v == "tosca_simple_profile_for_nfv_1_0_0"),
diff --git a/src/service/clmcservice/alertsapi/views.py b/src/service/clmcservice/alertsapi/views.py
index 33bdfb9..4afba33 100644
--- a/src/service/clmcservice/alertsapi/views.py
+++ b/src/service/clmcservice/alertsapi/views.py
@@ -194,15 +194,15 @@ class AlertsConfigurationAPI(object):
if "resource_type" in trigger.trigger_tpl["condition"]:
tags = condition["resource_type"]
# make sure alert tasks are executing with queries for the given sfc and sfc instance
- tags["sfc"] = sfc
- tags["sfci"] = sfc_instance
+ tags["flame_sfc"] = sfc
+ tags["flame_sfci"] = sfc_instance
# NOTE: if the template has its where clause defined as lambda (stream templates), then use "==" as comparison operator,
# else if the template's where clause is defined as a string (batch templates), then use "=" as comparison operator
- comparison_operator = TICKScriptTemplateFiller.get_comparison_operator(event_type) # retrieves the correct comparison operator to use for building the where clause
+ filter_comparison_operator = TICKScriptTemplateFiller.get_comparison_operator(event_type) # retrieves the correct comparison operator to use for building the where clause
# build up the where clause from the tags dictionary
- where_clause = " AND ".join(map(lambda tag_name: '"{0}"{1}\'{2}\''.format(tag_name, comparison_operator, tags[tag_name]), tags))
+ where_clause = " AND ".join(map(lambda tag_name: '"{0}"{1}\'{2}\''.format(tag_name, filter_comparison_operator, tags[tag_name]), tags))
comparison_operator = COMPARISON_OPERATORS[condition.get("comparison_operator", "gte")] # if not specified, use "gte" (>=)
diff --git a/src/service/clmcservice/graphapi/conftest.py b/src/service/clmcservice/graphapi/conftest.py
index 1e3708d..03e3f6d 100644
--- a/src/service/clmcservice/graphapi/conftest.py
+++ b/src/service/clmcservice/graphapi/conftest.py
@@ -171,7 +171,7 @@ def db_testing_data():
]
influx.write_points([
{"measurement": "nginx",
- "tags": {"server": location, "sfe": sfe, "location": location, "sfp": sfp, "sf": sf, "sfc": sfc, "sfci": sfci},
+ "tags": {"flame_server": location, "flame_sfe": sfe, "flame_location": location, "flame_sfp": sfp, "flame_sf": sf, "flame_sfc": sfc, "flame_sfci": sfci},
"fields": {"requests": num_requests, "avg_processing_time": processing_time, "avg_request_size": request_size, "avg_response_size": response_size},
"time": timestamp * 10 ** 9
} for sfe, location, sfp, sf, sfc, sfci, num_requests, processing_time, request_size, response_size, timestamp in data
@@ -192,7 +192,7 @@ def db_testing_data():
]
influx.write_points([
{"measurement": "minio_http",
- "tags": {"server": location, "sfe": sfe, "location": location, "sfp": sfp, "sf": sf, "sfc": sfc, "sfci": sfci},
+ "tags": {"flame_server": location, "flame_sfe": sfe, "flame_location": location, "flame_sfp": sfp, "flame_sf": sf, "flame_sfc": sfc, "flame_sfci": sfci},
"fields": {"total_requests_count": num_requests, "total_processing_time": processing_time, "total_requests_size": request_size, "total_response_size": response_size},
"time": timestamp * 10 ** 9
} for sfe, location, sfp, sf, sfc, sfci, num_requests, processing_time, request_size, response_size, timestamp in data
@@ -208,7 +208,7 @@ def db_testing_data():
]
influx.write_points([
{"measurement": "apache",
- "tags": {"server": location, "sfe": sfe, "location": location, "sfp": sfp, "sf": sf, "sfc": sfc, "sfci": sfci},
+ "tags": {"flame_server": location, "flame_sfe": sfe, "flame_location": location, "flame_sfp": sfp, "flame_sf": sf, "flame_sfc": sfc, "flame_sfci": sfci},
"fields": {"avg_processing_time": processing_time, "avg_request_size": request_size, "avg_response_size": response_size},
"time": timestamp * 10 ** 9
} for sfe, location, sfp, sf, sfc, sfci, processing_time, request_size, response_size, timestamp in data
diff --git a/src/service/clmcservice/graphapi/tests.py b/src/service/clmcservice/graphapi/tests.py
index 33cdd5b..60ee4c1 100644
--- a/src/service/clmcservice/graphapi/tests.py
+++ b/src/service/clmcservice/graphapi/tests.py
@@ -377,9 +377,9 @@ class TestGraphAPI(object):
# go through the set of input/output (expected) parameters and assert actual results match with expected ones
for dc, endpoint, forward_latencies, reverse_latencies, response_time, request_size, response_size, rtt, global_tags in (
- ("DC6", "nginx_1_ep2", [], [], 22.2, 35600, 6420, 22.2, {"location": "DC6", "sfe": "nginx_1_ep2", "server": "DC6", "sfc": "test_sfc", "sfci": "test_sfc_premium", "sfp": "nginx", "sf": "nginx_1"}),
- ("DC2", "nginx_1_ep2", [11, 15, 4.5], [5.5, 13, 7.5], 22.2, 35600, 6420, 78, {"location": "DC6", "sfe": "nginx_1_ep2", "server": "DC6", "sfc": "test_sfc", "sfci": "test_sfc_premium", "sfp": "nginx", "sf": "nginx_1"}),
- ("DC3", "nginx_1_ep1", [12.5], [7.5], 18.2, 2260, 9660, 38, {"location": "DC4", "sfe": "nginx_1_ep1", "server": "DC4", "sfc": "test_sfc", "sfci": "test_sfc_premium", "sfp": "nginx", "sf": "nginx_1"})
+ ("DC6", "nginx_1_ep2", [], [], 22.2, 35600, 6420, 22.2, {"flame_location": "DC6", "flame_sfe": "nginx_1_ep2", "flame_server": "DC6", "flame_sfc": "test_sfc", "flame_sfci": "test_sfc_premium", "flame_sfp": "nginx", "flame_sf": "nginx_1"}),
+ ("DC2", "nginx_1_ep2", [11, 15, 4.5], [5.5, 13, 7.5], 22.2, 35600, 6420, 78, {"flame_location": "DC6", "flame_sfe": "nginx_1_ep2", "flame_server": "DC6", "flame_sfc": "test_sfc", "flame_sfci": "test_sfc_premium", "flame_sfp": "nginx", "flame_sf": "nginx_1"}),
+ ("DC3", "nginx_1_ep1", [12.5], [7.5], 18.2, 2260, 9660, 38, {"flame_location": "DC4", "flame_sfe": "nginx_1_ep1", "flame_server": "DC4", "flame_sfc": "test_sfc", "flame_sfci": "test_sfc_premium", "flame_sfp": "nginx", "flame_sf": "nginx_1"})
):
request = testing.DummyRequest()
request.matchdict["graph_id"] = request_id
@@ -411,10 +411,10 @@ class TestGraphAPI(object):
# go through the set of input/output (expected) parameters and assert actual results match with expected ones
for dc, endpoint, forward_latencies, reverse_latencies, response_time, request_size, response_size, rtt, global_tags in (
- ("DC5", "apache_1_ep1", [], [], 17.6, 1480, 7860, 17.6, {"location": "DC5", "sfe": "apache_1_ep1", "server": "DC5", "sfc": "test_sfc", "sfci": "test_sfc_non_premium", "sfp": "apache", "sf": "apache_1"}),
- ("DC5", "minio_2_ep1", [], [], 7, 2998, 3610, 7, {"location": "DC5", "sfe": "minio_2_ep1", "server": "DC5", "sfc": "test_sfc", "sfci": "test_sfc_non_premium", "sfp": "minio", "sf": "minio_2"}),
- ("DC3", "apache_1_ep1", [10, 15], [13, 9], 17.6, 1480, 7860, 64, {"location": "DC5", "sfe": "apache_1_ep1", "server": "DC5", "sfc": "test_sfc", "sfci": "test_sfc_non_premium", "sfp": "apache", "sf": "apache_1"}),
- ("DC2", "minio_2_ep1", [11, 15], [13, 7.5], 7, 2998, 3610, 53, {"location": "DC5", "sfe": "minio_2_ep1", "server": "DC5", "sfc": "test_sfc", "sfci": "test_sfc_non_premium", "sfp": "minio", "sf": "minio_2"})
+ ("DC5", "apache_1_ep1", [], [], 17.6, 1480, 7860, 17.6, {"flame_location": "DC5", "flame_sfe": "apache_1_ep1", "flame_server": "DC5", "flame_sfc": "test_sfc", "flame_sfci": "test_sfc_non_premium", "flame_sfp": "apache", "flame_sf": "apache_1"}),
+ ("DC5", "minio_2_ep1", [], [], 7, 2998, 3610, 7, {"flame_location": "DC5", "flame_sfe": "minio_2_ep1", "flame_server": "DC5", "flame_sfc": "test_sfc", "flame_sfci": "test_sfc_non_premium", "flame_sfp": "minio", "flame_sf": "minio_2"}),
+ ("DC3", "apache_1_ep1", [10, 15], [13, 9], 17.6, 1480, 7860, 64, {"flame_location": "DC5", "flame_sfe": "apache_1_ep1", "flame_server": "DC5", "flame_sfc": "test_sfc", "flame_sfci": "test_sfc_non_premium", "flame_sfp": "apache", "flame_sf": "apache_1"}),
+ ("DC2", "minio_2_ep1", [11, 15], [13, 7.5], 7, 2998, 3610, 53, {"flame_location": "DC5", "flame_sfe": "minio_2_ep1", "flame_server": "DC5", "flame_sfc": "test_sfc", "flame_sfci": "test_sfc_non_premium", "flame_sfp": "minio", "flame_sf": "minio_2"})
):
request = testing.DummyRequest()
request.matchdict["graph_id"] = request_id
diff --git a/src/service/clmcservice/graphapi/utilities.py b/src/service/clmcservice/graphapi/utilities.py
index 5704b1d..18efc19 100644
--- a/src/service/clmcservice/graphapi/utilities.py
+++ b/src/service/clmcservice/graphapi/utilities.py
@@ -33,7 +33,7 @@ GRAPH_BUILD_URL_PARAMS = ("from", "to")
GRAPH_BUILD_QUERY_PARAMS = {"service_function_chain", "service_function_chain_instance", "service_functions"}
GRAPH_BUILD_SF_QUERY_PARAMS = {"response_time_field", "request_size_field", "response_size_field", "measurement_name"}
-INFLUX_QUERY_TEMPLATE = 'SELECT {0} AS mean_response_time, {1} AS mean_request_size, {2} AS mean_response_size FROM "{3}"."{4}".{5} WHERE sfc=\'{6}\' and sfci=\'{7}\' and time>={8} and time<{9} GROUP BY sfe, location, sf'
+INFLUX_QUERY_TEMPLATE = 'SELECT {0} AS mean_response_time, {1} AS mean_request_size, {2} AS mean_response_size FROM "{3}"."{4}".{5} WHERE "flame_sfc"=\'{6}\' and "flame_sfci"=\'{7}\' and time>={8} and time<{9} GROUP BY "flame_sfe", "flame_location", "flame_sf"'
RTT_CYPHER_QUERY_TEMPLATE = """
@@ -250,19 +250,19 @@ def build_temporal_graph(request_id, from_timestamp, to_timestamp, json_queries,
response_size = result_point["mean_response_size"] # extract the avg response size of the SF from the result
# create a ServiceFunction node from the tag value (if it is not already created)
- service_function_node = find_or_create_node(graph, "ServiceFunction", name=tags["sf"])
+ service_function_node = find_or_create_node(graph, "ServiceFunction", name=tags["flame_sf"])
# create an edge between the the service function and the package (if it is not already created)
find_or_create_edge(graph, "instanceOf", service_function_node, service_function_package_node)
# crate a utilizedBy edge between the service function and the service function chain instance
find_or_create_edge(graph, "utilizedBy", service_function_node, service_function_chain_instance_node)
# create an Endpoint node from the tag value (if it is not already created)
- ipendpoint_node = find_or_create_node(graph, "Endpoint", name=tags["sfe"], response_time=response_time, request_size=request_size, response_size=response_size, uuid=request_id)
+ ipendpoint_node = find_or_create_node(graph, "Endpoint", name=tags["flame_sfe"], response_time=response_time, request_size=request_size, response_size=response_size, uuid=request_id)
# create an edge between the service function and the endpoint (if it is not already created)
find_or_create_edge(graph, "realisedBy", service_function_node, ipendpoint_node)
# create a ComputeNode node from the tag value (if it is not already created)
- compute_node = find_or_create_node(graph, "ComputeNode", name=tags["location"])
+ compute_node = find_or_create_node(graph, "ComputeNode", name=tags["flame_location"])
# create an edge between the endpoint and the compute node (if it is not already created)
find_or_create_edge(graph, "hostedBy", ipendpoint_node, compute_node)
diff --git a/src/service/clmcservice/graphapi/views.py b/src/service/clmcservice/graphapi/views.py
index 710c9af..0223aea 100644
--- a/src/service/clmcservice/graphapi/views.py
+++ b/src/service/clmcservice/graphapi/views.py
@@ -164,8 +164,8 @@ class GraphAPI(object):
log.error("Unexpected error: {0}".format(msg))
raise HTTPBadRequest(msg)
- result["global_tags"] = {"sfe": endpoint_node["name"], "server": hosted_by_node["name"], "location": hosted_by_node["name"],
- "sfc": reference_node["sfc"], "sfci": reference_node["sfci"], "sfp": sf_package_node["name"], "sf": sf_node["name"]}
+ result["global_tags"] = {"flame_sfe": endpoint_node["name"], "flame_server": hosted_by_node["name"], "flame_location": hosted_by_node["name"],
+ "flame_sfc": reference_node["sfc"], "flame_sfci": reference_node["sfci"], "flame_sfp": sf_package_node["name"], "flame_sf": sf_node["name"]}
# calculate the Round-Trip-Time
total_forward_latency = sum(result["forward_latencies"])
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml
index ea52ebf..eb47f97 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-1.yaml
@@ -24,7 +24,7 @@ topology_template:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
+ flame_location: watershed
comparison_operator: gt
action:
implementation:
@@ -43,9 +43,9 @@ topology_template:
threshold: 100
granularity: 120
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: gte
action:
implementation:
@@ -64,9 +64,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml
index a3ef039..67793a7 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-10.yaml
@@ -24,7 +24,7 @@ topology_template:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
+ flame_location: watershed
comparison_operator: gt
action:
implementation:
@@ -43,9 +43,9 @@ topology_template:
threshold: -100 # requests have decreased by at least 100
granularity: 120
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lte
action:
implementation:
@@ -64,9 +64,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml
index 2ae8d16..8a06dcf 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-2.yaml
@@ -23,7 +23,7 @@ topology_template:
threshold: 0
granularity: 60
resource_type:
- sfp: storage
+ flame_sfp: storage
action:
implementation:
- http://sfemc.flame.eu/notify
@@ -41,9 +41,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: less than # invalid comparison operator
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml
index 05cde5b..4ed49c3 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-3.yaml
@@ -26,9 +26,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sf_package_id: storage # sf_package_id is not the correct tag name, it is sfp
- sf: storage-users
- location: watershed
+ flame_sf_package_id: storage # sf_package_id is not the correct tag name, it is sfp
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml
index 96cc6fa..67c403a 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-4.yaml
@@ -26,9 +26,9 @@ topology_template:
granularity: 60
aggregation_method: average # wrong aggregation method - should be mean, not average
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml
index 8ef6f13..7357613 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-5.yaml
@@ -26,9 +26,9 @@ topology_template:
granularity: 60
aggregation_method: mean
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml
index 944f14b..ac13f6f 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-6.yaml
@@ -24,8 +24,8 @@ topology_template:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
- server: watershed
+ flame_location: watershed
+ flame_server: watershed
comparison_operator: gt
action:
implementation:
@@ -45,9 +45,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml
index 1c04891..acb00ed 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-7.yaml
@@ -24,7 +24,7 @@ topology_template:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
+ flame_location: watershed
comparison_operator: gt
action:
implementation:
@@ -44,9 +44,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
@@ -63,7 +63,7 @@ topology_template:
threshold: 0
granularity: 60
resource_type:
- sfp: storage
+ flame_sfp: storage
action:
implementation:
- http://sfemc.flame.eu/notify
\ No newline at end of file
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml
index d108984..a2c3009 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-8.yaml
@@ -30,9 +30,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
@@ -51,9 +51,9 @@ topology_template:
threshold: 100 # requests have increased by at least 100
granularity: 120
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: gte
action:
implementation:
@@ -68,9 +68,9 @@ topology_template:
threshold: -100 # requests have decreased by at least 100
granularity: 120
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lte
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-9.yaml b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-9.yaml
index b6f9819..102c476 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-9.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/invalid/alerts_test_config-9.yaml
@@ -22,7 +22,7 @@ topology_template:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
+ flame_location: watershed
comparison_operator: gt
action:
implementation:
@@ -42,9 +42,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml
index 1d87586..eba786b 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-1.yaml
@@ -24,7 +24,7 @@ topology_template:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
+ flame_location: watershed
comparison_operator: gt
action:
implementation:
@@ -45,9 +45,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml
index 6fe0e90..5169f5d 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-2.yaml
@@ -25,11 +25,11 @@ topology_template:
threshold: -100 # requests have decreased by at least 100
granularity: 120
resource_type:
- sfc: companyA-VR # sfc tag is also allowed, even though it is already included in the metadata
- sfci: companyA-VR-premium # sfci tag is also allowed, even though it is already included in the metadata
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfc: companyA-VR # sfc tag is also allowed, even though it is already included in the metadata
+ flame_sfci: companyA-VR-premium # sfci tag is also allowed, even though it is already included in the metadata
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lte
action:
implementation:
@@ -48,7 +48,7 @@ topology_template:
threshold: 0 # if requests are less than or equal to 0 (in other words, no measurements are reported)
granularity: 60 # check for for missing data for the last 60 seconds
resource_type:
- sfp: storage
+ flame_sfp: storage
action:
implementation:
- http://sfemc.flame.eu/notify
\ No newline at end of file
diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml
index d076ed7..ef1c542 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-3.yaml
@@ -24,7 +24,7 @@ topology_template:
granularity: 120
# aggregation_method is optional, default value is "mean"
resource_type:
- location: watershed
+ flame_location: watershed
# comparison operator is optional, default value is >= or "gte"
action:
implementation:
@@ -42,9 +42,9 @@ topology_template:
granularity: 60
aggregation_method: first
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml
index f6a6421..87e3140 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-4.yaml
@@ -24,8 +24,8 @@ topology_template:
granularity: 120
aggregation_method: median
resource_type:
- location: watershed
- server: watershed
+ flame_location: watershed
+ flame_server: watershed
comparison_operator: gt
action:
implementation:
@@ -61,7 +61,7 @@ topology_template:
threshold: 0 # if requests are less than or equal to 0 (in other words, no measurements are reported)
granularity: 60 # check for for missing data for the last 60 seconds
resource_type:
- sfp: storage
+ flame_sfp: storage
comparison_operator: gte # although events of type deadman do not use a comparison operator, the validator will not complain if one is given, it will simply ignore it
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml
index e650687..f03c523 100644
--- a/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml
+++ b/src/service/resources/tosca/test-data/clmc-validator/valid/alerts_test_config-5.yaml
@@ -24,7 +24,7 @@ topology_template:
granularity: 120
aggregation_method: median
resource_type:
- location: watershed
+ flame_location: watershed
comparison_operator: gt
action:
implementation:
@@ -61,9 +61,9 @@ topology_template:
granularity: 120
aggregation_method: first # Although events of type relative do not require an aggregation method, the validator will not complain if one is given, it will simply ignore it
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: gte
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml
index ce07a9f..a5e9ed3 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-1.yaml
@@ -13,7 +13,7 @@ triggers:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
+ flame_location: watershed
comparison_operator: gt
action:
implementation:
@@ -30,9 +30,9 @@ triggers:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml
index 3b05159..7bd6e44 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-2.yaml
@@ -23,7 +23,7 @@ topology_template:
granularity: 120
aggregation_method: mean
global_tags: # correct field is called resource_type, not global_tags
- location: watershed
+ flame_location: watershed
comparison_operator: gt
action:
implementation:
@@ -42,9 +42,9 @@ topology_template:
threshold: 100
granularity: 120
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: gte
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml
index e8b1c0d..94891fe 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-3.yaml
@@ -23,8 +23,8 @@ topology_template:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
- server: watershed
+ flame_location: watershed
+ flame_server: watershed
comparison_operator: gt
action:
implementation:
@@ -44,9 +44,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml
index 23b74df..76b8a0c 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/invalid/alerts_test_config-4.yaml
@@ -24,7 +24,7 @@ alerts:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
+ flame_location: watershed
comparison_operator: gt
action:
implementation:
@@ -44,9 +44,9 @@ alerts:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
diff --git a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml
index d70a416..928c25e 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-1.yaml
@@ -24,8 +24,8 @@ topology_template:
granularity: 120
aggregation_method: mean
resource_type:
- location: watershed
- server: watershed
+ flame_location: watershed
+ flame_server: watershed
comparison_operator: gt
action:
implementation:
@@ -45,9 +45,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
@@ -66,9 +66,9 @@ topology_template:
threshold: 100
granularity: 120
resource_type:
- sf_package: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: gte
action:
implementation:
@@ -83,9 +83,9 @@ topology_template:
threshold: -100
granularity: 120
resource_type:
- sf_package: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lte
action:
implementation:
@@ -101,7 +101,7 @@ topology_template:
threshold: 0
granularity: 60
resource_type:
- sf_package: storage
+ flame_sfp: storage
action:
implementation:
- http://sfemc.flame.eu/notify
diff --git a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml
index 5de75ef..5924c13 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-2.yaml
@@ -56,7 +56,7 @@ topology_template:
threshold: 0
granularity: 60
resource_type:
- sfp: storage
+ flame_sfp: storage
action:
implementation:
- http://sfemc.flame.eu/notify
\ No newline at end of file
diff --git a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml
index 4be8c2f..64b19cb 100644
--- a/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml
+++ b/src/service/resources/tosca/test-data/tosca-parser/valid/alerts_test_config-4.yaml
@@ -26,9 +26,9 @@ topology_template:
granularity: 60
aggregation_method: last
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: lt
action:
implementation:
@@ -43,9 +43,9 @@ topology_template:
threshold: 100
granularity: 120
resource_type:
- sfp: storage
- sf: storage-users
- location: watershed
+ flame_sfp: storage
+ flame_sf: storage-users
+ flame_location: watershed
comparison_operator: gte
action:
implementation:
diff --git a/src/test/clmctest/alerts/alerts_test_config.yaml b/src/test/clmctest/alerts/alerts_test_config.yaml
index 8c469c0..54d504e 100644
--- a/src/test/clmctest/alerts/alerts_test_config.yaml
+++ b/src/test/clmctest/alerts/alerts_test_config.yaml
@@ -26,7 +26,7 @@ topology_template:
granularity: 5
aggregation_method: mean
resource_type:
- location: DC1
+ flame_location: DC1
comparison_operator: gte
action:
implementation:
@@ -40,8 +40,8 @@ topology_template:
granularity: 10
aggregation_method: mean
resource_type:
- location: DC1
- sfp: nginx
+ flame_location: DC1
+ flame_sfp: nginx
comparison_operator: gte
action:
implementation:
@@ -54,11 +54,12 @@ topology_template:
threshold: 5
granularity: 10
resource_type:
- sfc: MS_Template_1 # value is already given in metadata so this is optional
- sfci: MS_I1 # value is already given in metadata so this is optional
- sfp: nginx
- sf: adaptive_streaming_nginx_I1
- location: DC1
+ flame_sfc: MS_Template_1 # value is already given in metadata so this is optional
+ flame_sfci: MS_I1 # value is already given in metadata so this is optional
+ flame_sfp: nginx
+ flame_sf: adaptive_streaming_nginx_I1
+ flame_location: DC1
+ flame_server: DC1
comparison_operator: gte
action:
implementation:
@@ -75,11 +76,12 @@ topology_template:
threshold: 0
granularity: 5
resource_type:
- sfc: MS_Template_1 # value is already given in metadata so this is optional
- sfci: MS_I1 # value is already given in metadata so this is optional
- sfp: nginx
- sf: adaptive_streaming_nginx_I1
- location: DC1
+ flame_sfc: MS_Template_1 # value is already given in metadata so this is optional
+ flame_sfci: MS_I1 # value is already given in metadata so this is optional
+ flame_sfp: nginx
+ flame_sf: adaptive_streaming_nginx_I1
+ flame_location: DC1
+ flame_server: DC1
action:
implementation:
- http://172.40.231.200:9999/
\ No newline at end of file
diff --git a/src/test/clmctest/dashboards/dc_dash.json b/src/test/clmctest/dashboards/dc_dash.json
index 7d98cf5..318e467 100644
--- a/src/test/clmctest/dashboards/dc_dash.json
+++ b/src/test/clmctest/dashboards/dc_dash.json
@@ -10,7 +10,7 @@
"name": "Mean %CPU",
"queries": [
{
- "query": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"location\"= :location: GROUP BY time(:interval:) FILL(null)",
+ "query": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"flame_location\"= :location: GROUP BY time(:interval:) FILL(null)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -22,7 +22,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"location\"= :location: GROUP BY time(:interval:) FILL(null)",
+ "rawText": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"flame_location\"= :location: GROUP BY time(:interval:) FILL(null)",
"range": null,
"shifts": null
},
@@ -129,7 +129,7 @@
"influxql": "SHOW TAG VALUES ON :database: FROM :measurement: WITH KEY=:tagKey:",
"db": "MSDemo",
"measurement": "cpu",
- "tagKey": "location",
+ "tagKey": "flame_location",
"fieldKey": ""
},
"links": {
diff --git a/src/test/clmctest/dashboards/minio_dash.json b/src/test/clmctest/dashboards/minio_dash.json
index f2976c0..a92200d 100644
--- a/src/test/clmctest/dashboards/minio_dash.json
+++ b/src/test/clmctest/dashboards/minio_dash.json
@@ -10,7 +10,7 @@
"name": "minio2: Network RX",
"queries": [
{
- "query": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"=:minio2: GROUP BY time(1m)",
+ "query": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"=:minio2: GROUP BY time(1m)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -22,7 +22,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"=:minio2: GROUP BY time(1m)",
+ "rawText": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"=:minio2: GROUP BY time(1m)",
"range": null,
"shifts": null
},
@@ -120,7 +120,7 @@
"name": "minio1: Network RX",
"queries": [
{
- "query": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"=:minio1: GROUP BY time(1m)",
+ "query": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"=:minio1: GROUP BY time(1m)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -132,7 +132,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"=:minio1: GROUP BY time(1m)",
+ "rawText": "SELECT derivative(max(\"bytes_recv\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"=:minio1: GROUP BY time(1m)",
"range": null,
"shifts": null
},
@@ -230,7 +230,7 @@
"name": "minio2: Network TX",
"queries": [
{
- "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"=:minio2: GROUP BY time(1m)",
+ "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"=:minio2: GROUP BY time(1m)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -242,7 +242,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"=:minio2: GROUP BY time(1m)",
+ "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"=:minio2: GROUP BY time(1m)",
"range": null,
"shifts": null
},
@@ -340,7 +340,7 @@
"name": "minio1: Network TX",
"queries": [
{
- "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"=:minio1: GROUP BY time(1m)",
+ "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"=:minio1: GROUP BY time(1m)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -352,7 +352,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"=:minio1: GROUP BY time(1m)",
+ "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"=:minio1: GROUP BY time(1m)",
"range": null,
"shifts": null
},
@@ -450,7 +450,7 @@
"name": "minio2: Response time",
"queries": [
{
- "query": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"sfe\"=:minio2: GROUP BY time(:interval:) FILL(null)",
+ "query": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"flame_sfe\"=:minio2: GROUP BY time(:interval:) FILL(null)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -462,7 +462,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"sfe\"=:minio2: GROUP BY time(:interval:) FILL(null)",
+ "rawText": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"flame_sfe\"=:minio2: GROUP BY time(:interval:) FILL(null)",
"range": null,
"shifts": null
},
@@ -560,7 +560,7 @@
"name": "minio1: Response time",
"queries": [
{
- "query": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"sfe\"=:minio1: GROUP BY time(:interval:) FILL(null)",
+ "query": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"flame_sfe\"=:minio1: GROUP BY time(:interval:) FILL(null)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -572,7 +572,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"sfe\"=:minio1: GROUP BY time(:interval:) FILL(null)",
+ "rawText": "SELECT 100*last(\"0.001\") / last(\"count\") AS \"0.001\", 100*last(\"0.003\") / last(\"count\") AS \"0.003\", 100*last(\"0.005\") / last(\"count\") AS \"0.005\", 100*last(\"0.1\") / last(\"count\") AS \"0.1\", 100*last(\"0.5\") / last(\"count\") AS \"0.5\", 100*last(\"1\") / last(\"count\") AS \"1\" FROM \"MSDemo\".\"autogen\".\"minio_http_requests_duration_seconds\" WHERE time > :dashboardTime: and \"flame_sfe\"=:minio1: GROUP BY time(:interval:) FILL(null)",
"range": null,
"shifts": null
},
@@ -679,7 +679,7 @@
"influxql": "SHOW TAG VALUES ON :database: FROM :measurement: WITH KEY=:tagKey:",
"db": "MSDemo",
"measurement": "cpu",
- "tagKey": "sfe",
+ "tagKey": "flame_sfe",
"fieldKey": ""
},
"links": {
@@ -702,7 +702,7 @@
"influxql": "SHOW TAG VALUES ON :database: FROM :measurement: WITH KEY=:tagKey:",
"db": "MSDemo",
"measurement": "cpu",
- "tagKey": "sfe",
+ "tagKey": "flame_sfe",
"fieldKey": ""
},
"links": {
diff --git a/src/test/clmctest/dashboards/nginx_dash.json b/src/test/clmctest/dashboards/nginx_dash.json
index 55378a1..70a6a3c 100644
--- a/src/test/clmctest/dashboards/nginx_dash.json
+++ b/src/test/clmctest/dashboards/nginx_dash.json
@@ -10,7 +10,7 @@
"name": "nginx_ep_2: Requests / s",
"queries": [
{
- "query": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep2'",
+ "query": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep2'",
"queryConfig": {
"database": "",
"measurement": "",
@@ -22,7 +22,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep2'",
+ "rawText": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep2'",
"range": null,
"shifts": null
},
@@ -120,7 +120,7 @@
"name": "nginx_ep_2: Network TX",
"queries": [
{
- "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep2' GROUP BY time(1m)",
+ "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep2' GROUP BY time(1m)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -132,7 +132,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep2' GROUP BY time(1m)",
+ "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep2' GROUP BY time(1m)",
"range": null,
"shifts": null
},
@@ -230,7 +230,7 @@
"name": "nginx_ep_2: Network RX",
"queries": [
{
- "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep2' GROUP By time(1m) fill(previous)",
+ "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep2' GROUP By time(1m) fill(previous)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -242,7 +242,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep2' GROUP By time(1m) fill(previous)",
+ "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep2' GROUP By time(1m) fill(previous)",
"range": null,
"shifts": null
},
@@ -340,7 +340,7 @@
"name": "nginx_ep_1: Requests / s",
"queries": [
{
- "query": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep1'",
+ "query": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep1'",
"queryConfig": {
"database": "",
"measurement": "",
@@ -352,7 +352,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep1'",
+ "rawText": "SELECT non_negative_derivative(\"requests\") AS \"requests/sec\" FROM \"MSDemo\".\"autogen\".\"nginx\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep1'",
"range": null,
"shifts": null
},
@@ -450,7 +450,7 @@
"name": "nginx_ep_1: Network TX",
"queries": [
{
- "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep1' GROUP BY time(1m)",
+ "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep1' GROUP BY time(1m)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -462,7 +462,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep1' GROUP BY time(1m)",
+ "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"TX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep1' GROUP BY time(1m)",
"range": null,
"shifts": null
},
@@ -560,7 +560,7 @@
"name": "nginx_ep_1: Network RX",
"queries": [
{
- "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep1' GROUP By time(1m) fill(previous)",
+ "query": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep1' GROUP By time(1m) fill(previous)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -572,7 +572,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfe\"='nginx_1_ep1' GROUP By time(1m) fill(previous)",
+ "rawText": "SELECT derivative(max(\"bytes_sent\")) / 62914560 AS \"RX_Mb_per_second\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfe\"='nginx_1_ep1' GROUP By time(1m) fill(previous)",
"range": null,
"shifts": null
},
@@ -670,7 +670,7 @@
"name": "nginx_ep_2: CPU usage",
"queries": [
{
- "query": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"exe\"='nginx' AND \"sfe\"='nginx_1_ep2' GROUP BY time(:interval:) FILL(null)",
+ "query": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"exe\"='nginx' AND \"flame_sfe\"='nginx_1_ep2' GROUP BY time(:interval:) FILL(null)",
"queryConfig": {
"database": "MSDemo",
"measurement": "procstat",
@@ -693,7 +693,7 @@
"exe": [
"nginx"
],
- "sfe": [
+ "flame_sfe": [
"nginx_1_ep2"
]
},
@@ -801,7 +801,7 @@
"name": "nginx_ep_1: CPU usage",
"queries": [
{
- "query": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"exe\"='nginx' AND \"sfe\"='nginx_1_ep1' GROUP BY time(:interval:) FILL(null)",
+ "query": "SELECT mean(\"cpu_usage\") AS \"mean_cpu_usage\" FROM \"MSDemo\".\"autogen\".\"procstat\" WHERE time > :dashboardTime: AND \"exe\"='nginx' AND \"flame_sfe\"='nginx_1_ep1' GROUP BY time(:interval:) FILL(null)",
"queryConfig": {
"database": "MSDemo",
"measurement": "procstat",
@@ -824,7 +824,7 @@
"exe": [
"nginx"
],
- "sfe": [
+ "flame_sfe": [
"nginx_1_ep1"
]
},
diff --git a/src/test/clmctest/dashboards/sf_dash.json b/src/test/clmctest/dashboards/sf_dash.json
index 10b2da9..a131ad0 100644
--- a/src/test/clmctest/dashboards/sf_dash.json
+++ b/src/test/clmctest/dashboards/sf_dash.json
@@ -10,7 +10,7 @@
"name": "Average MB/s sent/recv for service-function 2",
"queries": [
{
- "query": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfp\"=:sf2: GROUP BY time(1m), sfe FILL(null)) group by time(1m)) ",
+ "query": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfp\"=:sf2: GROUP BY time(1m), \"flame_sfe\" FILL(null)) group by time(1m)) ",
"queryConfig": {
"database": "",
"measurement": "",
@@ -22,7 +22,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfp\"=:sf2: GROUP BY time(1m), sfe FILL(null)) group by time(1m)) ",
+ "rawText": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfp\"=:sf2: GROUP BY time(1m), \"flame_sfe\" FILL(null)) group by time(1m)) ",
"range": null,
"shifts": null
},
@@ -120,7 +120,7 @@
"name": "Total MB sent/recv for service-function 2",
"queries": [
{
- "query": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfp\"=:sf2: GROUP BY time(1m), sfe FILL(null)) group by time(1m)",
+ "query": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfp\"=:sf2: GROUP BY time(1m), \"flame_sfe\" FILL(null)) group by time(1m)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -132,7 +132,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfp\"=:sf2: GROUP BY time(1m), sfe FILL(null)) group by time(1m)",
+ "rawText": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfp\"=:sf2: GROUP BY time(1m), \"flame_sfe\" FILL(null)) group by time(1m)",
"range": null,
"shifts": null
},
@@ -230,7 +230,7 @@
"name": "Average MB/s sent/recv for service-function 1",
"queries": [
{
- "query": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfp\"=:sf1: GROUP BY time(1m), sfe FILL(null)) group by time(1m)) ",
+ "query": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfp\"=:sf1: GROUP BY time(1m), \"flame_sfe\" FILL(null)) group by time(1m)) ",
"queryConfig": {
"database": "",
"measurement": "",
@@ -242,7 +242,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfp\"=:sf1: GROUP BY time(1m), sfe FILL(null)) group by time(1m)) ",
+ "rawText": "select derivative(total_RX_MB, 1m) / 60 as RX_MB_per_s, derivative(total_TX_MB, 1m) / 60 as TX_MB_per_s from (select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfp\"=:sf1: GROUP BY time(1m), \"flame_sfe\" FILL(null)) group by time(1m)) ",
"range": null,
"shifts": null
},
@@ -340,7 +340,7 @@
"name": "Total MB sent/recv for service-function 1",
"queries": [
{
- "query": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfp\"=:sf1: GROUP BY time(1m), sfe FILL(null)) group by time(1m)",
+ "query": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfp\"=:sf1: GROUP BY time(1m), \"flame_sfe\" FILL(null)) group by time(1m)",
"queryConfig": {
"database": "",
"measurement": "",
@@ -352,7 +352,7 @@
"tags": []
},
"areTagsAccepted": false,
- "rawText": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"sfp\"=:sf1: GROUP BY time(1m), sfe FILL(null)) group by time(1m)",
+ "rawText": "select sum(RX_MB) as total_RX_MB, sum(TX_MB) as total_TX_MB from (SELECT last(\"bytes_recv\") / 1048576 AS \"RX_MB\", last(\"bytes_sent\") / 1048576 AS \"TX_MB\" FROM \"MSDemo\".\"autogen\".\"net\" WHERE time > :dashboardTime: AND \"flame_sfp\"=:sf1: GROUP BY time(1m), \"flame_sfe\" FILL(null)) group by time(1m)",
"range": null,
"shifts": null
},
@@ -459,7 +459,7 @@
"influxql": "SHOW TAG VALUES ON :database: FROM :measurement: WITH KEY=:tagKey:",
"db": "MSDemo",
"measurement": "cpu",
- "tagKey": "sfp",
+ "tagKey": "flame_sfp",
"fieldKey": ""
},
"links": {
@@ -482,7 +482,7 @@
"influxql": "SHOW TAG VALUES ON :database: FROM :measurement: WITH KEY=:tagKey:",
"db": "MSDemo",
"measurement": "cpu",
- "tagKey": "sfp",
+ "tagKey": "flame_sfp",
"fieldKey": ""
},
"links": {
diff --git a/src/test/clmctest/inputs/test_telegraf_agents.py b/src/test/clmctest/inputs/test_telegraf_agents.py
index d8951d3..952eb35 100644
--- a/src/test/clmctest/inputs/test_telegraf_agents.py
+++ b/src/test/clmctest/inputs/test_telegraf_agents.py
@@ -81,4 +81,4 @@ def test_global_tag_filtering(influxdb, query):
query_result = influxdb.query(query).items()[0]
tags = query_result[0][1].keys()
- assert set(tags).issuperset({"sfc", "sfci", "sfp", "sf", "sfe", "server", "location"})
+ assert set(tags).issuperset({"flame_sfc", "flame_sfci", "flame_sfp", "flame_sf", "flame_sfe", "flame_server", "flame_location"})
diff --git a/src/test/clmctest/monitoring/test_simresults.py b/src/test/clmctest/monitoring/test_simresults.py
index 9bbacc4..46feff4 100644
--- a/src/test/clmctest/monitoring/test_simresults.py
+++ b/src/test/clmctest/monitoring/test_simresults.py
@@ -53,45 +53,45 @@ class TestSimulation(object):
('SELECT count(*) FROM "media_service_A"."autogen"."net_port_io"',
{"time": "1970-01-01T00:00:00Z", "count_RX_BYTES_PORT_M": 7200, "count_TX_BYTES_PORT_M": 7200}),
- ('SELECT count(*) FROM "media_service_A"."autogen"."endpoint_config" WHERE sfe=\'endpoint1.ms-A.ict-flame.eu\'',
+ ('SELECT count(*) FROM "media_service_A"."autogen"."endpoint_config" WHERE "flame_sfe"=\'endpoint1.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "count_current_state_time": 3639, "count_unplaced_sum": 3639, "count_unplaced_mst": 3639, "count_placing_sum": 3639, "count_placing_mst": 3639, "count_placed_sum": 3639, "count_placed_mst": 3639, "count_booting_sum": 3639, "count_booting_mst": 3639, "count_booted_sum": 3639,
"count_booted_mst": 3639, "count_connecting_sum": 3639, "count_connecting_mst": 3639, "count_connected_sum": 3639, "count_connected_mst": 3639, "count_cpus": 3639, "count_memory": 3639, "count_storage": 3639}),
- ('SELECT count(*) FROM "media_service_A"."autogen"."endpoint_config" WHERE sfe=\'endpoint2.ms-A.ict-flame.eu\'',
+ ('SELECT count(*) FROM "media_service_A"."autogen"."endpoint_config" WHERE "flame_sfe"=\'endpoint2.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "count_current_state_time": 3639, "count_unplaced_sum": 3639, "count_unplaced_mst": 3639, "count_placing_sum": 3639, "count_placing_mst": 3639, "count_placed_sum": 3639, "count_placed_mst": 3639, "count_booting_sum": 3639, "count_booting_mst": 3639, "count_booted_sum": 3639,
"count_booted_mst": 3639, "count_connecting_sum": 3639, "count_connecting_mst": 3639, "count_connected_sum": 3639, "count_connected_mst": 3639, "count_cpus": 3639, "count_memory": 3639, "count_storage": 3639}),
- ('SELECT count(*) FROM "media_service_A"."autogen"."mpegdash_mc_config" WHERE sfe=\'endpoint1.ms-A.ict-flame.eu\'',
+ ('SELECT count(*) FROM "media_service_A"."autogen"."mpegdash_mc_config" WHERE "flame_sfe"=\'endpoint1.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "count_current_state_time": 3607, "count_running_mst": 3607, "count_running_sum": 3607, "count_starting_mst": 3607, "count_starting_sum": 3607, "count_stopped_mst": 3607, "count_stopped_sum": 3607, "count_stopping_mst": 3607, "count_stopping_sum": 3607}),
- ('SELECT count(*) FROM "media_service_A"."autogen"."mpegdash_mc_config" WHERE sfe=\'endpoint2.ms-A.ict-flame.eu\'',
+ ('SELECT count(*) FROM "media_service_A"."autogen"."mpegdash_mc_config" WHERE "flame_sfe"=\'endpoint2.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "count_current_state_time": 3607, "count_running_mst": 3607, "count_running_sum": 3607, "count_starting_mst": 3607, "count_starting_sum": 3607, "count_stopped_mst": 3607, "count_stopped_sum": 3607, "count_stopping_mst": 3607, "count_stopping_sum": 3607}),
- ('SELECT mean(unplaced_mst) as "unplaced_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE unplaced_mst <> 0 and sfe=\'endpoint1.ms-A.ict-flame.eu\'',
+ ('SELECT mean(unplaced_mst) as "unplaced_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE unplaced_mst <> 0 and "flame_sfe"=\'endpoint1.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "unplaced_mst": 0.7}),
- ('SELECT mean(placing_mst) as "placing_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE placing_mst <> 0 and sfe=\'endpoint1.ms-A.ict-flame.eu\'',
+ ('SELECT mean(placing_mst) as "placing_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE placing_mst <> 0 and "flame_sfe"=\'endpoint1.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "placing_mst": 9.4}),
- ('SELECT mean(placed_mst) as "placed_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE placed_mst <> 0 and sfe=\'endpoint1.ms-A.ict-flame.eu\'',
+ ('SELECT mean(placed_mst) as "placed_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE placed_mst <> 0 and "flame_sfe"=\'endpoint1.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "placed_mst": 1.7000000000000002}),
- ('SELECT mean(booting_mst) as "booting_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE booting_mst <> 0 and sfe=\'endpoint1.ms-A.ict-flame.eu\'',
+ ('SELECT mean(booting_mst) as "booting_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE booting_mst <> 0 and "flame_sfe"=\'endpoint1.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "booting_mst": 9.6}),
- ('SELECT mean(booted_mst) as "booted_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE booted_mst <> 0 and sfe=\'endpoint1.ms-A.ict-flame.eu\'',
+ ('SELECT mean(booted_mst) as "booted_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE booted_mst <> 0 and "flame_sfe"=\'endpoint1.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "booted_mst": 2.1}),
- ('SELECT mean(connecting_mst) as "connecting_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE connecting_mst <> 0 and sfe=\'endpoint1.ms-A.ict-flame.eu\'',
+ ('SELECT mean(connecting_mst) as "connecting_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE connecting_mst <> 0 and "flame_sfe"=\'endpoint1.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "connecting_mst": 10.2}),
- ('SELECT mean(connected_mst) as "connected_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE connected_mst <> 0 and sfe=\'endpoint1.ms-A.ict-flame.eu\'',
+ ('SELECT mean(connected_mst) as "connected_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE connected_mst <> 0 and "flame_sfe"=\'endpoint1.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "connected_mst": 3605.0}),
- ('SELECT mean(unplaced_mst) as "unplaced_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE unplaced_mst <> 0 and sfe=\'endpoint2.ms-A.ict-flame.eu\'',
+ ('SELECT mean(unplaced_mst) as "unplaced_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE unplaced_mst <> 0 and "flame_sfe"=\'endpoint2.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "unplaced_mst": 0.7}),
- ('SELECT mean(placing_mst) as "placing_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE placing_mst <> 0 and sfe=\'endpoint2.ms-A.ict-flame.eu\'',
+ ('SELECT mean(placing_mst) as "placing_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE placing_mst <> 0 and "flame_sfe"=\'endpoint2.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "placing_mst": 9.4}),
- ('SELECT mean(placed_mst) as "placed_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE placed_mst <> 0 and sfe=\'endpoint2.ms-A.ict-flame.eu\'',
+ ('SELECT mean(placed_mst) as "placed_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE placed_mst <> 0 and "flame_sfe"=\'endpoint2.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "placed_mst": 1.7000000000000002}),
- ('SELECT mean(booting_mst) as "booting_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE booting_mst <> 0 and sfe=\'endpoint2.ms-A.ict-flame.eu\'',
+ ('SELECT mean(booting_mst) as "booting_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE booting_mst <> 0 and "flame_sfe"=\'endpoint2.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "booting_mst": 9.6}),
- ('SELECT mean(booted_mst) as "booted_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE booted_mst <> 0 and sfe=\'endpoint2.ms-A.ict-flame.eu\'',
+ ('SELECT mean(booted_mst) as "booted_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE booted_mst <> 0 and "flame_sfe"=\'endpoint2.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "booted_mst": 2.1}),
- ('SELECT mean(connecting_mst) as "connecting_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE connecting_mst <> 0 and sfe=\'endpoint2.ms-A.ict-flame.eu\'',
+ ('SELECT mean(connecting_mst) as "connecting_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE connecting_mst <> 0 and "flame_sfe"=\'endpoint2.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "connecting_mst": 10.2}),
- ('SELECT mean(connected_mst) as "connected_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE connected_mst <> 0 and sfe=\'endpoint2.ms-A.ict-flame.eu\'',
+ ('SELECT mean(connected_mst) as "connected_mst" FROM "media_service_A"."autogen"."endpoint_config" WHERE connected_mst <> 0 and "flame_sfe"=\'endpoint2.ms-A.ict-flame.eu\'',
{"time": "1970-01-01T00:00:00Z", "connected_mst": 3605.0}),
('SELECT mean(stopped_sum) as "stopped_sum" FROM "media_service_A"."autogen"."mpegdash_mc_config" WHERE stopped_sum <> 0',
--
GitLab