#3550: [fix-#11753] send alert error alert data id (#11774)

* [fix-#11753] send alert error alert data id

Co-authored-by: fuchanghai <changhai.fu@marketingforce.com>

commit.ref

@@ -1 +1 @@
-Subproject commit 57fafe42567b434d5a8ef4673ca5d9796cc4dd05
+Subproject commit e27c79974d93d0d4181a0f5dbe45159084e224d3

commit.yml

@@ -3,84 +3,180 @@ branches: {
   }
 fileChange:
   /dolphinscheduler-api:
-    newFile: !uuid '03a39c26f76e54ec49cba7e77976b660dccb8d59'
+    newFile: !uuid '72feeaaac7307374a740dfac37c73b7d5ecfda9f'
-    oldFile: !uuid 'a50932e360ed4f96900dd26c2899ecb9cb256255'
+    oldFile: !uuid '03a39c26f76e54ec49cba7e77976b660dccb8d59'
-  /dolphinscheduler-api/pom.xml:
-    newFile: !uuid '66df53785b48bac539c7a3d4b49ad68e29c1920b'
-    oldFile: !uuid 'fee8b2505653b7670063c95097464664f3bdcbaf'
   /dolphinscheduler-api/src:
-    newFile: !uuid '69a1a121958a3f0fb2949301e4e7aac27704b0ad'
+    newFile: !uuid '1b383111eac240f33a7fdbe3177aefbae9cc3c9e'
-    oldFile: !uuid 'b63c4784ff13ee776e4448bf4ef4fe9d8a1859f5'
+    oldFile: !uuid '69a1a121958a3f0fb2949301e4e7aac27704b0ad'
+  /dolphinscheduler-api/src/main:
+    newFile: !uuid 'a5fc34779f21ab33af9076e23a6c76b4ae7db376'
+    oldFile: !uuid '7575cd2b223d8239a05027950ea73f20c97a3664'
+  /dolphinscheduler-api/src/main/java:
+    newFile: !uuid '730ee8ee693655894182ff679a78d4761657a2ca'
+    oldFile: !uuid '27f6d41b9e5eb67d83c2cca6702463866a16fa46'
+  /dolphinscheduler-api/src/main/java/org:
+    newFile: !uuid '1f301c3b188d303b23ef66387eef0e701174f9f2'
+    oldFile: !uuid '1b1ec97402622a96ade7b7a78755fe2ea5b3aea1'
+  /dolphinscheduler-api/src/main/java/org/apache:
+    newFile: !uuid '76b59f8a4fdf92340a0817b00b1bd2e75050a05c'
+    oldFile: !uuid '2382ad7f2938d7991958bcb2b123738bffcd04e3'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'ae060ba3ffa1e84656e5e3def888fe2188dc2108'
+    oldFile: !uuid '3692752e24bf9ba36adc5a768eef94b9feb76ffb'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api:
+    newFile: !uuid 'df4f44d690512201a021d2ecdfad5db6ecfa3e7c'
+    oldFile: !uuid '9a2bca97f71e416c82ee42cd93273a3679cd7613'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller:
+    newFile: !uuid 'd4dbffdea34000da18278fa62c661622996e1aa9'
+    oldFile: !uuid '8832eb85def4568d635494acbde977023e0d2898'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java:
+    newFile: !uuid '98e69ab1f4f1bc1cf13117eaa5c77f44cf3a21ab'
+    oldFile: !uuid 'c120fb0fc13958b88ee23efb6fa6ecae1ef9fd7e'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python:
+    newFile: !uuid '07a46ffba25039bfed74869601af5b3728240e30'
+    oldFile: !uuid 'e539cef9b3a0b65653497d63239b64275ea0c92b'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java:
+    newFile: !uuid '89fcc5fcf327301554171704df2a74e1490b7b5e'
+    oldFile: !uuid '93b3c9124864ed71f74a2642dd70cdb0d9ca15dc'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service:
+    newFile: !uuid '997fc265ec80ffe0bb0ab4a7ae667be03d49bbc1'
+    oldFile: !uuid '5525374ccf3d2bd824d0bd36664d61965a7d2453'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java:
+    newFile: !uuid '9aaabb36b671dd60410e416dd175ad2f09921f50'
+    oldFile: !uuid 'df44dc1445ec4e3f45b77ad15fadf4949c1c2696'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl:
+    newFile: !uuid '703bca966d1b315ab5ccf9faaf6db11d9e2ed3e7'
+    oldFile: !uuid 'b742a9abbad38d23b6a0a8e3d2279fd86a35c632'
+  /dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java:
+    newFile: !uuid '41ac529318411e7cd48d28e53901793a10b6bf5e'
+    oldFile: !uuid 'a5bfe2780aa78e7ce6b9b1969cb36546df5d20f2'
   /dolphinscheduler-api/src/test:
-    newFile: !uuid '4b03d00bda4849c43baaf6683786d58faa320103'
+    newFile: !uuid 'df39d3c3a780835fee0146d57c72957672194209'
-    oldFile: !uuid 'ee11801a9278ca85b76cd4b011772986705a8c37'
+    oldFile: !uuid '4b03d00bda4849c43baaf6683786d58faa320103'
   /dolphinscheduler-api/src/test/java:
-    newFile: !uuid '47d75fa88b1587dda51bc72bf655c04088953900'
+    newFile: !uuid 'bfaedf6a30faea66e557441a69274ac29367512d'
-    oldFile: !uuid 'c7ef259ffeaacafbcc7ddaa1c7a7f68b696aea3e'
+    oldFile: !uuid '47d75fa88b1587dda51bc72bf655c04088953900'
   /dolphinscheduler-api/src/test/java/org:
-    newFile: !uuid 'e535405f8f2e8f567bf560920e091b271e3f3b04'
+    newFile: !uuid '68780cc2b718fc37491b7cb3d8b1c5d56108c0a0'
-    oldFile: !uuid '72632b785aa5d4e6f54b37c9ecc2414c715e0ae8'
+    oldFile: !uuid 'e535405f8f2e8f567bf560920e091b271e3f3b04'
   /dolphinscheduler-api/src/test/java/org/apache:
-    newFile: !uuid 'd9ce213c7172641af1b712b25a56ba9068aba9c3'
+    newFile: !uuid '22733658d4c47b65d8bff5a9d424aef529e8b6dc'
-    oldFile: !uuid '7e89ed6c13690f514098d089b3b057acc4dcbe37'
+    oldFile: !uuid 'd9ce213c7172641af1b712b25a56ba9068aba9c3'
   /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler:
-    newFile: !uuid '2c8b0b3f12f4abb8fab05e11cf6bd5fb05c072d8'
+    newFile: !uuid '30e9bcc2afdc1bee929aa968ee1789bbc6ff2b11'
-    oldFile: !uuid '8a5055dd4dc325945fcec3f838150a463e6b972b'
+    oldFile: !uuid '2c8b0b3f12f4abb8fab05e11cf6bd5fb05c072d8'
   /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api:
-    newFile: !uuid '41eea782b880858ff0f72b44b2dde7e9b4d6e453'
+    newFile: !uuid '7939a9bccbcc1bf0925e405ba1f6f2f1c7b000b9'
-    oldFile: !uuid 'c58569b56810235224f17b7749eafdfd1d6dce71'
+    oldFile: !uuid '41eea782b880858ff0f72b44b2dde7e9b4d6e453'
   /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller:
-    newFile: !uuid '9c94e536441f62c198625bdb28ea26c2c6658493'
+    newFile: !uuid '903426c1c5dffdd3378409970d96ec5b60e0458a'
-    oldFile: !uuid '6e889bcfadadcc613fa0288d7def4a01e9974614'
+    oldFile: !uuid '9c94e536441f62c198625bdb28ea26c2c6658493'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/DataAnalysisControllerTest.java:
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ExecutorControllerTest.java:
-    newFile: !uuid '66e9b9ce0b6afd464a97b52196851c7af1c0c8db'
+    newFile: !uuid 'fcfa068ae4e0d3755b4683e147f6ecb47f29a36e'
-    oldFile: !uuid '636a1ec0a4db1ad5614c6b2999b5530ea9cd81dc'
+    oldFile: !uuid 'f55aa9f8be6f3d907791096b68780abbdc898f0d'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java:
-    newFile: !uuid '56cbee73dc2db2c4e56a2f4455562322861c1ea2'
-    oldFile: !uuid '8f4fd9902d2787fa7fa3667968009d3be2a62a12'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessTaskRelationControllerTest.java:
-    newFile: !uuid 'ca675812e05afa36d6f7dd8645fbb2f3d799b991'
-    oldFile: !uuid '8649d32cbd1b19f43b1578cef9ff0d0fedd2fed8'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ResourcesControllerTest.java:
-    newFile: !uuid 'd499a35125fd1de25770d10b04f1b06d5f3ea18e'
-    oldFile: !uuid '3be552f878380a71dc787f044a6b9c87ee205f3b'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/WorkerGroupControllerTest.java:
-    newFile: !uuid '118a82eb6d4c85c29bdbd9345ba2cd4be19c5743'
-    oldFile: !uuid '72bad1e686c0022c2b3f8144f0659a72de4d4213'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/interceptor:
-    newFile: !uuid 'f4b48fc367c96475ad006748210af911c567acd3'
-    oldFile: !uuid '7ad5af98abc648949d18134ee630e613ba8b98ef'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/interceptor/RateLimitInterceptorTest.java:
-    newFile: !uuid 'e1eef9e41db77eaea257cc4bd40db86c21f609ce'
-    oldFile: !uuid 'c903df50099d62166a411d412023e9b57d55b256'
   /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service:
-    newFile: !uuid '308c36d0350bb7f30fa61380ed7e0bbc9c50788f'
+    newFile: !uuid '032c2b5c6b44b643f8c7ad43425a9bb2193385b9'
-    oldFile: !uuid '318ba13f9bf828ec50c4f9dc62eed947a3f119ac'
+    oldFile: !uuid '308c36d0350bb7f30fa61380ed7e0bbc9c50788f'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java:
+  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java:
-    newFile: !uuid 'eefc6ce254000522c1b0e19c2301e7a2f4d0d0c8'
+    newFile: !uuid '8a8fd243a1cd3c203ac49b1ffab54eda7416290d'
-    oldFile: !uuid '49b3c1c2991da6643d7402ea728ce2f7ba26504b'
+    oldFile: !uuid 'e50fb31ce9229d9d7f3f56e1a775c8885f26d881'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java:
+  /dolphinscheduler-dao:
-    newFile: !uuid 'd732be6f03c122bf792d2ed90d926c201158adfa'
+    newFile: !uuid 'ff904885bd6a6b31c9a5a21bf5ee30a52fc8a50e'
-    oldFile: !uuid '1ae0455f614c953c7f4da4ea92429ca40e7851a8'
+    oldFile: !uuid '5a4e0b0b4f4f2d2d9db48952983affbd440ff21e'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java:
+  /dolphinscheduler-dao/src:
-    newFile: !uuid 'cf13f7f20a681e2886ee007f8d399c2af47ce341'
+    newFile: !uuid 'a10fbb464cbaa6cbb0c75379a828be0d1a2a7594'
-    oldFile: !uuid 'd5e6ac554ed1518aa64ce82386291a50a8ef23bd'
+    oldFile: !uuid 'dfdadeb0a9fc23f7762a97a13efb61e58a2da329'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java:
+  /dolphinscheduler-dao/src/main:
-    newFile: !uuid '6fc0dd5ebbbaadbca1d283647bdf16ac636a56e6'
+    newFile: !uuid '3e4206838b5481310671320b6182cbd8737ce55e'
-    oldFile: !uuid '1391ee0857d6aaba6ad9851a5da621c563458db2'
+    oldFile: !uuid 'e9b74062bfa6c5e17fe8940cecc1661b2696e267'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ResourcesServiceTest.java:
+  /dolphinscheduler-dao/src/main/java:
-    newFile: !uuid 'e1702560020f65c377811aed2572cc0d828c5da8'
+    newFile: !uuid '17ce10917dfb4394592b794e449ee7a4ac27dfc5'
-    oldFile: !uuid 'fd394a2c0faa1f774f2e60eaaf12b26d990f3934'
+    oldFile: !uuid 'af29cc01311609b4a9e4e1646608851f346f3c25'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/SchedulerServiceTest.java:
+  /dolphinscheduler-dao/src/main/java/org:
-    newFile: !uuid '5d65d96ea3d6a4461c02273171b77e37513095be'
+    newFile: !uuid 'df9521536ea85abefe9f2a87ae188154719c9ee0'
-    oldFile: !uuid '1e8b1a698c6534166cbed9ec6bb3af7df0b410b8'
+    oldFile: !uuid '8ef2d825fc211caa062d575de0c385d0c690779f'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java:
+  /dolphinscheduler-dao/src/main/java/org/apache:
-    newFile: !uuid '2c0419474b7918223eaf948fba4dfdede5f84a46'
+    newFile: !uuid '1122769ec535e64d537bdc51840b1d78f5f2c76f'
-    oldFile: !uuid '0ff9d4c5de296efe6486013a22834a44dcd7dadf'
+    oldFile: !uuid '66eb691729aae32c8f1337d917ee67dc08a9baae'
-  /dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UdfFuncServiceTest.java:
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler:
-    newFile: !uuid '31145857d04acd7434d1b7905a7036a418250f76'
+    newFile: !uuid '275fc39cf0890838b4f522235198e02879bb359e'
-    oldFile: !uuid 'b96ab81abd5df0cb665546499d0cb8bce3c57767'
+    oldFile: !uuid '3f9b1fdb5afbf13ca80ee23678af2bf239a04067'
-gitCommitId: !uuid '57fafe42567b434d5a8ef4673ca5d9796cc4dd05'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao:
+    newFile: !uuid 'af185120d8183a99273cc09ecc40a457806e9787'
+    oldFile: !uuid 'c91e0c40c07972083d3916ad78d80999f7862c17'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java:
+    newFile: !uuid 'dfdf4521a6e3c24016d3703908e1d05e90b456df'
+    oldFile: !uuid '169aa7aab98a4bfbff6ea13eaf46b9a3990f7117'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity:
+    newFile: !uuid '7ca4599778cd9a38461a8f3bdc8d772f006ffb27'
+    oldFile: !uuid '9f028f572437e490f7ca1d47cb365485e72a2d8f'
+  /dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java:
+    newFile: !uuid '27df7bd573c117fc1fa6ba9e48b9ead3fdb73359'
+    oldFile: !uuid '6e7414c2869037e7bd45631b1c1bebf0ce6482e1'
+  /dolphinscheduler-master:
+    newFile: !uuid '247cae008da6a7fbd0049660b0d7aa76970c0943'
+    oldFile: !uuid '3d53ea24239aa2c78877b52d468787cac0302299'
+  /dolphinscheduler-master/src:
+    newFile: !uuid 'ba72fa0cdfc0e2a8c90f34b355327fd700e338c3'
+    oldFile: !uuid '2b024c858137ce432bde57ecfcba02b6d16172d9'
+  /dolphinscheduler-master/src/main:
+    newFile: !uuid '989f0cb94370f822a8da721ae27d52c54db99223'
+    oldFile: !uuid '5be32c716d6e77a3bedbe9c174d0d59d808d79ef'
+  /dolphinscheduler-master/src/main/java:
+    newFile: !uuid 'e36ffc4f219816af855f7dc476f925c97580fe74'
+    oldFile: !uuid '2e4ebd6a512a17f34b9b531b82d4b1aadfa681ed'
+  /dolphinscheduler-master/src/main/java/org:
+    newFile: !uuid '77e35663dbecaa5b5cbfe9c46f7b7b77d70367d8'
+    oldFile: !uuid '22df7ef0f9dd7c04a4d5495597c61bc971aff3d8'
+  /dolphinscheduler-master/src/main/java/org/apache:
+    newFile: !uuid 'afad6a3dcf09be729d31478e5f90456c2b22ddd0'
+    oldFile: !uuid 'ddf449ba44c463cd538fca50d5b01d0ffc9bfcb9'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid 'c48d92f8ee209a9256a363c0c5306c97914bd657'
+    oldFile: !uuid '58dafaaafe612b7a30ddcf07bc9f0ae355de7691'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server:
+    newFile: !uuid 'ea5f4c10270ea4ec00c7ebb67255dee936999cbb'
+    oldFile: !uuid 'eb2fe1b223154ebc8e18ca03df9e127330bd9e05'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master:
+    newFile: !uuid '37bace90d8dfa24e764f7675d1f74bbb44bbf793'
+    oldFile: !uuid '5db5e14022f06b255a2a514979aabe2dc676d0c7'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner:
+    newFile: !uuid '6ec4a09099f65d3fe8bdde153dde091b95d40c6f'
+    oldFile: !uuid 'd6ee7f062984fc68d7fd012aec16e93e42ae3954'
+  /dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java:
+    newFile: !uuid '7716314444273e20076ca7ed634da366508ad72c'
+    oldFile: !uuid '3d448f2ebf7c1120f586619e92702c6f41a11e3a'
+  /dolphinscheduler-service:
+    newFile: !uuid '623f708d74fbc5ae20a2d1c8836002011a17b2e2'
+    oldFile: !uuid '8f5bb2670ca177cef628176dc22d5f65521278e8'
+  /dolphinscheduler-service/src:
+    newFile: !uuid 'f43a38a4561b30f70119c0eec8959bdb645533bf'
+    oldFile: !uuid '6a230164aef23347c1e30c0d90f12905ab56827c'
+  /dolphinscheduler-service/src/main:
+    newFile: !uuid '29ffdfe9ca4a35d64589f46bf77214afeb9c5989'
+    oldFile: !uuid '80fefcae8ba022dc6a5094f000a4f98bf3a8613c'
+  /dolphinscheduler-service/src/main/java:
+    newFile: !uuid 'ea6625b8e70de15e7c12616d431a27e745095bee'
+    oldFile: !uuid '1cf9733f3294da9c2ca774dc6ea08bfcec0b83a8'
+  /dolphinscheduler-service/src/main/java/org:
+    newFile: !uuid 'd9b3649401ae68108fefe0940e2aea127c3984d2'
+    oldFile: !uuid '0ff67c5e561573a02faf1ca4678d10e104cb6e7e'
+  /dolphinscheduler-service/src/main/java/org/apache:
+    newFile: !uuid '3f905499387ceb9ed096a3f6f7220bce45a26cb3'
+    oldFile: !uuid '5fcf0ac1469b6d8b565052d24bd638c87c5e5473'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler:
+    newFile: !uuid '26121013e1ebb2d0016caa52028de0115c17defd'
+    oldFile: !uuid 'a10737c774d2d94790fb18ecd2a41800ab283a86'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service:
+    newFile: !uuid '4e6eb096dec2ee2fa958332dfbd2e5101c1bcf83'
+    oldFile: !uuid 'eedd5b92884a34a36c641fd60ceb28eec9479bfd'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert:
+    newFile: !uuid 'd5c6695cf31d4e4be2449590a07dea7aa6dd21bb'
+    oldFile: !uuid 'ae2b94631ce128b71ca2c377a87f19a81f3fc39a'
+  /dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/alert/ProcessAlertManager.java:
+    newFile: !uuid '2604354fbcbf4b11de305adf1951b2dc4b5fcd61'
+    oldFile: !uuid 'ab8b162c08bcc7906230da727d9c69f5ed2774dd'
+gitCommitId: !uuid 'e27c79974d93d0d4181a0f5dbe45159084e224d3'
 renames: {
   }
-revisionId: 3549
+revisionId: 3550