Merge branch 'bugfix/addsipfield' into 'master'

bugfix: add sip field "sip_bye_reason" See merge request galaxy/tsg_olap/sip-rtp-correlation!33
bugfix: add sip field "sip_bye_reason"
2024-08-21 07:46:09 +00:00 · 2024-08-21 15:42:46 +08:00 · 2024-08-21 15:29:27 +08:00 · 2024-08-21 14:24:17 +08:00
3 changed files with 24 additions and 3 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@

    <groupId>com.geedgenetworks.application</groupId>
    <artifactId>sip-rtp-correlation</artifactId>
-    <version>2.0-rc6</version>
+    <version>2.0-rc7</version>

    <name>Flink : SIP-RTP : Correlation</name>

--- a/src/main/resources/jobs/job.yml
+++ b/src/main/resources/jobs/job.yml
@@ -278,6 +278,8 @@ source:
        data-type: INT
      - name: sip_bye
        data-type: STRING
+      - name: sip_bye_reason
+        data-type: STRING
      ## RTP
      - name: rtp_payload_type_c2s
        data-type: INT
@@ -623,6 +625,8 @@ pipeline:
            data-type: INT
          - name: sip_bye
            data-type: STRING
+          - name: sip_bye_reason
+            data-type: STRING
          ## RTP
          - name: rtp_payload_type_c2s
            data-type: INT
@@ -654,6 +658,7 @@ pipeline:
                      FIND_NOT_BLANK(@v1.$sip_responder_sdp_content, sip_responder_sdp_content) AS sip_responder_sdp_content,
                      @v1.$sip_duration_s + sip_duration_s AS sip_duration_s,
                      FIND_NOT_BLANK(@v1.$sip_bye, sip_bye) AS sip_bye,
+                      FIND_NOT_BLANK(@v1.$sip_bye_reason, sip_bye_reason) AS sip_bye_reason,
                      rtp_payload_type_c2s,
                      rtp_payload_type_s2c,
                      rtp_pcap_path,
@@ -796,6 +801,7 @@ pipeline:
                          @v1.$sip_responder_sdp_content AS sip_responder_sdp_content,
                          @v1.$sip_duration_s AS sip_duration_s,
                          @v1.$sip_bye AS sip_bye,
+                          @v1.$sip_bye_reason AS sip_bye_reason,
                          @v1.$rtp_payload_type_c2s AS rtp_payload_type_c2s,
                          @v1.$rtp_payload_type_s2c AS rtp_payload_type_s2c,
                          @v1.$rtp_pcap_path AS rtp_pcap_path,
@@ -1066,6 +1072,8 @@ pipeline:
            data-type: INT
          - name: sip_bye
            data-type: STRING
+          - name: sip_bye_reason
+            data-type: STRING
          ## RTP
          - name: rtp_payload_type_c2s
            data-type: INT
@@ -1337,6 +1345,8 @@ pipeline:
            data-type: INT
          - name: sip_bye
            data-type: STRING
+          - name: sip_bye_reason
+            data-type: STRING
          ## RTP
          - name: rtp_payload_type_c2s
            data-type: INT
@@ -1411,7 +1421,7 @@ pipeline:
                        @i.$sent_bytes AS sent_bytes,
                        @i.$received_bytes AS received_bytes,
                        
-                        withColumns(sip_call_id to sip_bye), 
+                        withColumns(sip_call_id to sip_bye_reason), 
                      
                        @i.$rtp_payload_type_c2s AS rtp_payload_type_c2s,
                        @i.$rtp_payload_type_s2c AS rtp_payload_type_s2c,
@@ -1498,6 +1508,7 @@ pipeline:
                                @sip.$sip_responder_sdp_content AS sip_responder_sdp_content,
                                @sip.$sip_duration_s AS sip_duration_s,
                                @sip.$sip_bye AS sip_bye,
+                                @sip.$sip_bye_reason AS sip_bye_reason,
                
                                @i.$rtp_payload_type_c2s AS rtp_payload_type_c2s,
                                @i.$rtp_payload_type_s2c AS rtp_payload_type_s2c,
@@ -1632,6 +1643,7 @@ pipeline:
                            @i.$sip_responder_sdp_content AS sip_responder_sdp_content,
                            @i.$sip_duration_s AS sip_duration_s,
                            @i.$sip_bye AS sip_bye,
+                            @i.$sip_bye_reason AS sip_bye_reason,
                            @i.$rtp_payload_type_c2s AS rtp_payload_type_c2s,
                            @i.$rtp_payload_type_s2c AS rtp_payload_type_s2c,
                            @i.$rtp_pcap_path AS rtp_pcap_path,
@@ -1764,6 +1776,7 @@ pipeline:
                        @sip.$sip_responder_sdp_content AS sip_responder_sdp_content,
                        @sip.$sip_duration_s AS sip_duration_s,
                        @sip.$sip_bye AS sip_bye,
+                        @sip.$sip_bye_reason AS sip_bye_reason,
                        @sip.$rtp_payload_type_c2s AS rtp_payload_type_c2s,
                        @sip.$rtp_payload_type_s2c AS rtp_payload_type_s2c,
                        @sip.$rtp_pcap_path AS rtp_pcap_path,
--- a/src/site/markdown/download.md
+++ b/src/site/markdown/download.md
@@ -2,11 +2,19 @@

 ### ${project.version}

+- VoIP Record 增加字段: SIP `sip_bye_reason` 相关字段。
+
+| Easy Stream | UDF Jar                                                      | Job                                                          |
+|-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
+| ${easy.stream.version}         | [JAR](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.sha1) ) | [YML](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.sha1) ) |
+
+### 2.0-rc6
+
 - VoIP Record 增加字段: SIP， RTP `protocol` 相关字段。

 | Easy Stream | UDF Jar                                                      | Job                                                          |
 |-------------| ------------------------------------------------------------ | ------------------------------------------------------------ |
-| ${easy.stream.version}         | [JAR](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.jar.sha1) ) | [YML](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz) ( [MD5](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.md5) [SHA1](${project.distributionManagement.repository.url}/com/geedgenetworks/application/sip-rtp-correlation/${project.version}/${project.artifactId}-${project.version}.tar.gz.sha1) ) |
+| 1.3-rc1         | [JAR](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc6/sip-rtp-correlation-2.0-rc6.tar.gz.sha1) ) |

 ### 2.0-rc5
Author	SHA1	Message	Date
梁超	4ef6c25e69	Merge branch 'bugfix/addsipfield' into 'master' bugfix: add sip field "sip_bye_reason" See merge request galaxy/tsg_olap/sip-rtp-correlation!33	2024-08-21 07:46:09 +00:00
wangshuo	2d5f20362b	bugfix: add sip field "sip_bye_reason"	2024-08-21 15:42:46 +08:00
wangshuo	515a0ab312	bugfix: add sip field "sip_bye_reason"	2024-08-21 15:29:27 +08:00
wangshuo	9d0085a57c	bugfix: add sip field "sip_bye_reason"	2024-08-21 14:24:17 +08:00