Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge: master->3.6.x #1396

Merged
merged 69 commits into from
Sep 27, 2022
Merged

Merge: master->3.6.x #1396

merged 69 commits into from
Sep 27, 2022

Commits on Sep 2, 2022

  1. bugfix: 执行详情，根据ip过滤主机，每个结果分组上显示的主机总数错误 #1247

    @wangyu096
    wangyu096 committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    19a2728 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/Tencent/bk-job into featu… 

    …re/rolling
    @wangyu096
    wangyu096 committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    5f0e6e4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1248 from wangyu096/feature/rolling 

    bugfix: 执行详情，根据ip过滤主机，每个结果分组上显示的主机总数错误 #1247
    @jsonwan
    jsonwan authored Sep 2, 2022
    Configuration menu
    Copy the full SHA
    4516f8b View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2022

  1. feature: 滚动执行新增DB表的数据归档 #1196 

    修改归档任务的分布式锁过期时间为24h
    @wangyu096
    wangyu096 committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    a446337 View commit details
    Browse the repository at this point in the history

  2. feature: 滚动执行新增DB表的数据归档 #1196 

    计算归档的task_instance_id/step_instance_id优化
    @wangyu096
    wangyu096 committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    182d044 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/Tencent/bk-job into featu… 

    …re/rolling
    @wangyu096
    wangyu096 committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    5a59694 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1250 from wangyu096/feature/rolling 

    feature: 滚动执行新增DB表的数据归档 #1196
    @wangyu096
    wangyu096 authored Sep 5, 2022
    Configuration menu
    Copy the full SHA
    5acc165 View commit details
    Browse the repository at this point in the history

  5. bugfix: 容器环境，停止微服务没有触发shutdown hook #1251

    @wangyu096
    wangyu096 committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    640caf1 View commit details
    Browse the repository at this point in the history

  6. bugfix: 容器环境，停止微服务没有触发shutdown hook #1251

    @wangyu096
    wangyu096 committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    f21fc86 View commit details
    Browse the repository at this point in the history

  7. bugfix: 容器环境，停止微服务没有触发shutdown hook #1251

    @wangyu096
    wangyu096 committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    964bf90 View commit details
    Browse the repository at this point in the history

  8. bugfix: 容器环境，停止微服务没有触发shutdown hook #1251

    @wangyu096
    wangyu096 committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    7d54be5 View commit details
    Browse the repository at this point in the history

  9. bugfix: 容器环境，停止微服务没有触发shutdown hook #1251

    @wangyu096
    wangyu096 committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    6a2fb57 View commit details
    Browse the repository at this point in the history

  10. bugfix: 容器环境，停止微服务没有触发shutdown hook #1251

    @wangyu096
    wangyu096 committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    1b5a2f9 View commit details
    Browse the repository at this point in the history

  11. bugfix: 容器环境，停止微服务没有触发shutdown hook #1251

    @wangyu096
    wangyu096 committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    057d46e View commit details
    Browse the repository at this point in the history

  12. Merge pull request #1252 from wangyu096/feature/rolling 

    bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
    @jsonwan
    jsonwan authored Sep 5, 2022
    Configuration menu
    Copy the full SHA
    64338a5 View commit details
    Browse the repository at this point in the history

  13. bugfix: 容器环境，停止微服务没有触发shutdown hook #1251

    @wangyu096
    wangyu096 committed Sep 5, 2022
    Configuration menu
    Copy the full SHA
    e53d1e9 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #1253 from wangyu096/feature/rolling 

    bugfix: 容器环境，停止微服务没有触发shutdown hook #1251
    @wangyu096
    wangyu096 authored Sep 5, 2022
    Configuration menu
    Copy the full SHA
    a7bfb47 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2022

  1. Merge pull request #1261 from Tencent/3.6.x 

    Merge: 3.6.x->master
    @jsonwan
    jsonwan authored Sep 7, 2022
    Configuration menu
    Copy the full SHA
    a05cc20 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1265 from Tencent/3.6.x 

    Merge: 3.6.x->master
    @jsonwan
    jsonwan authored Sep 7, 2022
    Configuration menu
    Copy the full SHA
    b221f62 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2022

  1. Merge pull request #1270 from hLinx/3.5.x 

    3.5.x
    @hLinx
    hLinx authored Sep 9, 2022
    Configuration menu
    Copy the full SHA
    fa5580d View commit details
    Browse the repository at this point in the history

  2. Merge branch '3.6.x' into github_master

    @jsonwan
    jsonwan committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    7918897 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1274 from jsonwan/master 

    Merge: 3.6.x->master
    @jsonwan
    jsonwan authored Sep 9, 2022
    Configuration menu
    Copy the full SHA
    03d455f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1277 from hLinx/3.5.x 

    bugfix: 作业模板和执行方案对“必填”字段的命名没有统一 #1219
    @hLinx
    hLinx authored Sep 9, 2022
    Configuration menu
    Copy the full SHA
    e4c0266 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2022

  1. bugfix: esb push_config_file API 调用，源主机IP不应该校验 #1281

    @wangyu096
    wangyu096 committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    cdc9212 View commit details
    Browse the repository at this point in the history

  2. bugfix: esb push_config_file API 调用，源主机IP不应该校验 #1281

    @wangyu096
    wangyu096 committed Sep 13, 2022
    Configuration menu
    Copy the full SHA
    f7db30a View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2022

  1. Merge pull request #1282 from wangyu096/feature/rolling 

    bugfix: esb push_config_file API 调用，源主机IP不应该校验 #1281
    @jsonwan
    jsonwan authored Sep 14, 2022
    Configuration menu
    Copy the full SHA
    062359a View commit details
    Browse the repository at this point in the history

  2. perf: job获取脚本列表接口响应慢 #1205

    @wangyu096
    wangyu096 committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    68c7b5e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/Tencent/bk-job into featu… 

    …re/rolling
    @wangyu096
    wangyu096 committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    1758a92 View commit details
    Browse the repository at this point in the history

  4. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    使用纯SDK
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    a5e586f View commit details
    Browse the repository at this point in the history

  5. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    线程池创建使用Spring Bean
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    bc00c42 View commit details
    Browse the repository at this point in the history

  6. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    BizCmdbClient线程池创建使用Spring Bean
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    47c5f60 View commit details
    Browse the repository at this point in the history

  7. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    各处线程池创建使用Spring Bean
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    cdb54b4 View commit details
    Browse the repository at this point in the history

  8. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    去除javaagent相关代码
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    8102916 View commit details
    Browse the repository at this point in the history

  9. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    自定义Otel SpanExporter配置
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    95db4b3 View commit details
    Browse the repository at this point in the history

  10. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    增加trace上报相关参数配置
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    39ec164 View commit details
    Browse the repository at this point in the history

  11. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    解决编译问题
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    9c1b005 View commit details
    Browse the repository at this point in the history

  12. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    QueryAgentStatusClient自动装配设为非强依赖
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    39dc68c View commit details
    Browse the repository at this point in the history

  13. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    FlowController自动装配设为非强依赖
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    5b4d004 View commit details
    Browse the repository at this point in the history

  14. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    FlowController自动装配设为非强依赖
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    574af21 View commit details
    Browse the repository at this point in the history

  15. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    支持设置trace采样比率
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    c025fb0 View commit details
    Browse the repository at this point in the history

  16. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    支持设置trace采样比率
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    d0f6170 View commit details
    Browse the repository at this point in the history

  17. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    抽取公共common-otel模块，file-worker支持trace上报
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    67b33fc View commit details
    Browse the repository at this point in the history

  18. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    代码优化
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    b3c488c View commit details
    Browse the repository at this point in the history

  19. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    移除javaagent
    @jsonwan
    jsonwan committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    734a28e View commit details
    Browse the repository at this point in the history

  20. perf: job获取脚本列表接口响应慢 #1205

    @wangyu096
    wangyu096 committed Sep 14, 2022
    Configuration menu
    Copy the full SHA
    540101b View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2022

  1. Merge pull request #1284 from wangyu096/feature/rolling 

    perf: job获取脚本列表接口响应慢 #1205
    @jsonwan
    jsonwan authored Sep 15, 2022
    Configuration menu
    Copy the full SHA
    f2993a1 View commit details
    Browse the repository at this point in the history

  2. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    代码优化
    @jsonwan
    jsonwan committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    cb650ea View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1283 from jsonwan/github_perf/apm 

    perf: 接入蓝鲸监控APM调用链追踪 #1161
    @wangyu096
    wangyu096 authored Sep 15, 2022
    Configuration menu
    Copy the full SHA
    7295760 View commit details
    Browse the repository at this point in the history

  4. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    修复集成测试
    @jsonwan
    jsonwan committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    f89cdc8 View commit details
    Browse the repository at this point in the history

  5. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    修复集成测试
    @jsonwan
    jsonwan committed Sep 15, 2022
    Configuration menu
    Copy the full SHA
    08736a9 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1288 from jsonwan/github_perf/apm 

    perf: 接入蓝鲸监控APM调用链追踪 #1161
    @wangyu096
    wangyu096 authored Sep 15, 2022
    Configuration menu
    Copy the full SHA
    5c90556 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1290 from hLinx/3.5.x 

    3.5.x
    @hLinx
    hLinx authored Sep 15, 2022
    Configuration menu
    Copy the full SHA
    6d596e7 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2022

  1. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    支持JDBC调用MySQL追踪
    @jsonwan
    jsonwan committed Sep 18, 2022
    Configuration menu
    Copy the full SHA
    92dbdee View commit details
    Browse the repository at this point in the history

  2. perf: 接入蓝鲸监控APM调用链追踪 #1161 

    容器化配置调整
    @jsonwan
    jsonwan committed Sep 18, 2022
    Configuration menu
    Copy the full SHA
    f683f66 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2022

  1. Merge pull request #1292 from jsonwan/github_perf/apm 

    perf: 接入蓝鲸监控APM调用链追踪 #1161
    @wangyu096
    wangyu096 authored Sep 19, 2022
    Configuration menu
    Copy the full SHA
    475018f View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2022

  1. Merge pull request #1352 from hLinx/3.6.x 

    3.6.x
    @hLinx
    hLinx authored Sep 22, 2022
    Configuration menu
    Copy the full SHA
    77bc60c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1355 from hLinx/3.5.x 

    perf: 快速执行的任务历史，不应该显示：步骤执行详情，应该显示：快速执行详情，现在会误以为是作业步骤 #1299
    @hLinx
    hLinx authored Sep 22, 2022
    Configuration menu
    Copy the full SHA
    c074d1b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1356 from Tencent/3.5.x 

    Merge: 3.5.x->master
    @jsonwan
    jsonwan authored Sep 22, 2022
    Configuration menu
    Copy the full SHA
    7311506 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1358 from Tencent/3.5.x 

    Merge: 3.5.x->master
    @jsonwan
    jsonwan authored Sep 22, 2022
    Configuration menu
    Copy the full SHA
    f9cfed7 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2022

  1. Merge pull request #1361 from Tencent/3.5.x 

    Merge: 3.5.x->master
    @jsonwan
    jsonwan authored Sep 23, 2022
    Configuration menu
    Copy the full SHA
    e0e2cdd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1365 from hLinx/3.5.x 

    bugfix: 已上线的脚本，为啥还提示未保存的内容 #1307
    @hLinx
    hLinx authored Sep 23, 2022
    Configuration menu
    Copy the full SHA
    f9a404c View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2022

  1. chore: 添加Stream CI开源扫描配置 #1366

    @jsonwan
    jsonwan committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    9858f5e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1367 from jsonwan/github_chore/add_codecc_check 

    chore: 添加Stream CI开源扫描配置 #1366
    @wangyu096
    wangyu096 authored Sep 26, 2022
    Configuration menu
    Copy the full SHA
    9c1472c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1373 from hLinx/3.5.x 

    3.5.x
    @hLinx
    hLinx authored Sep 26, 2022
    Configuration menu
    Copy the full SHA
    3281767 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1378 from hLinx/3.5.x 

    3.5.x
    @hLinx
    hLinx authored Sep 26, 2022
    Configuration menu
    Copy the full SHA
    893b1c2 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1381 from hLinx/3.5.x 

    feature: 文件上传本地文件上传后缀调整 #1375
    @hLinx
    hLinx authored Sep 26, 2022
    Configuration menu
    Copy the full SHA
    ae52e76 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1388 from hLinx/3.5.x 

    bugfix: 选用“业务脚本”或“公共脚本”时匹配中高危语句的交互，要和手工输入的保持一致 #1294
    @hLinx
    hLinx authored Sep 26, 2022
    Configuration menu
    Copy the full SHA
    5ade582 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1392 from hLinx/3.5.x 

    3.5.x
    @hLinx
    hLinx authored Sep 26, 2022
    Configuration menu
    Copy the full SHA
    5cd0c76 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2022

  1. Merge pull request #1394 from Tencent/3.6.x 

    Merge: 3.6.x->master
    @jsonwan
    jsonwan authored Sep 27, 2022
    Configuration menu
    Copy the full SHA
    2ef75f2 View commit details
    Browse the repository at this point in the history