Skip to content

master 合并回 dev - #46

Merged
X-Mars merged 32 commits into
devfrom
master
Aug 2, 2026
Merged

X-Mars merged 32 commits into
devfrom
master

Conversation

@X-Mars

@X-Mars X-Mars commented Aug 2, 2026

Copy link
Copy Markdown
Owner

No description provided.

X-Mars and others added 30 commits December 12, 2025 13:54
add zabbix GraphTrees
Update graphtrees.php
添加机柜管理模块
进一步优化图表树功能完成
Update graphtrees.php
报表模块颠覆性优化完成
Update PdfGenerator.php
全面美化日报功能
报表模块中告警列表优化,机柜视图 30 秒更新一次告警信息
优化项目介绍、机柜视图不显示已禁用的告警、报表标记已禁用的告警
进一步优化日报页面,添加主机分组和日志过滤;机柜视图搜索功能修复
增加 jumpserver 模块
增加 jumpserver 模块
添加zabbix im模块
添加zabbix im 同步助手模块
机柜模块添加正反面支持、基于zabbix权限系统的机柜展示功能
机柜模块添加正反面支持、基于zabbix权限系统的机柜展示功能、优化使用率计算
ui 调整和 snmpv3bug 修复
Add a new module that batch-clones and imports hosts based on an existing monitored host's configuration. Features: source host cloning with full config inheritance; dual-mode data entry (CSV upload + online table); smart field inheritance; auto-creation of missing host groups; preview with conflict detection; selective import via per-row checkboxes; back-to-edit with data preserved; sequential AJAX import with progress bar; CSV result report; bilingual UI (zh_CN/en_GB); compatible with Zabbix 6.0/6.4/7.x/8.x via CompatHelper. Authors: 先龍 / Mars XiaoLiu
- Add .github/workflows/release.yml for automated module packaging
  * Single Release with multiple Assets (all-in-one + per-module packages)
  * Version format: {module_count}.{major}.{minor} (e.g., 8.2.0)
  * Auto-detect module version changes, also support manual trigger
- Update all READMEs for Zabbix 7.2+ path compatibility
  * 6.0/7.0: /usr/share/zabbix/modules/
  * 7.2+/7.4/8.0: /usr/share/zabbix/ui/modules/
- Add Zabbix 6.0 manifest_version one-liner fix (all modules / single module)
- Bump zabbix_clonehosts version to 1.2.0 (semver 3-digit format)
- Reorder README install options: all-in-one package first, then single module
feat: add auto-release workflow and Zabbix 7.2+ path compatibility
jxl1216 and others added 2 commits July 20, 2026 22:40
… compatibility, menu location fix, API error details
feat: zabbix_clonehosts v1.3.0 - real-time progress stats, Zabbix 6.0…
Copilot AI review requested due to automatic review settings August 2, 2026 11:51
@X-Mars
X-Mars merged commit ccb0655 into dev Aug 2, 2026
2 of 3 checks passed

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This pull request merges updates back into dev, primarily introducing a new Zabbix frontend module (“Zabbix Clonehosts”) for batch-cloning/importing hosts, plus documentation tweaks and an automated GitHub Actions release workflow.

Changes:

  • Add the new zabbix_clonehosts module (controllers, views, assets, i18n helper, compatibility helper, docs).
  • Update multiple module READMEs to clarify deployment paths for “Zabbix 7.2+ / 7.4 / 8.0”.
  • Update top-level installation docs and add a Release packaging workflow.

Reviewed changes

Copilot reviewed 34 out of 39 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
zabbix_snmp/README.md Updates deployment version wording to include Zabbix 7.2+.
zabbix_snmp/README_en.md English version of the same deployment wording update.
zabbix_reports/README.md Updates deployment version wording to include Zabbix 7.2+.
zabbix_reports/README_en.md English version of the same deployment wording update.
zabbix_rack/README.md Updates deployment version wording to include Zabbix 7.2+.
zabbix_rack/README_en.md English version of the same deployment wording update.
zabbix_jumpserver/README.md Updates deployment version wording to include Zabbix 7.2+.
zabbix_jumpserver/README_en.md English version of the same deployment wording update.
zabbix_im/README.md Updates deployment version wording to include Zabbix 7.2+.
zabbix_im/README_en.md English version of the same deployment wording update.
zabbix_graphtrees/README.md Updates deployment version wording to include Zabbix 7.2+.
zabbix_graphtrees/README_en.md English version of the same deployment wording update.
zabbix_cmdb/README.md Updates deployment version wording to include Zabbix 7.2+.
zabbix_cmdb/README_en.md English version of the same deployment wording update.
zabbix_clonehosts/views/clonehosts.preview.php Adds the import preview UI with conflict display, selection, and progress/results sections.
zabbix_clonehosts/views/clonehosts.php Adds the main UI (source host selection + CSV/table entry + preview submission).
zabbix_clonehosts/views/clonehosts.import.php Adds a JSON view used for AJAX responses.
zabbix_clonehosts/README.md Chinese documentation for Clonehosts module usage/installation.
zabbix_clonehosts/README_en.md English documentation for Clonehosts module usage/installation.
zabbix_clonehosts/Module.php Registers the module menu item in Zabbix UI (version-aware menu placement).
zabbix_clonehosts/manifest.json Declares module metadata, routes/actions, and assets.
zabbix_clonehosts/LangHelper.php Provides array-based zh/en translations and JS export.
zabbix_clonehosts/CompatHelper.php Adds compatibility helpers for Zabbix 6.0 vs 6.4+ API differences.
zabbix_clonehosts/clonehosts_template.csv Adds a sample/template CSV file for imports.
zabbix_clonehosts/assets/js/clonehosts.preview.js.php Implements preview-page selection + sequential AJAX import + CSV report download.
zabbix_clonehosts/assets/js/clonehosts.js.php Implements main-page UI logic (multiselect, CSV parsing, table management, preview submit).
zabbix_clonehosts/assets/css/clonehosts.css Adds styling for the Clonehosts UI (multiselect, tabs, tables, progress/results).
zabbix_clonehosts/actions/ClonehostsSource.php Adds AJAX endpoint to fetch source-host configuration for display/inheritance.
zabbix_clonehosts/actions/ClonehostsPreview.php Adds preview controller: conflict detection + field status computation.
zabbix_clonehosts/actions/ClonehostsImport.php Adds import controller: merges inherited fields and calls Zabbix API to create a host.
zabbix_clonehosts/actions/Clonehosts.php Adds main controller: loads hosts/groups/templates and handles return-from-preview restore.
README.md Adds Clonehosts module listing + expands installation instructions (release packages + git clone).
README_en.md English version of Clonehosts listing + expanded installation instructions.
.github/workflows/release.yml Adds GitHub Actions workflow to package modules and publish releases on manifest version bumps.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

'host_data' => 'string',
'return_from_preview' => 'in 1'
]);
return true;
Comment on lines +766 to +770
var firstLine = lines[0].toLowerCase().replace(/\s/g, '');
if (firstLine.indexOf('hostname') >= 0 || firstLine.indexOf('host_name') >= 0 ||
firstLine.indexOf('host') >= 0 || firstLine.indexOf('主机名称') >= 0) {
startIdx = 1;
}
Comment on lines +158 to +162
'main' => (int) $src_iface['main'],
'useip' => (int) $src_iface['useip'],
'ip' => $ip,
'dns' => $src_iface['useip'] ? ($src_iface['dns'] ?? '') : $ip,
'port' => $port !== '' ? $port : $src_iface['port']
Comment on lines +40 to +44
if (method_exists($this, 'disableCsrfValidation')) {
$this->disableCsrfValidation();
}
if (method_exists($this, 'disableSIDvalidation')) {
$this->disableSIDvalidation();
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants