diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/control.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/control.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/control.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/control.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/DORIS/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/DORIS/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/DORIS/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/DORIS/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/DORIS/status_be.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/DORIS/status_be.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/DORIS/status_be.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/DORIS/status_be.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/DORIS/status_fe.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/DORIS/status_fe.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/DORIS/status_fe.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/DORIS/status_fe.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/DS/control_ds.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/DS/control_ds.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/DS/control_ds.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/DS/control_ds.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/DS/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/DS/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/DS/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/DS/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ELASTICSEARCH/control_es.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ELASTICSEARCH/control_es.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/ELASTICSEARCH/control_es.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/ELASTICSEARCH/control_es.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ELASTICSEARCH/control_es_exporter.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ELASTICSEARCH/control_es_exporter.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/ELASTICSEARCH/control_es_exporter.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/ELASTICSEARCH/control_es_exporter.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ELASTICSEARCH/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ELASTICSEARCH/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/ELASTICSEARCH/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/ELASTICSEARCH/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/FLINK/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/FLINK/service_ddl.json similarity index 88% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/FLINK/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/FLINK/service_ddl.json index 1fd9f8b2..06148977 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.0/FLINK/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.1/FLINK/service_ddl.json @@ -2,11 +2,11 @@ "name": "FLINK", "label": "Flink", "description": "实时计算引擎", - "version": "1.15.2", + "version": "1.17.1", "sortNum": 6, "dependencies":[], - "packageName": "flink-1.15.2.tar.gz", - "decompressPackageName": "flink-1.15.2", + "packageName": "flink-1.17.1.tar.gz", + "decompressPackageName": "flink-1.17.1", "runAs":"root", "roles": [ { @@ -32,7 +32,8 @@ "high-availability.zookeeper.quorum", "high-availability.zookeeper.client.acl", "high-availability.zookeeper.path.root", - "custom.flink.conf.yaml" + "custom.flink.conf.yaml", + "classloader.check-leaked-classloader" ] } ] @@ -140,6 +141,17 @@ "configurableInWizard": true, "hidden": false, "defaultValue": "" + }, + { + "name": "classloader.check-leaked-classloader", + "label": "禁用classloader.check", + "description": "禁用classloader.check", + "required": true, + "type": "switch", + "value": false, + "configurableInWizard": true, + "hidden": false, + "defaultValue": false } ] } \ No newline at end of file diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/GRAFANA/control.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/GRAFANA/control.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/GRAFANA/control.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/GRAFANA/control.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/GRAFANA/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/GRAFANA/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/GRAFANA/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/GRAFANA/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/HBASE/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/HBASE/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/HBASE/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/HBASE/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/HDFS/control_hadoop.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/HDFS/control_hadoop.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/HDFS/control_hadoop.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/HDFS/control_hadoop.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/HDFS/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/HDFS/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/HDFS/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/HDFS/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/HIVE/control_hive.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/HIVE/control_hive.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/HIVE/control_hive.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/HIVE/control_hive.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/HIVE/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/HIVE/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/HIVE/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/HIVE/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ICEBERG/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ICEBERG/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/ICEBERG/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/ICEBERG/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/KAFKA/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/KAFKA/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/KAFKA/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/KAFKA/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/KERBEROS/kerberos.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/KERBEROS/kerberos.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/KERBEROS/kerberos.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/KERBEROS/kerberos.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/KERBEROS/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/KERBEROS/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/KERBEROS/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/KERBEROS/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/KYUUBI/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/KYUUBI/service_ddl.json similarity index 96% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/KYUUBI/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/KYUUBI/service_ddl.json index 3009cde5..aeef4fa9 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.0/KYUUBI/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.1/KYUUBI/service_ddl.json @@ -1,354 +1,354 @@ -{ - "name": "KYUUBI", - "label": "Kyuubi", - "description": "统一多租户JDBC网关", - "version": "1.7.3", - "sortNum": 30, - "dependencies":[], - "packageName": "kyuubi-1.7.3.tar.gz", - "decompressPackageName": "kyuubi-1.7.3", - "roles": [ - { - "name": "KyuubiServer", - "label": "KyuubiServer", - "roleType": "master", - "runAs": { - "user": "kyuubi", - "group": "hadoop" - }, - "cardinality": "1+", - "logFile": "logs/kyuubi-server-${host}.out", - "startRunner": { - "timeout": "60", - "program": "bin/kyuubi", - "args": [ - "start" - ] - }, - "stopRunner": { - "timeout": "600", - "program": "bin/kyuubi", - "args": [ - "stop" - ] - }, - "statusRunner": { - "timeout": "60", - "program": "bin/kyuubi", - "args": [ - "status" - ] - }, - "restartRunner": { - "timeout": "60", - "program": "bin/kyuubi", - "args": [ - "restart" - ] - } - }, - { - "name": "KyuubiClient", - "label": "KyuubiClient", - "roleType": "client", - "cardinality": "1+", - "logFile": "", - "runAs": { - "user": "kyuubi", - "group": "hadoop" - } - } - ], - "configWriter": { - "generators": [ - { - "filename": "kyuubi-defaults.conf", - "configFormat": "properties2", - "outputDirectory": "conf", - "includeParams": [ - "kyuubi.ha.zookeeper.namespace", - "kyuubi.ha.zookeeper.quorum", - "kyuubi.session.idle.timeout", - "kyuubi.session.engine.idle.timeout", - "kyuubi.session.engine.initialize.timeout", - "spark.master", - "kyuubi.metrics.reporters", - "kyuubi.metrics.prometheus.port", - "kyuubi.session.engine.spark.showProgress", - "kyuubi.metrics.enabled", - "enableKerberos", - "kyuubi.kinit.principal", - "kyuubi.kinit.keytab", - "kyuubi.authentication", - "custom.kyuubi-defaults.conf" - ] - }, - { - "filename": "kyuubi-env.sh", - "configFormat": "custom", - "outputDirectory": "conf", - "templateName": "kyuubi-env.ftl", - "includeParams": [ - "javaHome", - "sparkHome", - "hadoopConfDir", - "kyuubiServerHeapSize", - "kyuubiClientHeapSize", - "custom.kyuubi-env.sh" - ] - } - ] - }, - "parameters": [ - { - "name": "kyuubi.ha.zookeeper.quorum", - "label": "zookeeper服务信息", - "description": "zookeeper服务信息", - "required": true, - "type": "input", - "value": "", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "" - }, - { - "name": "kyuubi.ha.zookeeper.namespace", - "label": "zookeeper目录", - "description": "zookeeper目录", - "required": true, - "type": "input", - "value": "", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "" - }, - { - "name": "kyuubi.session.idle.timeout", - "label": "会话超时时间", - "description": "会话超时时间", - "required": true, - "type": "input", - "value": "", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "PT6H" - }, - { - "name": "kyuubi.session.engine.idle.timeout", - "label": "引擎超时时间", - "description": "引擎超时时间", - "required": true, - "type": "input", - "value": "", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "PT30M" - }, - { - "name": "spark.master", - "label": "配置spark为onYarn模式", - "description": "配置spark为onYarn模式", - "required": true, - "type": "input", - "value": "yarn", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "yarn" - }, - { - "name": "kyuubi.metrics.reporters", - "label": "监控输出格式", - "description": "监控输出格式", - "required": true, - "type": "input", - "value": "PROMETHEUS", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "PROMETHEUS" - }, - { - "name": "kyuubi.metrics.prometheus.port", - "label": "监控服务端口", - "description": "监控服务端口", - "required": true, - "type": "input", - "value": "10019", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "10019" - }, - { - "name": "kyuubi.session.engine.initialize.timeout", - "label": "引擎启动超时时间", - "description": "引擎启动超时时间", - "required": true, - "type": "input", - "value": "", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "PT3M" - }, - { - "name": "kyuubi.session.engine.spark.showProgress", - "label": "spark任务进度显示", - "description": "spark任务进度显示", - "required": true, - "type": "switch", - "value": false, - "configurableInWizard": true, - "hidden": false, - "defaultValue": false - }, - { - "name": "kyuubi.metrics.enabled", - "label": "服务监控指标", - "description": "服务监控指标", - "required": true, - "type": "switch", - "value": true, - "configurableInWizard": false, - "hidden": false, - "defaultValue": true - }, - { - "name": "javaHome", - "label": "java安装路径", - "description": "java安装路径", - "configType": "map", - "required": true, - "type": "input", - "value": "/usr/local/jdk1.8.0_333", - "configurableInWizard": false, - "hidden": false, - "defaultValue": "/usr/local/jdk1.8.0_333" - }, - { - "name": "sparkHome", - "label": "spark安装目录", - "description": "spark安装目录", - "configType": "map", - "required": true, - "type": "input", - "value": "/opt/datasophon/spark-3.1.3/", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "/opt/datasophon/spark-3.1.3/" - }, - { - "name": "hadoopConfDir", - "label": "hadoop配置目录", - "description": "hadoop配置目录", - "configType": "map", - "required": true, - "type": "input", - "value": "/opt/datasophon/hadoop-3.3.3/etc/hadoop", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "/opt/datasophon/hadoop-3.3.3/etc/hadoop" - }, - { - "name": "kyuubiServerHeapSize", - "label": "KyuubiServerjvm内存", - "description": "KyuubiServerjvm内存", - "configType": "map", - "required": true, - "minValue": 0, - "maxValue": 32, - "type": "slider", - "value": "", - "unit": "GB", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "4" - }, - { - "name": "kyuubiClientHeapSize", - "label": "KyuubiClientjvm内存", - "description": "KyuubiClientjvm内存", - "configType": "map", - "required": true, - "minValue": 0, - "maxValue": 32, - "type": "slider", - "value": "", - "unit": "GB", - "configurableInWizard": true, - "hidden": false, - "defaultValue": "2" - }, - { - "name": "enableKerberos", - "label": "开启Kerberos认证", - "description": "开启Kerberos认证", - "required": false, - "type": "switch", - "value": false, - "configurableInWizard": true, - "hidden": false, - "defaultValue": false - }, - { - "name": "kyuubi.authentication", - "label": "Kyuubi服务认证方式", - "description": "", - "configWithKerberos": true, - "required": false, - "configType": "kb", - "type": "input", - "value": "KERBEROS", - "configurableInWizard": true, - "hidden": true, - "defaultValue": "KERBEROS" - }, - { - "name": "kyuubi.kinit.principal", - "label": "Kyuubi服务的Kerberos主体", - "description": "", - "configWithKerberos": true, - "required": false, - "configType": "kb", - "type": "input", - "value": "kyuubi/${host}@${realm}", - "configurableInWizard": true, - "hidden": true, - "defaultValue": "kyuubi/${host}@${realm}" - }, - { - "name": "kyuubi.kinit.keytab", - "label": "Kyuubi服务的Kerberos密钥文件路径", - "description": "", - "configWithKerberos": true, - "required": false, - "configType": "kb", - "type": "input", - "value": "/etc/security/keytab/kyuubi.service.keytab", - "configurableInWizard": true, - "hidden": true, - "defaultValue": "/etc/security/keytab/kyuubi.service.keytab" - }, - { - "name": "custom.kyuubi-env.sh", - "label": "自定义配置kyuubi-env.sh", - "description": "自定义配置", - "configType": "custom", - "required": false, - "type": "multipleWithKey", - "value": [], - "configurableInWizard": true, - "hidden": false, - "defaultValue": "" - }, - { - "name": "custom.kyuubi-defaults.conf", - "label": "自定义配置kyuubi-defaults.conf", - "description": "自定义配置", - "configType": "custom", - "required": false, - "type": "multipleWithKey", - "value": [], - "configurableInWizard": true, - "hidden": false, - "defaultValue": "" - } - ] +{ + "name": "KYUUBI", + "label": "Kyuubi", + "description": "统一多租户JDBC网关", + "version": "1.7.3", + "sortNum": 30, + "dependencies":[], + "packageName": "kyuubi-1.7.3.tar.gz", + "decompressPackageName": "kyuubi-1.7.3", + "roles": [ + { + "name": "KyuubiServer", + "label": "KyuubiServer", + "roleType": "master", + "runAs": { + "user": "kyuubi", + "group": "hadoop" + }, + "cardinality": "1+", + "logFile": "logs/kyuubi-server-${host}.out", + "startRunner": { + "timeout": "60", + "program": "bin/kyuubi", + "args": [ + "start" + ] + }, + "stopRunner": { + "timeout": "600", + "program": "bin/kyuubi", + "args": [ + "stop" + ] + }, + "statusRunner": { + "timeout": "60", + "program": "bin/kyuubi", + "args": [ + "status" + ] + }, + "restartRunner": { + "timeout": "60", + "program": "bin/kyuubi", + "args": [ + "restart" + ] + } + }, + { + "name": "KyuubiClient", + "label": "KyuubiClient", + "roleType": "client", + "cardinality": "1+", + "logFile": "", + "runAs": { + "user": "kyuubi", + "group": "hadoop" + } + } + ], + "configWriter": { + "generators": [ + { + "filename": "kyuubi-defaults.conf", + "configFormat": "properties2", + "outputDirectory": "conf", + "includeParams": [ + "kyuubi.ha.zookeeper.namespace", + "kyuubi.ha.zookeeper.quorum", + "kyuubi.session.idle.timeout", + "kyuubi.session.engine.idle.timeout", + "kyuubi.session.engine.initialize.timeout", + "spark.master", + "kyuubi.metrics.reporters", + "kyuubi.metrics.prometheus.port", + "kyuubi.session.engine.spark.showProgress", + "kyuubi.metrics.enabled", + "enableKerberos", + "kyuubi.kinit.principal", + "kyuubi.kinit.keytab", + "kyuubi.authentication", + "custom.kyuubi-defaults.conf" + ] + }, + { + "filename": "kyuubi-env.sh", + "configFormat": "custom", + "outputDirectory": "conf", + "templateName": "kyuubi-env.ftl", + "includeParams": [ + "javaHome", + "sparkHome", + "hadoopConfDir", + "kyuubiServerHeapSize", + "kyuubiClientHeapSize", + "custom.kyuubi-env.sh" + ] + } + ] + }, + "parameters": [ + { + "name": "kyuubi.ha.zookeeper.quorum", + "label": "zookeeper服务信息", + "description": "zookeeper服务信息", + "required": true, + "type": "input", + "value": "", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "" + }, + { + "name": "kyuubi.ha.zookeeper.namespace", + "label": "zookeeper目录", + "description": "zookeeper目录", + "required": true, + "type": "input", + "value": "", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "" + }, + { + "name": "kyuubi.session.idle.timeout", + "label": "会话超时时间", + "description": "会话超时时间", + "required": true, + "type": "input", + "value": "", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "PT6H" + }, + { + "name": "kyuubi.session.engine.idle.timeout", + "label": "引擎超时时间", + "description": "引擎超时时间", + "required": true, + "type": "input", + "value": "", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "PT30M" + }, + { + "name": "spark.master", + "label": "配置spark为onYarn模式", + "description": "配置spark为onYarn模式", + "required": true, + "type": "input", + "value": "yarn", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "yarn" + }, + { + "name": "kyuubi.metrics.reporters", + "label": "监控输出格式", + "description": "监控输出格式", + "required": true, + "type": "input", + "value": "PROMETHEUS", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "PROMETHEUS" + }, + { + "name": "kyuubi.metrics.prometheus.port", + "label": "监控服务端口", + "description": "监控服务端口", + "required": true, + "type": "input", + "value": "10019", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "10019" + }, + { + "name": "kyuubi.session.engine.initialize.timeout", + "label": "引擎启动超时时间", + "description": "引擎启动超时时间", + "required": true, + "type": "input", + "value": "", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "PT3M" + }, + { + "name": "kyuubi.session.engine.spark.showProgress", + "label": "spark任务进度显示", + "description": "spark任务进度显示", + "required": true, + "type": "switch", + "value": false, + "configurableInWizard": true, + "hidden": false, + "defaultValue": false + }, + { + "name": "kyuubi.metrics.enabled", + "label": "服务监控指标", + "description": "服务监控指标", + "required": true, + "type": "switch", + "value": true, + "configurableInWizard": false, + "hidden": false, + "defaultValue": true + }, + { + "name": "javaHome", + "label": "java安装路径", + "description": "java安装路径", + "configType": "map", + "required": true, + "type": "input", + "value": "/usr/local/jdk1.8.0_333", + "configurableInWizard": false, + "hidden": false, + "defaultValue": "/usr/local/jdk1.8.0_333" + }, + { + "name": "sparkHome", + "label": "spark安装目录", + "description": "spark安装目录", + "configType": "map", + "required": true, + "type": "input", + "value": "/opt/datasophon/spark-3.1.3/", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "/opt/datasophon/spark-3.1.3/" + }, + { + "name": "hadoopConfDir", + "label": "hadoop配置目录", + "description": "hadoop配置目录", + "configType": "map", + "required": true, + "type": "input", + "value": "/opt/datasophon/hadoop-3.3.3/etc/hadoop", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "/opt/datasophon/hadoop-3.3.3/etc/hadoop" + }, + { + "name": "kyuubiServerHeapSize", + "label": "KyuubiServerjvm内存", + "description": "KyuubiServerjvm内存", + "configType": "map", + "required": true, + "minValue": 0, + "maxValue": 32, + "type": "slider", + "value": "", + "unit": "GB", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "4" + }, + { + "name": "kyuubiClientHeapSize", + "label": "KyuubiClientjvm内存", + "description": "KyuubiClientjvm内存", + "configType": "map", + "required": true, + "minValue": 0, + "maxValue": 32, + "type": "slider", + "value": "", + "unit": "GB", + "configurableInWizard": true, + "hidden": false, + "defaultValue": "2" + }, + { + "name": "enableKerberos", + "label": "开启Kerberos认证", + "description": "开启Kerberos认证", + "required": false, + "type": "switch", + "value": false, + "configurableInWizard": true, + "hidden": false, + "defaultValue": false + }, + { + "name": "kyuubi.authentication", + "label": "Kyuubi服务认证方式", + "description": "", + "configWithKerberos": true, + "required": false, + "configType": "kb", + "type": "input", + "value": "KERBEROS", + "configurableInWizard": true, + "hidden": true, + "defaultValue": "KERBEROS" + }, + { + "name": "kyuubi.kinit.principal", + "label": "Kyuubi服务的Kerberos主体", + "description": "", + "configWithKerberos": true, + "required": false, + "configType": "kb", + "type": "input", + "value": "kyuubi/${host}@${realm}", + "configurableInWizard": true, + "hidden": true, + "defaultValue": "kyuubi/${host}@${realm}" + }, + { + "name": "kyuubi.kinit.keytab", + "label": "Kyuubi服务的Kerberos密钥文件路径", + "description": "", + "configWithKerberos": true, + "required": false, + "configType": "kb", + "type": "input", + "value": "/etc/security/keytab/kyuubi.service.keytab", + "configurableInWizard": true, + "hidden": true, + "defaultValue": "/etc/security/keytab/kyuubi.service.keytab" + }, + { + "name": "custom.kyuubi-env.sh", + "label": "自定义配置kyuubi-env.sh", + "description": "自定义配置", + "configType": "custom", + "required": false, + "type": "multipleWithKey", + "value": [], + "configurableInWizard": true, + "hidden": false, + "defaultValue": "" + }, + { + "name": "custom.kyuubi-defaults.conf", + "label": "自定义配置kyuubi-defaults.conf", + "description": "自定义配置", + "configType": "custom", + "required": false, + "type": "multipleWithKey", + "value": [], + "configurableInWizard": true, + "hidden": false, + "defaultValue": "" + } + ] } \ No newline at end of file diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/PROMETHEUS/control.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/PROMETHEUS/control.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/PROMETHEUS/control.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/PROMETHEUS/control.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/PROMETHEUS/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/PROMETHEUS/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/PROMETHEUS/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/PROMETHEUS/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/RANGER/ranger_admin.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/RANGER/ranger_admin.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/RANGER/ranger_admin.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/RANGER/ranger_admin.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/RANGER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/RANGER/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/RANGER/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/RANGER/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/SPARK3/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/SPARK3/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/SPARK3/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/SPARK3/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/SPARK3/status-master.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/SPARK3/status-master.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/SPARK3/status-master.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/SPARK3/status-master.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/SPARK3/status-slave.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/SPARK3/status-slave.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/SPARK3/status-slave.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/SPARK3/status-slave.sh diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/STREAMPARK/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/STREAMPARK/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/STREAMPARK/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/STREAMPARK/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/TRINO/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/TRINO/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/TRINO/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/TRINO/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/YARN/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/YARN/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/YARN/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/YARN/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ZOOKEEPER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ZOOKEEPER/service_ddl.json similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/ZOOKEEPER/service_ddl.json rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/ZOOKEEPER/service_ddl.json diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ZOOKEEPER/zkStatus.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ZOOKEEPER/zkStatus.sh similarity index 100% rename from datasophon-api/src/main/resources/meta/DDP-1.2.0/ZOOKEEPER/zkStatus.sh rename to datasophon-api/src/main/resources/meta/DDP-1.2.1/ZOOKEEPER/zkStatus.sh diff --git a/datasophon-worker/src/main/resources/script/datasophon-env.sh b/datasophon-worker/src/main/resources/script/datasophon-env.sh index f957c15e..1e31ddb9 100644 --- a/datasophon-worker/src/main/resources/script/datasophon-env.sh +++ b/datasophon-worker/src/main/resources/script/datasophon-env.sh @@ -9,9 +9,10 @@ export HIVE_HOME=/opt/datasophon/hive-3.1.0 export KAFKA_HOME=/opt/datasophon/kafka-2.4.1 export HBASE_HOME=/opt/datasophon/hbase-2.4.16 -export FLINK_HOME=/opt/datasophon/flink-1.15.2 +export FLINK_HOME=/opt/datasophon/flink-1.17.1 export HADOOP_HOME=/opt/datasophon/hadoop-3.3.3 export HADOOP_CONF_DIR=/opt/datasophon/hadoop-3.3.3/etc/hadoop +export HADOOP_CLASSPATH=`hadoop classpath` export PATH=$PATH:$JAVA_HOME/bin:$SPARK_HOME/bin:$HADOOP_HOME/bin:$HIVE_HOME/bin:$FLINK_HOME/bin:$KAFKA_HOME/bin:$HBASE_HOME/bin diff --git a/pom.xml b/pom.xml index 60594d43..aafa5fa9 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ - 1.2.0 + 1.2.1 2.4.20 3.0.1 2.6