Merge pull request #363 from ARGOeu/devel

Version 2.1.0
ARGOeu · Dec 6, 2022 · 615f8cb · 615f8cb
2 parents 0542a72 + 3d5c95b
commit 615f8cb
Show file tree

Hide file tree

Showing 79 changed files with 5,320 additions and 588 deletions.
diff --git a/flink_jobs_v2/AmsPublisher/src/main/java/ams/publisher/ArgoMessagingClient.java b/flink_jobs_v2/AmsPublisher/src/main/java/ams/publisher/ArgoMessagingClient.java
diff --git a/flink_jobs_v2/AmsPublisher/src/main/java/ams/publisher/ArgoMessagingSink.java b/flink_jobs_v2/AmsPublisher/src/main/java/ams/publisher/ArgoMessagingSink.java
diff --git a/flink_jobs_v2/ApiResourceManager/pom.xml b/flink_jobs_v2/ApiResourceManager/pom.xml
@@ -4,9 +4,9 @@
     <parent>
         <groupId>flink.jobs.v2</groupId>
         <artifactId>flink_jobs_v2</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
     </parent>
-    <version>2.0.0</version> 
+    <version>2.1.0</version> 
     <groupId>api.resource.manager</groupId>
     <artifactId>ApiResourceManager</artifactId>
     <packaging>jar</packaging>

diff --git a/flink_jobs_v2/ProfilesManager/pom.xml b/flink_jobs_v2/ProfilesManager/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>flink.jobs.v2</groupId>
         <artifactId>flink_jobs_v2</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
     </parent> 
     <groupId>profiles.manager</groupId>
     <artifactId>ProfilesManager</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>

diff --git a/flink_jobs_v2/ProfilesManager/src/main/java/profilesmanager/EndpointGroupManager.java b/flink_jobs_v2/ProfilesManager/src/main/java/profilesmanager/EndpointGroupManager.java
@@ -302,6 +302,26 @@ public HashMap<String, String> getGroupTags(String group, String type, String ho
 
         return null;
     }
+
+    /**
+     * Finds in the filtered EndpointItem fList a EndpointItem with specific
+     * group, type. service, hostname and tag and returns it's value
+     *
+     * @param group a group
+     * @param type a type
+     * @param hostname a hostname
+     * @param service a service
+     * @param tag this is the tag name
+     * @return return tag value
+     **/
+    public String getTag(String group, String type, String hostname, String service, String tag) {
+    	HashMap<String, String> results = this.getGroupTags(group, type, hostname, service);
+    	if (results != null){
+    		return results.get(tag);
+    	}
+
+    	return null;
+    }
 
     /**
      * counts the items in the filtered list

diff --git a/flink_jobs_v2/Timelines/pom.xml b/flink_jobs_v2/Timelines/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>flink.jobs.v2</groupId>
         <artifactId>flink_jobs_v2</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0</version>
     </parent> 
     <groupId>timeline.manager</groupId>
     <artifactId>Timelines</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>