You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@hertzbeat.apache.org by sh...@apache.org on 2025/05/09 04:55:29 UTC

(hertzbeat) branch fix-exist-error updated (3aa0840b9f -> 62f86742a0)

This is an automated email from the ASF dual-hosted git repository.

shown pushed a change to branch fix-exist-error
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git


    from 3aa0840b9f Merge branch 'master' into fix-exist-error
     add b313db36c6 [feature] Support Zabbix alert source (#3317)
     add 096153b3a4 [license] update the license file, to add the plc4j-driver-s7 license (#3318)
     add 62f86742a0 Merge branch 'master' into fix-exist-error

No new revisions were added by this update.

Summary of changes:
 ...vice.java => ZabbixExternAlertServiceImpl.java} |  44 +----
 material/licenses/LICENSE                          |   1 +
 material/licenses/backend/LICENSE                  |   1 +
 material/licenses/collector/LICENSE                |   1 +
 .../alert-integration.component.ts                 |  15 +-
 .../assets/doc/alert-integration/zabbix.en-US.md   | 201 +++++++++++++++++++++
 .../assets/doc/alert-integration/zabbix.zh-CN.md   | 201 +++++++++++++++++++++
 .../assets/doc/alert-integration/zabbix.zh-TW.md   | 201 +++++++++++++++++++++
 web-app/src/assets/i18n/en-US.json                 |   1 +
 web-app/src/assets/i18n/ja-JP.json                 |   1 +
 web-app/src/assets/i18n/pt-BR.json                 |   1 +
 web-app/src/assets/i18n/zh-CN.json                 |   1 +
 web-app/src/assets/i18n/zh-TW.json                 |   1 +
 web-app/src/assets/img/integration/zabbix.svg      |  35 ++++
 14 files changed, 661 insertions(+), 44 deletions(-)
 copy hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/{DefaultExternAlertService.java => ZabbixExternAlertServiceImpl.java} (51%)
 create mode 100644 web-app/src/assets/doc/alert-integration/zabbix.en-US.md
 create mode 100644 web-app/src/assets/doc/alert-integration/zabbix.zh-CN.md
 create mode 100644 web-app/src/assets/doc/alert-integration/zabbix.zh-TW.md
 create mode 100644 web-app/src/assets/img/integration/zabbix.svg


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@hertzbeat.apache.org
For additional commands, e-mail: notifications-help@hertzbeat.apache.org