You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by xx...@apache.org on 2020/08/31 03:07:35 UTC
[kylin] branch kylin-on-parquet-v2 updated: KYLIN-4705 add rest api
for sparder-context url monitor
This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this push:
new e573ed3 KYLIN-4705 add rest api for sparder-context url monitor
e573ed3 is described below
commit e573ed3d4d87687885df474fdbcaff0c54c9e79d
Author: XiaoxiangYu <hi...@126.com>
AuthorDate: Fri Aug 28 13:58:10 2020 +0800
KYLIN-4705 add rest api for sparder-context url monitor
---
.../java/org/apache/kylin/rest/controller/AdminController.java | 2 +-
webapp/app/js/controllers/admin.js | 7 ++++++-
webapp/app/partials/admin/config.html | 3 +++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/AdminController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/AdminController.java
index cb44c0a..057eb67 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/controller/AdminController.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/controller/AdminController.java
@@ -107,7 +107,7 @@ public class AdminController extends BasicController {
return configRes;
}
- @RequestMapping(value = "/sparder_rul", method = { RequestMethod.GET }, produces = { "application/json" })
+ @RequestMapping(value = "/sparder_url", method = { RequestMethod.GET }, produces = { "application/json" })
@ResponseBody
public GeneralResponse getSparderUrl() throws IOException {
GeneralResponse configRes = new GeneralResponse();
diff --git a/webapp/app/js/controllers/admin.js b/webapp/app/js/controllers/admin.js
index 9fce648..f1054e0 100644
--- a/webapp/app/js/controllers/admin.js
+++ b/webapp/app/js/controllers/admin.js
@@ -29,7 +29,7 @@ KylinApp.controller('AdminCtrl', function ($scope, AdminService, CacheService, T
$scope.active = {}; //reset
$scope.active[tab] = true;
}
- $scope.$on('change.active', function(event, data) {
+ $scope.$on('change.active', function(event, data) {
$scope.activateTab(data.activeTab);
$scope.tabData.groupName = data.groupName
});
@@ -307,6 +307,11 @@ KylinApp.controller('AdminCtrl', function ($scope, AdminService, CacheService, T
$window.open(downloadUrl);
}
+ $scope.openSparderUrl = function(){
+ var sparder_url = Config.service.url + 'admin/sparder_url';
+ $window.open(sparder_url);
+ }
+
$scope.isCuratorScheduler = function() {
return kylinConfig.getProperty("kylin.job.scheduler.default") === "100";
}
diff --git a/webapp/app/partials/admin/config.html b/webapp/app/partials/admin/config.html
index 5c66942..ee10dcc 100644
--- a/webapp/app/partials/admin/config.html
+++ b/webapp/app/partials/admin/config.html
@@ -48,6 +48,9 @@
<div style="padding-top: 10px;width: 260px;" ng-if="false">
<a class="btn btn-success btn-lg btn-block" tooltip="Clean unused HDFS and HBASE space" ng-click="cleanStorage()">Clean Up Storage</a>
</div>
+ <div style="padding-top: 10px;width: 260px;">
+ <a ng-click="openSparderUrl();" tooltip="Click to visit Sparder URL." class="btn btn-primary btn-lg btn-block"><i class="fa fa-server"></i>Sparder</a>
+ </div>
<div style="padding-top: 10px;width: 260px;" ng-if="isCacheEnabled()">
<a class="btn btn-primary btn-lg btn-block" ng-click="disableCache()">Disable Cache</a>
</div>