gfwleak/galaxy-tsg-olap-sip-rtp-correlation
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/voip-fields' into 'master'

Browse Source 
bugfix: add field for 'VoIP' records

See merge request galaxy/tsg_olap/sip-rtp-correlation!32
This commit is contained in:
梁超
2024-07-23 07:39:33 +00:00
parent 9a39b814e6 319c73ec0a
commit 000436ec34
3 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -7,7 +7,7 @@
<groupId>com.geedgenetworks.application</groupId>
<artifactId>sip-rtp-correlation</artifactId>
<version>2.0-rc5</version>
<version>2.0-rc6</version>
<name>Flink : SIP-RTP : Correlation</name>

50
src/main/resources/jobs/job.yml
View File

@@ -1411,21 +1411,8 @@ pipeline:
@i.$sent_bytes AS sent_bytes,
@i.$received_bytes AS received_bytes,
@i.$sip_call_id AS sip_call_id,
@i.$sip_originator_description AS sip_originator_description,
@i.$sip_responder_description AS sip_responder_description,
@i.$sip_user_agent AS sip_user_agent,
@i.$sip_server AS sip_server,
@i.$sip_originator_sdp_connect_ip AS sip_originator_sdp_connect_ip,
@i.$sip_originator_sdp_media_port AS sip_originator_sdp_media_port,
@i.$sip_originator_sdp_media_type AS sip_originator_sdp_media_type,
@i.$sip_originator_sdp_content AS sip_originator_sdp_content,
@i.$sip_responder_sdp_connect_ip AS sip_responder_sdp_connect_ip,
@i.$sip_responder_sdp_media_port AS sip_responder_sdp_media_port,
@i.$sip_responder_sdp_media_type AS sip_responder_sdp_media_type,
@i.$sip_responder_sdp_content AS sip_responder_sdp_content,
@i.$sip_duration_s AS sip_duration_s,
@i.$sip_bye AS sip_bye,
withColumns(sip_call_id to sip_bye),
@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,
@@ -1496,25 +1483,26 @@ pipeline:
@i.$sent_bytes AS sent_bytes,
@i.$received_bytes AS received_bytes,
@i.$sip_call_id AS sip_call_id,
@i.$sip_originator_description AS sip_originator_description,
@i.$sip_responder_description AS sip_responder_description,
@i.$sip_user_agent AS sip_user_agent,
@i.$sip_server AS sip_server,
@i.$sip_originator_sdp_connect_ip AS sip_originator_sdp_connect_ip,
@i.$sip_originator_sdp_media_port AS sip_originator_sdp_media_port,
@i.$sip_originator_sdp_media_type AS sip_originator_sdp_media_type,
@i.$sip_originator_sdp_content AS sip_originator_sdp_content,
@i.$sip_responder_sdp_connect_ip AS sip_responder_sdp_connect_ip,
@i.$sip_responder_sdp_media_port AS sip_responder_sdp_media_port,
@i.$sip_responder_sdp_media_type AS sip_responder_sdp_media_type,
@i.$sip_responder_sdp_content AS sip_responder_sdp_content,
@i.$sip_duration_s AS sip_duration_s,
@i.$sip_bye AS sip_bye,
@sip.$sip_call_id AS sip_call_id,
@sip.$sip_originator_description AS sip_originator_description,
@sip.$sip_responder_description AS sip_responder_description,
@sip.$sip_user_agent AS sip_user_agent,
@sip.$sip_server AS sip_server,
@sip.$sip_originator_sdp_connect_ip AS sip_originator_sdp_connect_ip,
@sip.$sip_originator_sdp_media_port AS sip_originator_sdp_media_port,
@sip.$sip_originator_sdp_media_type AS sip_originator_sdp_media_type,
@sip.$sip_originator_sdp_content AS sip_originator_sdp_content,
@sip.$sip_responder_sdp_connect_ip AS sip_responder_sdp_connect_ip,
@sip.$sip_responder_sdp_media_port AS sip_responder_sdp_media_port,
@sip.$sip_responder_sdp_media_type AS sip_responder_sdp_media_type,
@sip.$sip_responder_sdp_content AS sip_responder_sdp_content,
@sip.$sip_duration_s AS sip_duration_s,
@sip.$sip_bye AS sip_bye,
@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,
( @i.$client_ip == sip_originator_sdp_connect_ip).?(1, (@i.$client_ip == sip_responder_sdp_connect_ip).?(2, 0) ) AS rtp_originator_dir
( @i.$client_ip == @sip.$sip_originator_sdp_connect_ip).?(1, (@i.$client_ip == @sip.$sip_responder_sdp_connect_ip).?(2, 0) ) AS rtp_originator_dir
- SCHEDULING USING PROCESS TIME FOR NOW + 6 * 60 * 1000
schedule:
- if: '@rtp.isNotNull && @rtp.cardinality > 0'

10
src/site/markdown/download.md
View File

@@ -2,11 +2,19 @@
### ${project.version}
- 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) ) |
### 2.0-rc5
- 修复 VoIP 字段错误，使用 `decoded_as` 表示 VoIP 日志。
| 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-rc5/sip-rtp-correlation-2.0-rc5.jar) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc5/sip-rtp-correlation-2.0-rc5.jar.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc5/sip-rtp-correlation-2.0-rc5.jar.sha1) ) | [YML](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc5/sip-rtp-correlation-2.0-rc5.tar.gz) ( [MD5](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc5/sip-rtp-correlation-2.0-rc5.tar.gz.md5) [SHA1](http://192.168.40.153:8081/content/repositories/platform-release/com/geedgenetworks/application/sip-rtp-correlation/2.0-rc5/sip-rtp-correlation-2.0-rc5.tar.gz.sha1) ) |
### 2.0-rc4