feat: executor param support large string, max from 512 to 14000.

JavaFamilyClub · Nov 15, 2023 · a707343 · a707343
1 parent aaae50e
commit a707343
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/prometheus-webhook-qywechat/src/test/java/club/javafamily/prom/NotifyTests.java b/prometheus-webhook-qywechat/src/test/java/club/javafamily/prom/NotifyTests.java
@@ -16,7 +16,7 @@ public class NotifyTests {
    @Autowired
    private AlertController controller;
 
-   String body = "{\"alerts\":[{\"generatorURL\":\"http://0f802a1c941a:9090/graph?g0.expr=%28node_filesystem_size_bytes+-+node_filesystem_avail_bytes%29+%2F+node_filesystem_size_bytes+%2A+100+%3E+90&g0.tab=1\",\"fingerprint\":\"27d14486afb8e614\",\"annotations\":{\"template\":\"**${serviceName}**(${instance}) 服务器磁盘设备使用率超过 **90%**, 请及时处理！\\n挂载点: ${mountpoint}\\n当前值: ${value}%!\",\"instance\":\"192.168.100.192:9010\",\"link\":\"http://hxt.yijiweather.com/grafana/d/aka/duo-job-ji-cheng-fu-wu-qi-jian-kong\",\"serviceName\":\"测试服务器\",\"title\":\"磁盘使用率预警\",\"btn\":\"点击查看详情 :玫瑰:\",\"value\":\"90.86792536842535\",\"mountpoint\":\"/etc/resolv.conf\",\"token\":\"\"},\"startsAt\":\"2022-10-23T05:45:48.753Z\",\"endsAt\":\"2022-10-23T05:50:33.753Z\",\"status\":\"resolved\",\"labels\":{\"severity\":\"critical\",\"instance\":\"192.168.100.192:9010\",\"alertname\":\"磁盘使用率预警\",\"job\":\"dev-node-exportor\",\"serviceId\":\"node-exporter\",\"serviceName\":\"测试服务器\",\"device\":\"/dev/vdb\",\"fstype\":\"xfs\",\"mountpoint\":\"/etc/resolv.conf\"}}],\"commonLabels\":{\"severity\":\"critical\",\"instance\":\"192.168.100.192:9010\",\"alertname\":\"磁盘使用率预警\",\"job\":\"dev-node-exportor\",\"serviceId\":\"node-exporter\",\"serviceName\":\"测试服务器\",\"device\":\"/dev/vdb\",\"fstype\":\"xfs\",\"mountpoint\":\"/etc/resolv.conf\"},\"externalURL\":\"http://64ee495a6a31:9093\",\"groupLabels\":{\"severity\":\"critical\",\"instance\":\"192.168.100.192:9010\",\"alertname\":\"磁盘使用率预警\",\"job\":\"dev-node-exportor\",\"serviceId\":\"node-exporter\",\"serviceName\":\"测试服务器\",\"device\":\"/dev/vdb\",\"fstype\":\"xfs\",\"mountpoint\":\"/etc/resolv.conf\"},\"receiver\":\"webhook\",\"truncatedAlerts\":0,\"version\":\"4\",\"commonAnnotations\":{\"template\":\"**${serviceName}**(${instance}) 服务器磁盘设备使用率超过 **90%**, 请及时处理！\\n挂载点: ${mountpoint}\\n当前值: ${value}%!\",\"instance\":\"192.168.100.192:9010\",\"link\":\"http://hxt.yijiweather.com/grafana/d/aka/duo-job-ji-cheng-fu-wu-qi-jian-kong\",\"serviceName\":\"测试服务器\",\"title\":\"磁盘使用率预警\",\"btn\":\"点击查看详情 :玫瑰:\",\"value\":\"90.86792536842535\",\"mountpoint\":\"/etc/resolv.conf\",\"token\":\"\"},\"groupKey\":\"{}:{alertname=\\\"磁盘使用率预警\\\", device=\\\"/dev/vdb\\\", fstype=\\\"xfs\\\", instance=\\\"192.168.100.192:9010\\\", job=\\\"dev-node-exportor\\\", mountpoint=\\\"/etc/resolv.conf\\\", serviceId=\\\"node-exporter\\\", serviceName=\\\"测试服务器\\\", severity=\\\"critical\\\"}\",\"status\":\"resolved\"}\n";
+   String body = "{\"alerts\":[{\"generatorURL\":\"/prometheus/graph?g0.expr=up+%3D%3D+0&g0.tab=1\",\"fingerprint\":\"f9a231550eb9e1b7\",\"annotations\":{\"template\":\"节点 **${serviceName}**(${instance}) 断联, 请及时处理!\",\"instance\":\"172.16.2.21:9100\",\"link\":\"http://124.223.75.119:92/prometheus/targets\",\"pic\":\"https://www.haogebiji.com/wp-content/uploads/2021/04/2021043009064875-480x300.png\",\"serviceName\":\"Docker 运行环境服务器\",\"title\":\"节点宕机报警\",\"token\":\"7ae71e2e-15bb-4e8b-9283-86410004f060\"},\"startsAt\":\"2023-08-16T02:32:12.133Z\",\"endsAt\":\"0001-01-01T00:00:00Z\",\"status\":\"firing\",\"labels\":{\"severity\":\"emergency\",\"instance\":\"172.16.2.21:9100\",\"alertname\":\"实例存活报警\",\"job\":\"sd-nodes\",\"serviceId\":\"FileServiceDiscoveryNodeExporter\",\"serviceName\":\"Docker 运行环境服务器\",\"type\":\"File\",\"token\":\"7ae71e2e-15bb-4e8b-9283-86410004f060\"}}],\"commonLabels\":{\"severity\":\"emergency\",\"instance\":\"172.16.2.21:9100\",\"alertname\":\"实例存活报警\",\"job\":\"sd-nodes\",\"serviceId\":\"FileServiceDiscoveryNodeExporter\",\"serviceName\":\"Docker 运行环境服务器\",\"type\":\"File\",\"token\":\"7ae71e2e-15bb-4e8b-9283-86410004f060\"},\"externalURL\":\"http://1c85f9e2a64e:9093\",\"groupLabels\":{\"severity\":\"emergency\",\"instance\":\"172.16.2.21:9100\",\"alertname\":\"实例存活报警\",\"job\":\"sd-nodes\",\"serviceId\":\"FileServiceDiscoveryNodeExporter\",\"serviceName\":\"Docker 运行环境服务器\",\"type\":\"File\",\"token\":\"7ae71e2e-15bb-4e8b-9283-86410004f060\"},\"receiver\":\"web\\\\.hook\",\"truncatedAlerts\":0,\"version\":\"4\",\"commonAnnotations\":{\"template\":\"节点 **${serviceName}**(${instance}) 断联, 请及时处理!\",\"instance\":\"172.16.2.21:9100\",\"link\":\"http://124.223.75.119:92/prometheus/targets\",\"pic\":\"https://www.haogebiji.com/wp-content/uploads/2021/04/2021043009064875-480x300.png\",\"serviceName\":\"Docker 运行环境服务器\",\"title\":\"节点宕机报警\",\"token\":\"7ae71e2e-15bb-4e8b-9283-86410004f060\"},\"groupKey\":\"{}:{alertname=\\\"实例存活报警\\\", instance=\\\"172.16.2.21:9100\\\", job=\\\"sd-nodes\\\", serviceId=\\\"FileServiceDiscoveryNodeExporter\\\", serviceName=\\\"Docker 运行环境服务器\\\", severity=\\\"emergency\\\", token=\\\"7ae71e2e-15bb-4e8b-9283-86410004f060\\\", type=\\\"File\\\"}\",\"status\":\"firing\"}\n";
 
    @Test
    void testNotify() {

diff --git a/xxl-job-admin-mysql/src/main/resources/init.sql/tables_xxl_job.sql b/xxl-job-admin-mysql/src/main/resources/init.sql/tables_xxl_job.sql
@@ -38,7 +38,7 @@ CREATE TABLE if NOT EXISTS `xxl_job_log` (
   `job_id` int(11) NOT NULL COMMENT '任务，主键ID',
   `executor_address` varchar(255) DEFAULT NULL COMMENT '执行器地址，本次执行的地址',
   `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler',
-  `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数',
+  `executor_param` varchar(14000) DEFAULT NULL COMMENT '执行器任务参数',
   `executor_sharding_param` varchar(20) DEFAULT NULL COMMENT '执行器任务分片参数，格式如 1/2',
   `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数',
   `trigger_time` datetime DEFAULT NULL COMMENT '调度-时间',