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

support using Huawei Cloud OBS to store custom define yml file #1266

Merged
merged 13 commits into from
Oct 8, 2023
Merged

support using Huawei Cloud OBS to store custom define yml file #1266

merged 13 commits into from
Oct 8, 2023

Commits on Sep 14, 2023

  1. feat 支持华为云OBS存储采集任务配置文件

    @gcdd1993
    gcdd1993 committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    959cd53 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Merge branch 'master' of github.com:dromara/hertzbeat into feature#obs 

    # Conflicts:
#	web-app/src/app/routes/setting/setting.module.ts
    @gcdd1993
    gcdd1993 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    1d79eb0 View commit details
    Browse the repository at this point in the history

  2. feat 支持华为云OBS存储采集任务配置文件

    @gcdd1993
    gcdd1993 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    f319868 View commit details
    Browse the repository at this point in the history

  3. i18n配置更新

    @gcdd1993
    gcdd1993 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    97ffd40 View commit details
    Browse the repository at this point in the history

  4. refactor 统一使用文件相对路径作为入参

    @gcdd1993
    gcdd1993 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    125975c View commit details
    Browse the repository at this point in the history

  5. fix

    @gcdd1993
    gcdd1993 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    75fd612 View commit details
    Browse the repository at this point in the history

  6. fix lint & pmd

    @gcdd1993
    gcdd1993 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    501d1a6 View commit details
    Browse the repository at this point in the history

  7. fix NPE

    @gcdd1993
    gcdd1993 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    54e4e36 View commit details
    Browse the repository at this point in the history

  8. fix Test mock

    @gcdd1993
    gcdd1993 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    213422d View commit details
    Browse the repository at this point in the history

  9. set default store type file

    @tomsun28
    tomsun28 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    b35734e View commit details
    Browse the repository at this point in the history

  10. make it public

    @tomsun28
    tomsun28 committed Sep 28, 2023
    Configuration menu
    Copy the full SHA
    88b448d View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2023

  1. Merge branch 'master' of github.com:dromara/hertzbeat into feature#obs 

    # Conflicts:
#	manager/src/main/java/org/dromara/hertzbeat/manager/service/impl/AppServiceImpl.java
    @gcdd1993
    gcdd1993 committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    1d339bf View commit details
    Browse the repository at this point in the history

  2. resolve conflicts

    @gcdd1993
    gcdd1993 committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    bc2ed74 View commit details
    Browse the repository at this point in the history