Upgraded the Version to 1.2.3

Change-Id: I3bc46d0a75001445d8781135536de300cdb0a087
Issue-ID: HOLMES-181
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/pom.xml b/pom.xml
index 463e18d..1cf76ef 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
 \r
     <groupId>org.onap.holmes.rule-management</groupId>\r
     <artifactId>holmes-rulemgt-parent</artifactId>\r
-    <version>1.2.2-SNAPSHOT</version>\r
+    <version>1.2.3</version>\r
     <packaging>pom</packaging>\r
     <name>holmes-rule-management</name>\r
     <modules>\r

diff --git a/rulemgt-frontend/pom.xml b/rulemgt-frontend/pom.xml
index 02ffe35..1010c96 100644 (file)
--- a/rulemgt-frontend/pom.xml
+++ b/rulemgt-frontend/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.onap.holmes.rule-management</groupId>
     <artifactId>holmes-rulemgt-parent</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
 
   <artifactId>holmes-rulemgt-frontend</artifactId>

diff --git a/rulemgt-standalone/pom.xml b/rulemgt-standalone/pom.xml
index 55ea629..6200ef3 100644 (file)
--- a/rulemgt-standalone/pom.xml
+++ b/rulemgt-standalone/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.holmes.rule-management</groupId>
         <artifactId>holmes-rulemgt-parent</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.3</version>
     </parent>
 
     <artifactId>holmes-rulemgt-standalone</artifactId>

diff --git a/rulemgt-standalone/src/main/assembly/Dockerfile b/rulemgt-standalone/src/main/assembly/Dockerfile
index 080d7ca..0263890 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/Dockerfile
+++ b/rulemgt-standalone/src/main/assembly/Dockerfile
@@ -39,7 +39,7 @@ RUN apk upgrade \
 RUN rm /etc/nginx/conf.d/default.conf
 RUN mkdir -p /etc/ssl/certs/
 RUN mkdir /etc/ssl/private
-ADD holmes-rulemgt-frontend-*.tar.gz /usr/local/openresty/nginx/html
+ADD holmes-rulemgt-frontend-*.tar.gz /usr/local/openresty/nginx/html/
 ADD nginx.conf /usr/local/openresty/nginx/conf
 ADD holmes-frontend.key /etc/ssl/private
 ADD holmes-frontend-selfsigned.crt /etc/ssl/certs

diff --git a/rulemgt-standalone/src/main/assembly/fms-seq.puml b/rulemgt-standalone/src/main/assembly/fms-seq.puml
new file mode 100644 (file)
index 0000000..3451062
--- /dev/null
+++ b/rulemgt-standalone/src/main/assembly/fms-seq.puml
@@ -0,0 +1,47 @@
+@startuml
+actor 用户 as user
+
+participant EMS as ems
+box "FMS" #EFEFEF
+participant 探针 as probe
+participant 客户端 as ui
+participant 服务端 as server
+participant RCA as rca
+end box
+database DB as db
+participant GI资源 as gi
+
+user -> probe: 创建并启动探针
+user -> rca: 创建并启动规则
+
+ [-> ems: 网元告警
+ ems -> probe: EMS告警
+ probe -> probe: 转换为FMS告警格式
+
+ probe -> server: 转换后的告警
+
+server -> gi: 资源查询
+gi --> server: 资源信息
+
+server -> server: 告警丰富
+
+server -> server: 告警规则处理
+
+server -> db: 告警存储
+
+server -> rca: 告警
+rca -> gi: 资源拓扑查询请求
+gi --> rca: 资源拓扑信息
+rca -> rca: 告警相关性分析
+rca -> server: 告警相关性分析结果
+server -> db: 告警相关性分析结果
+
+user -> ui: 告警查询/监控请求
+ui -> server: 告警查询
+server -> db: 告警查询
+db --> server: 告警查询结果
+server --> ui: 告警查询结果
+ui --> user: 告警查询结果
+
+
+@enduml
\ No newline at end of file

diff --git a/rulemgt/pom.xml b/rulemgt/pom.xml
index 1b93729..49d6d27 100644 (file)
--- a/rulemgt/pom.xml
+++ b/rulemgt/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.holmes.rule-management</groupId>
         <artifactId>holmes-rulemgt-parent</artifactId>
-        <version>1.2.2-SNAPSHOT</version>
+        <version>1.2.3</version>
     </parent>
 
     <artifactId>holmes-rulemgt</artifactId>

diff --git a/version.properties b/version.properties
index cfb32e0..08d323a 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 \r
 major=1\r
 minor=2\r
-patch=2\r
+patch=3\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r