From 6f41260acfaf07abaaa1418ce76c442770c4b784 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 27 Apr 2022 16:34:24 +0300 Subject: [PATCH] Move dashboards into data source dir in build, fixes #1407 --- {src/dashboards => dashboards}/template_linux_server.json | 0 {src/dashboards => dashboards}/zabbix_server_dashboard.json | 0 {src/dashboards => dashboards}/zabbix_system_status.json | 0 src/datasource-zabbix/plugin.json | 6 +++--- webpack/webpack.base.conf.js | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename {src/dashboards => dashboards}/template_linux_server.json (100%) rename {src/dashboards => dashboards}/zabbix_server_dashboard.json (100%) rename {src/dashboards => dashboards}/zabbix_system_status.json (100%) diff --git a/src/dashboards/template_linux_server.json b/dashboards/template_linux_server.json similarity index 100% rename from src/dashboards/template_linux_server.json rename to dashboards/template_linux_server.json diff --git a/src/dashboards/zabbix_server_dashboard.json b/dashboards/zabbix_server_dashboard.json similarity index 100% rename from src/dashboards/zabbix_server_dashboard.json rename to dashboards/zabbix_server_dashboard.json diff --git a/src/dashboards/zabbix_system_status.json b/dashboards/zabbix_system_status.json similarity index 100% rename from src/dashboards/zabbix_system_status.json rename to dashboards/zabbix_system_status.json diff --git a/src/datasource-zabbix/plugin.json b/src/datasource-zabbix/plugin.json index 356af3f..ffce173 100644 --- a/src/datasource-zabbix/plugin.json +++ b/src/datasource-zabbix/plugin.json @@ -14,17 +14,17 @@ { "type": "dashboard", "name": "Zabbix System Status", - "path": "../dashboards/zabbix_system_status.json" + "path": "dashboards/zabbix_system_status.json" }, { "type": "dashboard", "name": "Zabbix Template Linux Server", - "path": "../dashboards/template_linux_server.json" + "path": "dashboards/template_linux_server.json" }, { "type": "dashboard", "name": "Zabbix Server Dashboard", - "path": "../dashboards/zabbix_server_dashboard.json" + "path": "dashboards/zabbix_server_dashboard.json" } ], diff --git a/webpack/webpack.base.conf.js b/webpack/webpack.base.conf.js index 9aa3ca4..f8a3b76 100644 --- a/webpack/webpack.base.conf.js +++ b/webpack/webpack.base.conf.js @@ -64,7 +64,7 @@ module.exports = { { from: '**/plugin.json' }, { from: '**/*.html' }, { from: '**/*.md' }, - { from: 'dashboards/*' }, + { from: '../dashboards/*', to: 'datasource-zabbix/dashboards' }, { from: '../README.md' }, { from: '**/img/*' }, ]),