From 269ccbfd2674e3a3d4dc130c2faaae2e09137100 Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Sun, 10 Jul 2022 17:10:49 +0800 Subject: [PATCH] [manager] update define yml file name add prefix "app" or "param" (#221) --- .../define/app/{A-example.yml => app-A-example.yml} | 0 .../define/app/{A-example2.yml => app-A-example2.yml} | 6 +++--- .../src/main/resources/define/app/{api.yml => app-api.yml} | 0 .../resources/define/app/{centos.yml => app-centos.yml} | 0 .../define/app/{elasticsearch.yml => app-elasticsearch.yml} | 0 .../resources/define/app/{fullsite.yml => app-fullsite.yml} | 0 .../main/resources/define/app/{linux.yml => app-linux.yml} | 0 .../resources/define/app/{mariadb.yml => app-mariadb.yml} | 0 .../main/resources/define/app/{mysql.yml => app-mysql.yml} | 0 .../resources/define/app/{oracle.yml => app-oracle.yml} | 0 .../main/resources/define/app/{ping.yml => app-ping.yml} | 0 .../main/resources/define/app/{port.yml => app-port.yml} | 0 .../define/app/{postgresql.yml => app-postgresql.yml} | 0 .../main/resources/define/app/{redis.yml => app-redis.yml} | 0 .../define/app/{sqlserver.yml => app-sqlserver.yml} | 0 .../resources/define/app/{ubuntu.yml => app-ubuntu.yml} | 0 .../resources/define/app/{website.yml => app-website.yml} | 0 .../resources/define/app/{windows.yml => app-windows.yml} | 0 .../define/app/{zookeeper.yml => app-zookeeper.yml} | 0 .../define/param/{A-example.yml => param-A-example.yml} | 0 .../define/param/{A-example2.yml => param-A-example2.yml} | 2 +- .../main/resources/define/param/{api.yml => param-api.yml} | 0 .../resources/define/param/{centos.yml => param-centos.yml} | 0 .../param/{elasticsearch.yml => param-elasticsearch.yml} | 0 .../define/param/{fullsite.yml => param-fullsite.yml} | 0 .../resources/define/param/{linux.yml => param-linux.yml} | 0 .../define/param/{mariadb.yml => param-mariadb.yml} | 0 .../resources/define/param/{mysql.yml => param-mysql.yml} | 0 .../resources/define/param/{oracle.yml => param-oracle.yml} | 0 .../resources/define/param/{ping.yml => param-ping.yml} | 0 .../resources/define/param/{port.yml => param-port.yml} | 0 .../define/param/{postgresql.yml => param-postgresql.yml} | 0 .../resources/define/param/{redis.yml => param-redis.yml} | 0 .../define/param/{sqlserver.yml => param-sqlserver.yml} | 0 .../resources/define/param/{ubuntu.yml => param-ubuntu.yml} | 0 .../define/param/{website.yml => param-website.yml} | 0 .../define/param/{windows.yml => param-windows.yml} | 0 .../define/param/{zookeeper.yml => param-zookeeper.yml} | 0 38 files changed, 4 insertions(+), 4 deletions(-) rename manager/src/main/resources/define/app/{A-example.yml => app-A-example.yml} (100%) rename manager/src/main/resources/define/app/{A-example2.yml => app-A-example2.yml} (98%) rename manager/src/main/resources/define/app/{api.yml => app-api.yml} (100%) rename manager/src/main/resources/define/app/{centos.yml => app-centos.yml} (100%) rename manager/src/main/resources/define/app/{elasticsearch.yml => app-elasticsearch.yml} (100%) rename manager/src/main/resources/define/app/{fullsite.yml => app-fullsite.yml} (100%) rename manager/src/main/resources/define/app/{linux.yml => app-linux.yml} (100%) rename manager/src/main/resources/define/app/{mariadb.yml => app-mariadb.yml} (100%) rename manager/src/main/resources/define/app/{mysql.yml => app-mysql.yml} (100%) rename manager/src/main/resources/define/app/{oracle.yml => app-oracle.yml} (100%) rename manager/src/main/resources/define/app/{ping.yml => app-ping.yml} (100%) rename manager/src/main/resources/define/app/{port.yml => app-port.yml} (100%) rename manager/src/main/resources/define/app/{postgresql.yml => app-postgresql.yml} (100%) rename manager/src/main/resources/define/app/{redis.yml => app-redis.yml} (100%) rename manager/src/main/resources/define/app/{sqlserver.yml => app-sqlserver.yml} (100%) rename manager/src/main/resources/define/app/{ubuntu.yml => app-ubuntu.yml} (100%) rename manager/src/main/resources/define/app/{website.yml => app-website.yml} (100%) rename manager/src/main/resources/define/app/{windows.yml => app-windows.yml} (100%) rename manager/src/main/resources/define/app/{zookeeper.yml => app-zookeeper.yml} (100%) rename manager/src/main/resources/define/param/{A-example.yml => param-A-example.yml} (100%) rename manager/src/main/resources/define/param/{A-example2.yml => param-A-example2.yml} (98%) rename manager/src/main/resources/define/param/{api.yml => param-api.yml} (100%) rename manager/src/main/resources/define/param/{centos.yml => param-centos.yml} (100%) rename manager/src/main/resources/define/param/{elasticsearch.yml => param-elasticsearch.yml} (100%) rename manager/src/main/resources/define/param/{fullsite.yml => param-fullsite.yml} (100%) rename manager/src/main/resources/define/param/{linux.yml => param-linux.yml} (100%) rename manager/src/main/resources/define/param/{mariadb.yml => param-mariadb.yml} (100%) rename manager/src/main/resources/define/param/{mysql.yml => param-mysql.yml} (100%) rename manager/src/main/resources/define/param/{oracle.yml => param-oracle.yml} (100%) rename manager/src/main/resources/define/param/{ping.yml => param-ping.yml} (100%) rename manager/src/main/resources/define/param/{port.yml => param-port.yml} (100%) rename manager/src/main/resources/define/param/{postgresql.yml => param-postgresql.yml} (100%) rename manager/src/main/resources/define/param/{redis.yml => param-redis.yml} (100%) rename manager/src/main/resources/define/param/{sqlserver.yml => param-sqlserver.yml} (100%) rename manager/src/main/resources/define/param/{ubuntu.yml => param-ubuntu.yml} (100%) rename manager/src/main/resources/define/param/{website.yml => param-website.yml} (100%) rename manager/src/main/resources/define/param/{windows.yml => param-windows.yml} (100%) rename manager/src/main/resources/define/param/{zookeeper.yml => param-zookeeper.yml} (100%) diff --git a/manager/src/main/resources/define/app/A-example.yml b/manager/src/main/resources/define/app/app-A-example.yml similarity index 100% rename from manager/src/main/resources/define/app/A-example.yml rename to manager/src/main/resources/define/app/app-A-example.yml diff --git a/manager/src/main/resources/define/app/A-example2.yml b/manager/src/main/resources/define/app/app-A-example2.yml similarity index 98% rename from manager/src/main/resources/define/app/A-example2.yml rename to manager/src/main/resources/define/app/app-A-example2.yml index d368f94fed0..744897da68b 100644 --- a/manager/src/main/resources/define/app/A-example2.yml +++ b/manager/src/main/resources/define/app/app-A-example2.yml @@ -1,10 +1,10 @@ # 此监控类型所属类别:service-应用服务监控 db-数据库监控 custom-自定义监控 os-操作系统监控 category: custom # 监控应用类型(与文件名保持一致) eg: linux windows tomcat mysql aws... -app: example2 +app: hertzbeat name: - zh-CN: 模拟应用2 - en-US: EXAMPLE2 + zh-CN: HertzBeat + en-US: HertzBeat # 参数映射map. type是参数类型: 0-number数字, 1-string明文字符串, 2-secret加密字符串, 3-map映射的json串 # 强制固定必须参数 - host configmap: diff --git a/manager/src/main/resources/define/app/api.yml b/manager/src/main/resources/define/app/app-api.yml similarity index 100% rename from manager/src/main/resources/define/app/api.yml rename to manager/src/main/resources/define/app/app-api.yml diff --git a/manager/src/main/resources/define/app/centos.yml b/manager/src/main/resources/define/app/app-centos.yml similarity index 100% rename from manager/src/main/resources/define/app/centos.yml rename to manager/src/main/resources/define/app/app-centos.yml diff --git a/manager/src/main/resources/define/app/elasticsearch.yml b/manager/src/main/resources/define/app/app-elasticsearch.yml similarity index 100% rename from manager/src/main/resources/define/app/elasticsearch.yml rename to manager/src/main/resources/define/app/app-elasticsearch.yml diff --git a/manager/src/main/resources/define/app/fullsite.yml b/manager/src/main/resources/define/app/app-fullsite.yml similarity index 100% rename from manager/src/main/resources/define/app/fullsite.yml rename to manager/src/main/resources/define/app/app-fullsite.yml diff --git a/manager/src/main/resources/define/app/linux.yml b/manager/src/main/resources/define/app/app-linux.yml similarity index 100% rename from manager/src/main/resources/define/app/linux.yml rename to manager/src/main/resources/define/app/app-linux.yml diff --git a/manager/src/main/resources/define/app/mariadb.yml b/manager/src/main/resources/define/app/app-mariadb.yml similarity index 100% rename from manager/src/main/resources/define/app/mariadb.yml rename to manager/src/main/resources/define/app/app-mariadb.yml diff --git a/manager/src/main/resources/define/app/mysql.yml b/manager/src/main/resources/define/app/app-mysql.yml similarity index 100% rename from manager/src/main/resources/define/app/mysql.yml rename to manager/src/main/resources/define/app/app-mysql.yml diff --git a/manager/src/main/resources/define/app/oracle.yml b/manager/src/main/resources/define/app/app-oracle.yml similarity index 100% rename from manager/src/main/resources/define/app/oracle.yml rename to manager/src/main/resources/define/app/app-oracle.yml diff --git a/manager/src/main/resources/define/app/ping.yml b/manager/src/main/resources/define/app/app-ping.yml similarity index 100% rename from manager/src/main/resources/define/app/ping.yml rename to manager/src/main/resources/define/app/app-ping.yml diff --git a/manager/src/main/resources/define/app/port.yml b/manager/src/main/resources/define/app/app-port.yml similarity index 100% rename from manager/src/main/resources/define/app/port.yml rename to manager/src/main/resources/define/app/app-port.yml diff --git a/manager/src/main/resources/define/app/postgresql.yml b/manager/src/main/resources/define/app/app-postgresql.yml similarity index 100% rename from manager/src/main/resources/define/app/postgresql.yml rename to manager/src/main/resources/define/app/app-postgresql.yml diff --git a/manager/src/main/resources/define/app/redis.yml b/manager/src/main/resources/define/app/app-redis.yml similarity index 100% rename from manager/src/main/resources/define/app/redis.yml rename to manager/src/main/resources/define/app/app-redis.yml diff --git a/manager/src/main/resources/define/app/sqlserver.yml b/manager/src/main/resources/define/app/app-sqlserver.yml similarity index 100% rename from manager/src/main/resources/define/app/sqlserver.yml rename to manager/src/main/resources/define/app/app-sqlserver.yml diff --git a/manager/src/main/resources/define/app/ubuntu.yml b/manager/src/main/resources/define/app/app-ubuntu.yml similarity index 100% rename from manager/src/main/resources/define/app/ubuntu.yml rename to manager/src/main/resources/define/app/app-ubuntu.yml diff --git a/manager/src/main/resources/define/app/website.yml b/manager/src/main/resources/define/app/app-website.yml similarity index 100% rename from manager/src/main/resources/define/app/website.yml rename to manager/src/main/resources/define/app/app-website.yml diff --git a/manager/src/main/resources/define/app/windows.yml b/manager/src/main/resources/define/app/app-windows.yml similarity index 100% rename from manager/src/main/resources/define/app/windows.yml rename to manager/src/main/resources/define/app/app-windows.yml diff --git a/manager/src/main/resources/define/app/zookeeper.yml b/manager/src/main/resources/define/app/app-zookeeper.yml similarity index 100% rename from manager/src/main/resources/define/app/zookeeper.yml rename to manager/src/main/resources/define/app/app-zookeeper.yml diff --git a/manager/src/main/resources/define/param/A-example.yml b/manager/src/main/resources/define/param/param-A-example.yml similarity index 100% rename from manager/src/main/resources/define/param/A-example.yml rename to manager/src/main/resources/define/param/param-A-example.yml diff --git a/manager/src/main/resources/define/param/A-example2.yml b/manager/src/main/resources/define/param/param-A-example2.yml similarity index 98% rename from manager/src/main/resources/define/param/A-example2.yml rename to manager/src/main/resources/define/param/param-A-example2.yml index ba0b734ec63..3585649ae69 100644 --- a/manager/src/main/resources/define/param/A-example2.yml +++ b/manager/src/main/resources/define/param/param-A-example2.yml @@ -1,5 +1,5 @@ # 监控应用类型名称(与文件名保持一致) eg: linux windows tomcat mysql aws... -app: example2 +app: hertzbeat # 强制固定必须参数 - host(ipv4,ipv6,域名) param: # field-字段名称标识符 diff --git a/manager/src/main/resources/define/param/api.yml b/manager/src/main/resources/define/param/param-api.yml similarity index 100% rename from manager/src/main/resources/define/param/api.yml rename to manager/src/main/resources/define/param/param-api.yml diff --git a/manager/src/main/resources/define/param/centos.yml b/manager/src/main/resources/define/param/param-centos.yml similarity index 100% rename from manager/src/main/resources/define/param/centos.yml rename to manager/src/main/resources/define/param/param-centos.yml diff --git a/manager/src/main/resources/define/param/elasticsearch.yml b/manager/src/main/resources/define/param/param-elasticsearch.yml similarity index 100% rename from manager/src/main/resources/define/param/elasticsearch.yml rename to manager/src/main/resources/define/param/param-elasticsearch.yml diff --git a/manager/src/main/resources/define/param/fullsite.yml b/manager/src/main/resources/define/param/param-fullsite.yml similarity index 100% rename from manager/src/main/resources/define/param/fullsite.yml rename to manager/src/main/resources/define/param/param-fullsite.yml diff --git a/manager/src/main/resources/define/param/linux.yml b/manager/src/main/resources/define/param/param-linux.yml similarity index 100% rename from manager/src/main/resources/define/param/linux.yml rename to manager/src/main/resources/define/param/param-linux.yml diff --git a/manager/src/main/resources/define/param/mariadb.yml b/manager/src/main/resources/define/param/param-mariadb.yml similarity index 100% rename from manager/src/main/resources/define/param/mariadb.yml rename to manager/src/main/resources/define/param/param-mariadb.yml diff --git a/manager/src/main/resources/define/param/mysql.yml b/manager/src/main/resources/define/param/param-mysql.yml similarity index 100% rename from manager/src/main/resources/define/param/mysql.yml rename to manager/src/main/resources/define/param/param-mysql.yml diff --git a/manager/src/main/resources/define/param/oracle.yml b/manager/src/main/resources/define/param/param-oracle.yml similarity index 100% rename from manager/src/main/resources/define/param/oracle.yml rename to manager/src/main/resources/define/param/param-oracle.yml diff --git a/manager/src/main/resources/define/param/ping.yml b/manager/src/main/resources/define/param/param-ping.yml similarity index 100% rename from manager/src/main/resources/define/param/ping.yml rename to manager/src/main/resources/define/param/param-ping.yml diff --git a/manager/src/main/resources/define/param/port.yml b/manager/src/main/resources/define/param/param-port.yml similarity index 100% rename from manager/src/main/resources/define/param/port.yml rename to manager/src/main/resources/define/param/param-port.yml diff --git a/manager/src/main/resources/define/param/postgresql.yml b/manager/src/main/resources/define/param/param-postgresql.yml similarity index 100% rename from manager/src/main/resources/define/param/postgresql.yml rename to manager/src/main/resources/define/param/param-postgresql.yml diff --git a/manager/src/main/resources/define/param/redis.yml b/manager/src/main/resources/define/param/param-redis.yml similarity index 100% rename from manager/src/main/resources/define/param/redis.yml rename to manager/src/main/resources/define/param/param-redis.yml diff --git a/manager/src/main/resources/define/param/sqlserver.yml b/manager/src/main/resources/define/param/param-sqlserver.yml similarity index 100% rename from manager/src/main/resources/define/param/sqlserver.yml rename to manager/src/main/resources/define/param/param-sqlserver.yml diff --git a/manager/src/main/resources/define/param/ubuntu.yml b/manager/src/main/resources/define/param/param-ubuntu.yml similarity index 100% rename from manager/src/main/resources/define/param/ubuntu.yml rename to manager/src/main/resources/define/param/param-ubuntu.yml diff --git a/manager/src/main/resources/define/param/website.yml b/manager/src/main/resources/define/param/param-website.yml similarity index 100% rename from manager/src/main/resources/define/param/website.yml rename to manager/src/main/resources/define/param/param-website.yml diff --git a/manager/src/main/resources/define/param/windows.yml b/manager/src/main/resources/define/param/param-windows.yml similarity index 100% rename from manager/src/main/resources/define/param/windows.yml rename to manager/src/main/resources/define/param/param-windows.yml diff --git a/manager/src/main/resources/define/param/zookeeper.yml b/manager/src/main/resources/define/param/param-zookeeper.yml similarity index 100% rename from manager/src/main/resources/define/param/zookeeper.yml rename to manager/src/main/resources/define/param/param-zookeeper.yml