From 1b88637a7f54a07d19ab006e57dc76d29301a817 Mon Sep 17 00:00:00 2001 From: gifrerenom <lluis.gifre@cttc.es> Date: Wed, 24 Jul 2024 17:01:21 +0000 Subject: [PATCH] Pre-merge cleanup --- deploy/all.sh | 7 +++++-- install_requirements.sh | 2 +- my_deploy.sh | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/deploy/all.sh b/deploy/all.sh index 4b644cf11..f93cd92ac 100755 --- a/deploy/all.sh +++ b/deploy/all.sh @@ -29,8 +29,11 @@ export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"} # By default, only basic components are deployed export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice nbi webui load_generator"} -# Uncomment to activate Monitoring -#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring kpi_manager" +# Uncomment to activate Monitoring (old) +#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring" + +# Uncomment to activate Monitoring Framework (new) +#export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api" # Uncomment to activate BGP-LS Speaker #export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker" diff --git a/install_requirements.sh b/install_requirements.sh index f1ae278c6..54b660a52 100755 --- a/install_requirements.sh +++ b/install_requirements.sh @@ -22,7 +22,7 @@ ALL_COMPONENTS="context device service nbi monitoring webui interdomain slice" ALL_COMPONENTS="${ALL_COMPONENTS} dbscanserving opticalattackmitigator opticalattackdetector" ALL_COMPONENTS="${ALL_COMPONENTS} l3_attackmitigator l3_centralizedattackdetector l3_distributedattackdetector" -ALL_COMPONENTS="${ALL_COMPONENTS} kpi_manager" +ALL_COMPONENTS="${ALL_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api" TFS_COMPONENTS=${TFS_COMPONENTS:-$ALL_COMPONENTS} # Some components require libyang built from source code diff --git a/my_deploy.sh b/my_deploy.sh index a9468a245..b89df7481 100755 --- a/my_deploy.sh +++ b/my_deploy.sh @@ -22,8 +22,11 @@ export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/" # Set the list of components, separated by spaces, you want to build images for, and deploy. export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator" -# Uncomment to activate Monitoring -#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring kpi_manager" +# Uncomment to activate Monitoring (old) +#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring" + +# Uncomment to activate Monitoring Framework (new) +#export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api" # Uncomment to activate BGP-LS Speaker #export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker" -- GitLab