Merge pull request #555 from ARGOeu/devel

Version 3.4.8

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [3.4.8] - 2023-07-06
+
+### Added
+
+
+* ARGO-3573 Introduce negation feature for topology entity filter
+* ARGO-3574 Introduce wildcard specification for topology entity filter
+* ARGO-4241 Mark that tenant is combined tenant
+* ARGO-4242 Option to combine two existing profiles from different tenants
+* ARGO-4276 API endpoints to integrate probes to the Monitoring service
+* ARGO-4318 View in POEM for probe candidates
+### Fixed
+
+* ARGO-4230 Error not displayed on metric override page
+* ARGO-4246 Fork and patch typing_extensions and place it as POEM dependency
+* ARGO-4250 Bug fetching read-only WEB-API key
+* ARGO-4321 Login page not redirecting
+
+### Changed
+
+* ARGO-3724 Skip import metrics step in tenant POEMs
+* ARGO-4042 Switch threshold profile page to react-hook-form library
+* ARGO-4239 Add tenants' keys to super POEM
+* ARGO-4264 Switch login page to react-hook-form library
+* ARGO-4265 Switch tenants page to react-hook-form library
+
 ## [3.4.7] - 2023-03-02
 
 ### Added

bin/poem-tenant

@@ -5,9 +5,10 @@ SITEPACK=$(python -c "from distutils.sysconfig import get_python_lib; print(get_
 
 usage()
 {
-	printf "Usage: %s -t <tenant name> [-d <hostname> | -r] [-l] \n" $(basename $0) >&2
+	printf "Usage: %s -t <tenant name> [-d <hostname> -c | -r] [-l] \n" $(basename $0) >&2
 	printf "       [-t] - tenant name\n" >&2
 	printf "       [-d] - hostname\n" >&2
+	printf "       [-c] - use if tenant is combined tenant\n" >&2
 	printf "       [-r] - remove tenant and schema\n" >&2
 	printf "       [-l] - list all tenants\n" >&2
     exit 2
@@ -18,7 +19,7 @@ then
     usage
 fi
 
-while getopts 't:d:hlr' OPTION
+while getopts 't:d:chlr' OPTION
 do
     case $OPTION in
         t)
@@ -27,6 +28,9 @@ do
         d)
             hostname=$OPTARG
             ;;
+        c)
+            combined=1
+            ;;
         r)
             if [ -z "$name" ]
             then
@@ -55,11 +59,23 @@ done
 
 if [ -z "$hostname" ]
 then
-    su -m -s /bin/sh $RUNASUSER -c \
-    "poem-manage create_tenant --name $name"
+    if [ -z "$combined" ]
+    then
+      su -m -s /bin/sh $RUNASUSER -c \
+      "poem-manage create_tenant --name $name"
+    else
+      su -m -s /bin/sh $RUNASUSER -c \
+      "poem-manage create_tenant --name $name --combined"
+    fi
 else
-    su -m -s /bin/sh $RUNASUSER -c \
-    "poem-manage poem_create_tenant --name $name --hostname $hostname"
+    if [ -z "$combined" ]
+    then
+      su -m -s /bin/sh $RUNASUSER -c \
+      "poem-manage poem_create_tenant --name $name --hostname $hostname"
+    else
+      su -m -s /bin/sh $RUNASUSER -c \
+      "poem-manage poem_create_tenant --name $name --hostname $hostname --combined"
+    fi
 fi
 
 schema=$(echo "$name" | tr '[:upper:]' '[:lower:]')

etc/poem.conf.template

@@ -29,6 +29,7 @@ ReportsTopologyGroups = https://api.devel.argo.grnet.gr/api/v2/topology/groups
 ReportsTopologyEndpoints = https://api.devel.argo.grnet.gr/api/v2/topology/endpoints
 ServiceTypes = https://api.devel.argo.grnet.gr/api/v2/topology/service-types
 Metrics = https://api.devel.argo.grnet.gr/api/v2/admin/metrics
+DataFeeds = https://api.devel.argo.grnet.gr/api/v2/feeds/data
 
 [GENERAL_ALL]
 PublicPage = tenant.com

poem/Poem/Makefile

@@ -2,8 +2,8 @@ container_name = poem-react-c7
 
 place-new-bundle:
 	./keep-latest-bundle.sh
-	docker exec -t $(container_name) ./collectstatic.sh
-	docker exec -t $(container_name) ./restarthttpd.sh
+	docker exec -u user -t $(container_name) /home/user/collectstatic.sh
+	docker exec -u user -t $(container_name) /home/user/restarthttpd.sh
 
 devel-watch:
 	rm -rf frontend/bundles/reactbundle/* ; \

poem/Poem/api/internal_views/aggregationprofiles.py

@@ -203,7 +203,10 @@ def put(self, request):
             )
 
     def get(self, request, aggregation_name=None):
-        sync_webapi(settings.WEBAPI_AGGREGATION, poem_models.Aggregation)
+        sync_webapi(
+            settings.WEBAPI_AGGREGATION, poem_models.Aggregation,
+            request.tenant.name
+        )
 
         if aggregation_name:
             try: