' + build.displayName + '
' + - 'duration: ' + y + ' seconds
'; - if (date) { - tooltip += 'started: ' + date + '
'; - } - if (result) { - tooltip += 'result: ' + result + '
'; - } - if (x) { - var data = buildsSucceeded; - var key = successBuildKey; - if (!successBuildKey && (!result || !result.startsWith("SUCC"))) { - data = buildsFailed; - key = failedBuildKey; - } - data.push({ - tooltip: tooltip, - color: color, - x: x, y: y }); - } - }); - $scope.data = []; - if (buildsSucceeded.length) { - $scope.data.push({ - key: successBuildKey, - values: buildsSucceeded - }); + }; + }]); + Configs.VolumeController = Configs.controller('VolumeController', ['$scope', '$http', function ($scope, $http) { + $scope.submitted = false; + $scope.status = $scope.ngDialogData.status; + $scope.cancel = function () { + $scope.closeThisDialog(); + $scope.submitted = false; + }; + $scope.deleteBrock = function (volume, brock) { + if (volume.brick.length > 1) + Configs.deleteBrock(volume, brock); + else + $scope.showMessage = true; + }; + $scope.addBrock = function (volume) { + var block = { + ip: "", + path: "", + status: false, + editable: true + }; + Configs.addBrock(volume, block); + $scope.showMessage = false; + }; + $scope.stopVolume = function (volume) { + volume.status = false; + }; + $scope.startVolume = function (volume) { + volume.status = true; + }; + $scope.onSubmit = function (entity) { + if ($scope.volumeForm.$valid) { + $scope.$emit('update', entity); + $scope.closeThisDialog(); } - if (buildsFailed.length) { - $scope.data.push({ - key: failedBuildKey, - values: buildsFailed - }); + else { + $scope.submitted = true; } - $scope.api.updateWithData($scope.data); - $timeout(function () { - $scope.api.update(); - }, 50); + }; + }]); + Configs.SystemInfoController = Configs.controller('SystemInfoController', ['$scope', function ($scope) { + }]); + Configs.SqlViewController = Configs.controller('SqlViewController', ['$scope', '$http', function ($scope, $http) { + $scope.title = shareInit($scope.ngDialogData); + $scope.content = ""; + getSqlContent(); + function getSqlContent() { + $http({ + url: "/java/console/api/filePackage/readSqlFile", + method: 'POST', + params: { type: $scope.ngDialogData.type }, + data: JSON.stringify($scope.ngDialogData.item) + }).success(function (data, header, config, status) { + $scope.old_content = data.data1; + //响应成功 + }).error(function (data, header, config, status) { + //处理响应失败 + $scope.old_content = "获取脚本内容失败"; + }); } - function updateData() { - var metricsPath = $scope.jobId ? UrlHelpers.join("job", $scope.jobId, "fabric8/metrics") : "fabric8/metrics"; - var url = Kubernetes.kubernetesProxyUrlForServiceCurrentNamespace(Developer.jenkinsServiceNameAndPort, metricsPath); - Developer.log.info(""); - if (url && (!$scope.jenkins || Kubernetes.keepPollingModel)) { - $http.get(url, Developer.jenkinsHttpConfig). - success(function (data, status, headers, config) { - if (data) { - if (Developer.hasObjectChanged(data, $scope.entityChangedCache)) { - Developer.log.info("entity has changed!"); - $scope.metrics = data; - updateChartData(); - } + $scope.upLoadSqlFile = function () { + if (typeof FileReader == 'undefined') { + throw "浏览器不支持FileReader读取文件"; + } + else { + Configs.FileInputPlugin(function (file) { + if (typeof typeof FileReader == 'undefined') + throw "浏览器不支持FileReader读取文件"; + else { + var fr = new FileReader(); + fr.onloadend = function (e) { + $scope.new_content = e.target["result"]; + $scope.enable = true; + }; + fr.onloadstart = function () { + $scope.$apply(function () { + $scope.content = "正在读取数据请稍等..."; + }); + $scope.content = "正在读取数据请稍等..."; + }; + fr.readAsText(file[0], "GBK"); } - $scope.model.fetched = true; - Core.$apply($scope); - }). - error(function (data, status, headers, config) { - Developer.log.warn("Failed to load " + url + " " + data + " " + status); }); } - } + }; + $scope.onOk = function () { + $scope.enable = false; + if (null == $scope.new_content || $scope.new_content == "") { + console.log("上传的内容不能为空"); + $scope.closeThisDialog(); + } + else { + $scope.$emit("onOk", { + url: "/java/console/api/filePackage/handleSqlFile", + item: $scope.ngDialogData.item, + content: $scope.new_content, + opt: "add", + type: $scope.ngDialogData.type + }); + $scope.closeThisDialog(); + } + }; + $scope.cancel = function () { + $scope.enable = false; + $scope.closeThisDialog(); + }; }]); -})(Developer || (Developer = {})); - -///\n = [];
- function systemModelServices() {
- this.systemInfoList = [];
- this.systemInfo = [];
- this.regionalismInfo = [];
- this.sqlInfo = [];
- this.updateCodeInfo();
- this.updateExcelInfo();
- this.updateSqlInfo();
- //this.updateCheckInfo();
- //console.log(classifyCountry(this.regionalismInfo, '南京市'));
+ $scope.$watch('selectedBuild', function (selectedBuild) {
+ Developer.log.info("Selected build updated: ", selectedBuild);
+ $scope.fetch();
+ });
+ Kubernetes.initShared($scope, $location, $http, $timeout, $routeParams, KubernetesModel, KubernetesState, KubernetesApiURL);
+ $scope.breadcrumbConfig = Developer.createJenkinsBreadcrumbs($scope.id, getJobId(), getBuildId());
+ $scope.subTabConfig = Developer.createJenkinsSubNavBars($scope.id, getJobId(), getBuildId(), {
+ label: "Log",
+ title: "Views the logs of this build"
+ });
+ function getJobId() {
+ // lets allow the parent scope to be used too for when this is used as a panel
+ return $routeParams["job"] || ($scope.selectedBuild || {}).$jobId;
}
- systemModelServices.prototype.updateExcelInfo = function () {
- var result = [];
- $.ajax({
- async: false,
- type: "POST",
- url: "/java/console/api/fileOperation/findAll",
- success: function (data) {
- if (data)
- result = data.data;
- }
+ $scope.getJobId = getJobId;
+ function getBuildId() {
+ // lets allow the parent scope to be used too for when this is used as a panel
+ return $routeParams["build"] || ($scope.selectedBuild || {}).id;
+ }
+ $scope.getBuildId = getBuildId;
+ function updateJenkinsLink() {
+ var jenkinsUrl = Developer.jenkinsLink();
+ if (jenkinsUrl) {
+ $scope.$viewJenkinsBuildLink = UrlHelpers.join(jenkinsUrl, "job", getJobId(), getBuildId());
+ $scope.$viewJenkinsLogLink = UrlHelpers.join($scope.$viewJenkinsBuildLink, "console");
+ }
+ }
+ var querySize = 50000;
+ $scope.approve = function (url, operation) {
+ var modal = $modal.open({
+ templateUrl: UrlHelpers.join(Developer.templatePath, 'jenkinsApproveModal.html'),
+ controller: ['$scope', '$modalInstance', function ($scope, $modalInstance) {
+ $scope.operation = operation;
+ $scope.header = operation + "?";
+ $scope.ok = function () {
+ modal.close();
+ postToJenkins(url, operation);
+ };
+ $scope.cancel = function () {
+ modal.dismiss();
+ };
+ }]
});
- this.systemInfoList = result;
};
- systemModelServices.prototype.updateSqlInfo = function () {
- var result = [];
- $.ajax({
- async: false,
- type: "POST",
- url: "/java/console/api/filePackage/findAll",
- success: function (data) {
- if (data)
- result = data.data;
+ function postToJenkins(uri, operation) {
+ var url = Kubernetes.kubernetesProxyUrlForServiceCurrentNamespace(Developer.jenkinsServiceNameAndPort, uri);
+ if (url) {
+ var body = null;
+ var config = {
+ headers: {}
+ };
+ Developer.log.info("posting to jenkinsUrl: " + url);
+ $http.post(url, body, config).
+ success(function (data, status, headers, config) {
+ Developer.log.info("Managed to " + operation + " at " + url);
+ }).
+ error(function (data, status, headers, config) {
+ Developer.log.warn("Failed " + operation + " job at " + url + " " + data + " " + status);
+ });
+ }
+ else {
+ Developer.log.warn("Cannot post to jenkins URI: " + uri + " as no jenkins found!");
+ }
+ }
+ $scope.$keepPolling = function () { return Kubernetes.keepPollingModel; };
+ $scope.fetch = PollHelpers.setupPolling($scope, function (next) {
+ if ($scope.$eval('hideLogs && !build.building')) {
+ Developer.log.debug("Log hidden, not fetching logs");
+ return;
+ }
+ else {
+ Developer.log.debug("Fetching logs for build: ", $scope.$eval('build'));
+ }
+ var buildId = getBuildId();
+ var jobId = getJobId();
+ //log.info("=== jenkins log querying job " + jobId + " build " + buildId + " selected build " + $scope.selectedBuild);
+ if (jobId && buildId) {
+ if ($scope.buildId !== buildId || $scope.jobId !== jobId) {
+ // lets clear the query
+ $scope.log = {
+ html: "",
+ start: 0,
+ firstIdx: null
+ };
}
- });
- this.sqlInfo = result;
- };
- systemModelServices.prototype.updateCodeInfo = function () {
- var result = [];
- $.ajax({
- async: false,
- type: "POST",
- url: "/java/console/api/code/list",
- success: function (data) {
- if (data) {
- result = data;
- }
+ $scope.buildId = buildId;
+ $scope.jobId = jobId;
+ var url = Kubernetes.kubernetesProxyUrlForServiceCurrentNamespace(Developer.jenkinsServiceNameAndPort, UrlHelpers.join("job", jobId, buildId, "fabric8/logHtml?tail=1&start=" + $scope.log.start + "&size=" + querySize));
+ if ($scope.log.firstIdx !== null) {
+ url += "&first=" + $scope.log.firstIdx;
}
- });
- this.regionalismInfo = result["regionalism"];
- this.systemInfo = result["system"];
- };
- return systemModelServices;
- }());
- System._module.factory('SystemModel', ['$rootScope', '$http', function ($rootScope, $http) {
- return new systemModelServices();
- }]);
-})(System || (System = {}));
-
-/// {
- collection: filter,
- index: 'index',
- onClose: (result:boolean) => {
- if(result){
- $http({
- url: "/java/console/api/checkout/deleteList",
- method: "POST",
- data: filter
- }).success((data, header, config, status) => {
- $scope.tableData = data.data;
- var result = [];
- if($scope.y != 'all'){
- angular.forEach($scope.tableData, (item) =>{
- if(item.districtName == $scope.y)
- result.push(item);
- });
- }else{
- result = $scope.tableData;
- }
- $scope.tableParams.settings({
- dataset: result
+ var pipelines = [];
+ angular.forEach(builds, function (build) {
+ var buildStatus = build.status || {};
+ var result = buildStatus.phase || "";
+ var resultUpperCase = result.toUpperCase();
+ var description = "";
+ var $viewLink = build.$viewLink;
+ var $logLink = build.$logsLink;
+ var $timestamp = build.$creationDate;
+ var duration = buildStatus.duration;
+ if (duration) {
+ // 17s = 17,000,000,000 on openshift
+ duration = duration / 1000000;
+ }
+ var displayName = Kubernetes.getName(build);
+ var $iconClass = Developer.createBuildStatusIconClass(resultUpperCase);
+ var $backgroundClass = Developer.createBuildStatusBackgroundClass(resultUpperCase);
+ var stage = {
+ stageName: "OpenShift Build",
+ $viewLink: $viewLink,
+ $logLink: $logLink,
+ $startTime: $timestamp,
+ duration: duration,
+ status: result,
+ $iconClass: $iconClass,
+ $backgroundClass: $backgroundClass
+ };
+ var pipeline = {
+ description: description,
+ displayName: displayName,
+ $viewLink: $viewLink,
+ $logLink: $logLink,
+ $timestamp: $timestamp,
+ duration: duration,
+ stages: [stage]
+ };
+ pipelines.push(pipeline);
});
- }).error((data, header, config, status) => {
- throw "请求失败"
- });
- }
- },
- title: '是否需要删除采集数据？',
- action: '以下采集数据文件将会被删除:',
- okText: '删除',
- okClass: 'btn-danger sj_btn_cir',
- custom: "该删除操作将会彻底删除数据文件,是否删除，请确认！",
- customClass: "alert alert-warning sj_alert-warning",
- cancelText: "取消",
- cancelClass: 'sj_btn_grey'
- }).open(); */
- };
- $scope.check = function () {
- //var sqlServerDB = [];
- var oracleDB = [];
- var selectedItems = [];
- /**
- ** 检查是否有默认标准表汇总库
- **/
- var answer = false;
- for (var i = 0; i < ConfigsModel.oracleParam.length; ++i) {
- if (ConfigsModel.oracleParam[i].type == 1) {
- answer = true;
- break;
+ // lets filter the OpenShift builds and make a pipeline from that
+ $scope.model.job = {
+ $jobId: $scope.jobId,
+ $project: $scope.projectId,
+ builds: pipelines
+ };
}
+ $scope.model.fetched = true;
+ Core.$apply($scope);
}
- if (answer == false) {
- /**
- 提示没有配置标准表汇总库
- **/
- Configs.customAlert("提示", "操作失败:没有配置默认的标准表汇总库", '', null, 0, "error");
- return;
- }
- if ($scope.tableData && $scope.tableData.length > 0) {
- for (var i = 0; i < $scope.tableData.length; ++i) {
- var item = $scope.tableData[i];
- if ($scope.checkboxes.items[item.id]) {
- if (item.collection == '否') {
- /*
- **提示出现没有采集数据的信息系统
- code
- */
- Configs.customAlert("提示", "操作失败:选择的系统存在没有数据的系统", '', null, 0, "error");
- return;
- }
- item["_key"] = item.areaCode + "-" + item.sysCode + "-" + item.dataVersion;
- selectedItems.push(item);
- if (item.dataBaseType == 'ORACLE') {
- oracleDB.push(item);
- }
+ }
+ else {
+ $scope.model.fetched = true;
+ Core.$apply($scope);
+ }
+ }, 50);
+ updateData();
+ }]);
+})(Developer || (Developer = {}));
+
+/// {
- pages: {
- Source: {
- controls: ["source"]
- },
- Revision: {
- controls: ["revision"]
- },
- Output: {
- controls: ["output"]
- },
- Resources: {
- controls: ["resources"]
- },
- Strategy: {
- controls: ["strategy"]
- },
- Triggers: {
- controls: ["triggers"]
- },
- "Service Account": {
- controls: ["serviceAccount"]
- }
- }
- };
- */
- $scope.entity = {
- "apiVersion": "v1",
- "kind": "BuildConfig",
- "metadata": {
- "name": "",
- "labels": {}
- },
- "spec": {
- "source": {
- "type": "Git"
- },
- "strategy": {
- "type": "Custom",
- "customStrategy": {
- "from": {
- "kind": "DockerImage",
- "name": "fabric8/openshift-s2i-jenkins-trigger"
- },
- "env": [
- {
- "name": "BASE_URI",
- "value": jenkinsUrl
- },
- {
- "name": "JOB_NAME",
- "value": jobName
- }
- ]
- }
+ };
+ $scope.last = function () {
+ var idx = $scope.model.getParamOption("currentPageNum");
+ var length = $scope.options.getPageSizeNum();
+ if (idx < length) {
+ Kubernetes.eliminateChechBoxClick();
+ $scope.model.updateParamOption("currentPageNum", length);
}
- }
- };
- $scope.$watch('entity.spec.source.git.uri', function (val) {
- if (!val) {
- return;
- }
- var lastBit = val.match(/[^\/]+$/)[0];
- if (lastBit) {
- var name = lastBit.replace(/\.git$/, '');
- Kubernetes.log.debug("name: ", name);
- if (!Core.isBlank(name)
- && Core.isBlank(Core.pathGet($scope.entity, ['metadata', 'name']))) {
- Core.pathSet($scope.entity, ['metadata', 'name'], name);
+ };
+ $scope.previous = function () {
+ var idx = $scope.model.getParamOption("currentPageNum");
+ var length = $scope.options.getPageSizeNum();
+ if (idx > 1) {
+ Kubernetes.eliminateChechBoxClick();
+ $scope.model.updateParamOption("currentPageNum", idx - 1);
}
- }
- });
- Kubernetes.initShared($scope, $location, $http, $timeout, $routeParams, KubernetesModel, KubernetesState, KubernetesApiURL);
- $scope.breadcrumbConfig = Developer.createProjectSettingsBreadcrumbs($scope.projectId);
- $scope.subTabConfig = Developer.createProjectSubNavBars($scope.projectId);
- $scope.tabs = Developer.createProjectSettingsSubNavBars($scope.projectId);
- Kubernetes.watch($scope, $element, "secrets", $scope.namespace, onSecrets);
- $scope.buildConfigClient = K8SClientFactory.create("buildconfigs", $scope.namespace);
- $element.on('$destroy', function () {
- $scope.$destroy();
- });
- $scope.$on('$destroy', function () {
- K8SClientFactory.destroy($scope.buildConfigClient);
- });
- /*
- $scope.$on('kubernetesModelUpdated', function () {
- updateData();
- });
-
- */
- $scope.$on('$routeUpdate', function ($event) {
- updateData();
- });
- $scope.save = function () {
- Kubernetes.log.info("Saving!");
- var entity = $scope.entity;
- var spec = (entity || {}).spec || {};
- // TODO update the jenkins job name!
- // lets delete lots of cruft
- var strategy = spec.strategy || {};
- delete strategy["dockerStrategy"];
- delete strategy["sourceStrategy"];
- delete spec["revision"];
- delete spec["output"];
- delete spec["resources"];
- var strategyPullSecretName = Core.pathGet(spec, ["strategy", "customStrategy", "pullSecret", "name"]);
- var sourceSecretName = Core.pathGet(spec, ["source", "sourceSecret", "name"]);
- Kubernetes.log.info("sourceSecretName: " + sourceSecretName);
- Kubernetes.log.info("strategyPullSecretName: " + strategyPullSecretName);
- if (!strategyPullSecretName && sourceSecretName) {
- Core.pathSet(spec, ["strategy", "customStrategy", "pullSecret", "name"], sourceSecretName);
- }
- /*
- // TODO hack until the put deals with updates
- var metadata = entity.metadata;
- if (metadata) {
- delete metadata["resourceVersion"];
- }
- */
- Kubernetes.log.info(angular.toJson(entity, true));
- $scope.buildConfigClient.put(entity, function (obj) {
- Kubernetes.log.info("build config created!");
- var link = Developer.projectSecretsLink($scope.namespace, Kubernetes.getName(entity));
- if (link) {
- Kubernetes.log.info("Navigating to: " + link);
- $location.path(link);
+ };
+ $scope.next = function () {
+ var length = $scope.options.getPageSizeNum();
+ var idx = $scope.model.getParamOption("currentPageNum");
+ if (idx < length) {
+ Kubernetes.eliminateChechBoxClick();
+ $scope.model.updateParamOption("currentPageNum", idx + 1);
}
- else {
- Kubernetes.log.warn("Could not find the edit pipeline link!");
+ };
+ $scope.$watch('model.paramOptions', function (newValue, oldValue) {
+ if (newValue) {
+ if (newValue.currentTableSize !== oldValue.currentTableSize)
+ $scope.options.priorTableSize = oldValue.currentTableSize;
+ else
+ $scope.options.priorTableSize = newValue.currentTableSize;
+ DataModel.updateModel();
}
- });
- };
- updateData();
- var jenkinsUrl = Developer.jenkinsLink();
- var jobName = "";
- function updateData() {
- $scope.item = null;
- if ($scope.id) {
- var url = Kubernetes.buildConfigRestUrl($scope.id);
- $http.get(url).
- success(function (data, status, headers, config) {
- if (data) {
- $scope.entity = data;
- var buildConfig = angular.copy(data);
- var sortedBuilds = null;
- Kubernetes.enrichBuildConfig(buildConfig, sortedBuilds);
- $scope.buildConfig = buildConfig;
- }
- $scope.spec = ($scope.entity || {}).spec || {};
- $scope.fetched = true;
- // lets update the tabs
- $scope.subTabConfig = Developer.createProjectSubNavBars($scope.projectId, null, $scope);
- Core.$apply($scope);
- }).
- error(function (data, status, headers, config) {
- Kubernetes.log.warn("Failed to load " + url + " " + data + " " + status);
- });
- }
- else {
- $scope.fetched = true;
- $scope.spec = $scope.entity.spec;
- Core.$apply($scope);
- }
- }
- function onSecrets(secrets) {
- var array = [];
- angular.forEach(secrets, function (secret) {
- var name = Kubernetes.getName(secret);
- if (name) {
- array.push({
- label: name,
- value: name,
- "attributes": {
- "title": name
- },
- $secret: secret
- });
- }
- });
- $scope.secrets = _.sortBy(array, "label");
- var specSourceSecretNamePath = ['spec', 'source', 'sourceSecret', 'name'];
- if ($scope.entity && !Core.pathGet($scope.entity, specSourceSecretNamePath)) {
- var defaultSecretName = findDefaultImportSecretName(secrets);
- Core.pathSet($scope.entity, specSourceSecretNamePath, defaultSecretName);
- }
- }
- function findDefaultImportSecretName(secrets) {
- var answer = null;
- angular.forEach(secrets, function (secret) {
- var name = Kubernetes.getName(secret);
- if (!answer && name && name.startsWith("jenkins-login")) {
- answer = name;
- }
- });
- if (!answer) {
- angular.forEach(secrets, function (secret) {
- var name = Kubernetes.getName(secret);
- if (!answer && name && name.startsWith("jenkins-token")) {
- answer = name;
- }
- });
- }
- return answer;
- }
- switch (mode) {
- case 'create':
- delete specConfig.tabs;
- _.forIn(buildSource.properties, function (property, name) {
- if (name !== 'git') {
- Kubernetes.log.info("Hiding property: ", name);
- property.hidden = true;
- }
- });
- _.forIn(gitBuildSource.properties, function (property, name) {
- if (name !== 'uri') {
- Kubernetes.log.info("Hiding property: ", name);
- property.hidden = true;
- }
- else {
- property.label = "Git URL";
- property['input-attributes'] = {
- 'required': true
- };
- }
- });
- _.forIn(specConfig.properties, function (property, name) {
- if (name !== 'source') {
- Kubernetes.log.info("Hiding property: ", name);
- property.hidden = true;
- }
- });
- break;
- case 'edit':
- default:
- }
- $scope.specConfig = specConfig;
- }]);
-})(Kubernetes || (Kubernetes = {}));
-
-/// {
+ pages: {
+ Source: {
+ controls: ["source"]
},
- "kubernetes_AWSElasticBlockStoreVolumeSource": {
- "type": "object",
- "description": "",
- "properties": {
- "fsType": {
- "type": "string",
- "description": "file system type to mount"
- },
- "partition": {
- "type": "integer",
- "description": "partition on the disk to mount (e.g."
- },
- "readOnly": {
- "type": "boolean",
- "description": "read-only if true"
- },
- "volumeID": {
- "type": "string",
- "description": "unique id of the PD resource in AWS; see http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#awselasticblockstore"
- }
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.AWSElasticBlockStoreVolumeSource"
+ Revision: {
+ controls: ["revision"]
},
- "kubernetes_Capabilities": {
- "type": "object",
- "description": "",
- "properties": {
- "add": {
- "type": "array",
- "description": "added capabilities",
- "items": {
- "type": "string",
- "description": "added capabilities"
- }
- },
- "drop": {
- "type": "array",
- "description": "droped capabilities",
- "items": {
- "type": "string",
- "description": "droped capabilities"
- }
- }
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.Capabilities"
+ Output: {
+ controls: ["output"]
},
- "kubernetes_CephFSVolumeSource": {
- "type": "object",
- "description": "",
- "properties": {
- "monitors": {
- "type": "array",
- "description": "a collection of Ceph monitors",
- "items": {
- "type": "string",
- "description": "a collection of Ceph monitors"
- }
- },
- "readOnly": {
- "type": "boolean",
- "description": "Ceph fs to be mounted with read-only permissions"
- },
- "secretFile": {
- "type": "string",
- "description": "path to secret for rados user; default is /etc/ceph/user.secret; optional"
- },
- "secretRef": {
- "$ref": "#/definitions/kubernetes_LocalObjectReference",
- "javaType": "io.fabric8.kubernetes.api.model.LocalObjectReference"
- },
- "user": {
- "type": "string",
- "description": "rados user name; default is admin; optional"
- }
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.CephFSVolumeSource"
+ Resources: {
+ controls: ["resources"]
},
- "kubernetes_Container": {
- "type": "object",
- "description": "",
- "properties": {
- "args": {
- "type": "array",
- "description": "command array; the docker image's cmd is used if this is not provided; arguments to the entrypoint; cannot be updated; variable references $(VAR_NAME) are expanded using the container's environment variables; if a variable cannot be resolved",
- "items": {
- "type": "string",
- "description": "command array; the docker image's cmd is used if this is not provided; arguments to the entrypoint; cannot be updated; variable references $(VAR_NAME) are expanded using the container's environment variables; if a variable cannot be resolved"
- }
- },
- "command": {
- "type": "array",
- "description": "entrypoint array; not executed within a shell; the docker image's entrypoint is used if this is not provided; cannot be updated; variable references $(VAR_NAME) are expanded using the container's environment variables; if a variable cannot be resolved",
- "items": {
- "type": "string",
- "description": "entrypoint array; not executed within a shell; the docker image's entrypoint is used if this is not provided; cannot be updated; variable references $(VAR_NAME) are expanded using the container's environment variables; if a variable cannot be resolved"
- }
- },
- "env": {
- "type": "array",
- "description": "list of environment variables to set in the container; cannot be updated",
- "items": {
- "$ref": "#/definitions/kubernetes_EnvVar",
- "javaType": "io.fabric8.kubernetes.api.model.EnvVar"
- }
- },
- "image": {
- "type": "string",
- "description": "Docker image name; see http://releases.k8s.io/HEAD/docs/user-guide/images.md"
- },
- "imagePullPolicy": {
- "type": "string",
- "description": "image pull policy; one of Always"
- },
- "lifecycle": {
- "$ref": "#/definitions/kubernetes_Lifecycle",
- "javaType": "io.fabric8.kubernetes.api.model.Lifecycle"
- },
- "livenessProbe": {
- "$ref": "#/definitions/kubernetes_Probe",
- "javaType": "io.fabric8.kubernetes.api.model.Probe"
- },
- "name": {
- "type": "string",
- "description": "name of the container; must be a DNS_LABEL and unique within the pod; cannot be updated",
- "maxLength": 63,
- "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
- },
- "ports": {
- "type": "array",
- "description": "list of ports to expose from the container; cannot be updated",
- "items": {
- "$ref": "#/definitions/kubernetes_ContainerPort",
- "javaType": "io.fabric8.kubernetes.api.model.ContainerPort"
- }
- },
- "readinessProbe": {
- "$ref": "#/definitions/kubernetes_Probe",
- "javaType": "io.fabric8.kubernetes.api.model.Probe"
- },
- "resources": {
- "$ref": "#/definitions/kubernetes_ResourceRequirements",
- "javaType": "io.fabric8.kubernetes.api.model.ResourceRequirements"
- },
- "securityContext": {
- "$ref": "#/definitions/kubernetes_SecurityContext",
- "javaType": "io.fabric8.kubernetes.api.model.SecurityContext"
- },
- "stdin": {
- "type": "boolean",
- "description": "Whether this container should allocate a buffer for stdin in the container runtime; default is false"
- },
- "terminationMessagePath": {
- "type": "string",
- "description": "path at which the file to which the container's termination message will be written is mounted into the container's filesystem; message written is intended to be brief final status"
- },
- "tty": {
- "type": "boolean",
- "description": "Whether this container should allocate a TTY for itself"
- },
- "volumeMounts": {
- "type": "array",
- "description": "pod volumes to mount into the container's filesyste; cannot be updated",
- "items": {
- "$ref": "#/definitions/kubernetes_VolumeMount",
- "javaType": "io.fabric8.kubernetes.api.model.VolumeMount"
- }
- },
- "workingDir": {
- "type": "string",
- "description": "container's working directory; defaults to image's default; cannot be updated"
- }
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.Container"
+ Strategy: {
+ controls: ["strategy"]
},
- "kubernetes_ContainerPort": {
- "type": "object",
- "description": "",
- "properties": {
- "containerPort": {
- "type": "integer",
- "description": "number of port to expose on the pod's IP address"
- },
- "hostIP": {
- "type": "string",
- "description": "host IP to bind the port to"
- },
- "hostPort": {
- "type": "integer",
- "description": "number of port to expose on the host; most containers do not need this"
- },
- "name": {
- "type": "string",
- "description": "name for the port that can be referred to by services; must be an IANA_SVC_NAME and unique within the pod"
- },
- "protocol": {
- "type": "string",
- "description": "protocol for port; must be UDP or TCP; TCP if unspecified"
- }
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.ContainerPort"
+ Triggers: {
+ controls: ["triggers"]
},
- "kubernetes_ContainerState": {
- "type": "object",
- "description": "",
- "properties": {
- "running": {
- "$ref": "#/definitions/kubernetes_ContainerStateRunning",
- "javaType": "io.fabric8.kubernetes.api.model.ContainerStateRunning"
- },
- "terminated": {
- "$ref": "#/definitions/kubernetes_ContainerStateTerminated",
- "javaType": "io.fabric8.kubernetes.api.model.ContainerStateTerminated"
- },
- "waiting": {
- "$ref": "#/definitions/kubernetes_ContainerStateWaiting",
- "javaType": "io.fabric8.kubernetes.api.model.ContainerStateWaiting"
- }
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.ContainerState"
+ "Service Account": {
+ controls: ["serviceAccount"]
+ }
+ }
+ };
+ */
+ $scope.entity = {
+ "apiVersion": "v1",
+ "kind": "BuildConfig",
+ "metadata": {
+ "name": "",
+ "labels": {}
},
- "kubernetes_ContainerStateRunning": {
- "type": "object",
- "description": "",
- "properties": {
- "startedAt": {
- "type": "string",
- "description": "time at which the container was last (re-)started"
- }
+ "spec": {
+ "source": {
+ "type": "Git"
},
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.ContainerStateRunning"
- },
- "kubernetes_ContainerStateTerminated": {
- "type": "object",
- "description": "",
- "properties": {
- "containerID": {
- "type": "string",
- "description": "container's ID in the format 'docker://\u003ccontainer_id\u003e'"
- },
- "exitCode": {
- "type": "integer",
- "description": "exit status from the last termination of the container"
- },
- "finishedAt": {
- "type": "string",
- "description": "time at which the container last terminated"
- },
- "message": {
- "type": "string",
- "description": "message regarding the last termination of the container"
- },
- "reason": {
- "type": "string",
- "description": "(brief) reason from the last termination of the container"
- },
- "signal": {
- "type": "integer",
- "description": "signal from the last termination of the container"
- },
- "startedAt": {
- "type": "string",
- "description": "time at which previous execution of the container started"
+ "strategy": {
+ "type": "Custom",
+ "customStrategy": {
+ "from": {
+ "kind": "DockerImage",
+ "name": "fabric8/openshift-s2i-jenkins-trigger"
+ },
+ "env": [
+ {
+ "name": "BASE_URI",
+ "value": jenkinsUrl
+ },
+ {
+ "name": "JOB_NAME",
+ "value": jobName
+ }
+ ]
}
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.ContainerStateTerminated"
- },
- "kubernetes_ContainerStateWaiting": {
- "type": "object",
- "description": "",
- "properties": {
- "reason": {
- "type": "string",
- "description": "(brief) reason the container is not yet running"
+ }
+ }
+ };
+ $scope.$watch('entity.spec.source.git.uri', function (val) {
+ if (!val) {
+ return;
+ }
+ var lastBit = val.match(/[^\/]+$/)[0];
+ if (lastBit) {
+ var name = lastBit.replace(/\.git$/, '');
+ Kubernetes.log.debug("name: ", name);
+ if (!Core.isBlank(name)
+ && Core.isBlank(Core.pathGet($scope.entity, ['metadata', 'name']))) {
+ Core.pathSet($scope.entity, ['metadata', 'name'], name);
+ }
+ }
+ });
+ Kubernetes.initShared($scope, $location, $http, $timeout, $routeParams, KubernetesModel, KubernetesState, KubernetesApiURL);
+ $scope.breadcrumbConfig = Developer.createProjectSettingsBreadcrumbs($scope.projectId);
+ $scope.subTabConfig = Developer.createProjectSubNavBars($scope.projectId);
+ $scope.tabs = Developer.createProjectSettingsSubNavBars($scope.projectId);
+ Kubernetes.watch($scope, $element, "secrets", $scope.namespace, onSecrets);
+ $scope.buildConfigClient = K8SClientFactory.create("buildconfigs", $scope.namespace);
+ $element.on('$destroy', function () {
+ $scope.$destroy();
+ });
+ $scope.$on('$destroy', function () {
+ K8SClientFactory.destroy($scope.buildConfigClient);
+ });
+ /*
+ $scope.$on('kubernetesModelUpdated', function () {
+ updateData();
+ });
+
+ */
+ $scope.$on('$routeUpdate', function ($event) {
+ updateData();
+ });
+ $scope.save = function () {
+ Kubernetes.log.info("Saving!");
+ var entity = $scope.entity;
+ var spec = (entity || {}).spec || {};
+ // TODO update the jenkins job name!
+ // lets delete lots of cruft
+ var strategy = spec.strategy || {};
+ delete strategy["dockerStrategy"];
+ delete strategy["sourceStrategy"];
+ delete spec["revision"];
+ delete spec["output"];
+ delete spec["resources"];
+ var strategyPullSecretName = Core.pathGet(spec, ["strategy", "customStrategy", "pullSecret", "name"]);
+ var sourceSecretName = Core.pathGet(spec, ["source", "sourceSecret", "name"]);
+ Kubernetes.log.info("sourceSecretName: " + sourceSecretName);
+ Kubernetes.log.info("strategyPullSecretName: " + strategyPullSecretName);
+ if (!strategyPullSecretName && sourceSecretName) {
+ Core.pathSet(spec, ["strategy", "customStrategy", "pullSecret", "name"], sourceSecretName);
+ }
+ /*
+ // TODO hack until the put deals with updates
+ var metadata = entity.metadata;
+ if (metadata) {
+ delete metadata["resourceVersion"];
+ }
+ */
+ Kubernetes.log.info(angular.toJson(entity, true));
+ $scope.buildConfigClient.put(entity, function (obj) {
+ Kubernetes.log.info("build config created!");
+ var link = Developer.projectSecretsLink($scope.namespace, Kubernetes.getName(entity));
+ if (link) {
+ Kubernetes.log.info("Navigating to: " + link);
+ $location.path(link);
+ }
+ else {
+ Kubernetes.log.warn("Could not find the edit pipeline link!");
+ }
+ });
+ };
+ updateData();
+ var jenkinsUrl = Developer.jenkinsLink();
+ var jobName = "";
+ function updateData() {
+ $scope.item = null;
+ if ($scope.id) {
+ var url = Kubernetes.buildConfigRestUrl($scope.id);
+ $http.get(url).
+ success(function (data, status, headers, config) {
+ if (data) {
+ $scope.entity = data;
+ var buildConfig = angular.copy(data);
+ var sortedBuilds = null;
+ Kubernetes.enrichBuildConfig(buildConfig, sortedBuilds);
+ $scope.buildConfig = buildConfig;
}
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.ContainerStateWaiting"
- },
- "kubernetes_ContainerStatus": {
- "type": "object",
- "description": "",
- "properties": {
- "containerID": {
- "type": "string",
- "description": "container's ID in the format 'docker://\u003ccontainer_id\u003e'; see http://releases.k8s.io/HEAD/docs/user-guide/container-environment.md#container-information"
- },
- "image": {
- "type": "string",
- "description": "image of the container; see http://releases.k8s.io/HEAD/docs/user-guide/images.md"
- },
- "imageID": {
- "type": "string",
- "description": "ID of the container's image"
- },
- "lastState": {
- "$ref": "#/definitions/kubernetes_ContainerState",
- "javaType": "io.fabric8.kubernetes.api.model.ContainerState"
- },
- "name": {
- "type": "string",
- "description": "name of the container; must be a DNS_LABEL and unique within the pod; cannot be updated",
- "maxLength": 63,
- "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
- },
- "ready": {
- "type": "boolean",
- "description": "specifies whether the container has passed its readiness probe"
- },
- "restartCount": {
- "type": "integer",
- "description": "the number of times the container has been restarted"
- },
- "state": {
- "$ref": "#/definitions/kubernetes_ContainerState",
- "javaType": "io.fabric8.kubernetes.api.model.ContainerState"
+ $scope.spec = ($scope.entity || {}).spec || {};
+ $scope.fetched = true;
+ // lets update the tabs
+ $scope.subTabConfig = Developer.createProjectSubNavBars($scope.projectId, null, $scope);
+ Core.$apply($scope);
+ }).
+ error(function (data, status, headers, config) {
+ Kubernetes.log.warn("Failed to load " + url + " " + data + " " + status);
+ });
+ }
+ else {
+ $scope.fetched = true;
+ $scope.spec = $scope.entity.spec;
+ Core.$apply($scope);
+ }
+ }
+ function onSecrets(secrets) {
+ var array = [];
+ angular.forEach(secrets, function (secret) {
+ var name = Kubernetes.getName(secret);
+ if (name) {
+ array.push({
+ label: name,
+ value: name,
+ "attributes": {
+ "title": name
+ },
+ $secret: secret
+ });
+ }
+ });
+ $scope.secrets = _.sortBy(array, "label");
+ var specSourceSecretNamePath = ['spec', 'source', 'sourceSecret', 'name'];
+ if ($scope.entity && !Core.pathGet($scope.entity, specSourceSecretNamePath)) {
+ var defaultSecretName = findDefaultImportSecretName(secrets);
+ Core.pathSet($scope.entity, specSourceSecretNamePath, defaultSecretName);
+ }
+ }
+ function findDefaultImportSecretName(secrets) {
+ var answer = null;
+ angular.forEach(secrets, function (secret) {
+ var name = Kubernetes.getName(secret);
+ if (!answer && name && name.startsWith("jenkins-login")) {
+ answer = name;
+ }
+ });
+ if (!answer) {
+ angular.forEach(secrets, function (secret) {
+ var name = Kubernetes.getName(secret);
+ if (!answer && name && name.startsWith("jenkins-token")) {
+ answer = name;
}
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.ContainerStatus"
- },
- "kubernetes_EmptyDirVolumeSource": {
- "type": "object",
- "description": "",
- "properties": {
- "medium": {
- "type": "string",
- "description": "type of storage used to back the volume; must be an empty string (default) or Memory; see http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#emptydir"
+ });
+ }
+ return answer;
+ }
+ switch (mode) {
+ case 'create':
+ delete specConfig.tabs;
+ _.forIn(buildSource.properties, function (property, name) {
+ if (name !== 'git') {
+ Kubernetes.log.info("Hiding property: ", name);
+ property.hidden = true;
}
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.EmptyDirVolumeSource"
- },
- "kubernetes_EndpointAddress": {
- "type": "object",
- "description": "",
- "properties": {
- "ip": {
- "type": "string",
- "description": "IP address of the endpoint"
- },
- "targetRef": {
- "$ref": "#/definitions/kubernetes_ObjectReference",
- "javaType": "io.fabric8.kubernetes.api.model.ObjectReference"
+ });
+ _.forIn(gitBuildSource.properties, function (property, name) {
+ if (name !== 'uri') {
+ Kubernetes.log.info("Hiding property: ", name);
+ property.hidden = true;
}
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.EndpointAddress"
- },
- "kubernetes_EndpointPort": {
- "type": "object",
- "description": "",
- "properties": {
- "name": {
- "type": "string",
- "description": "name of this port",
- "maxLength": 63,
- "pattern": "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
- },
- "port": {
- "type": "integer",
- "description": "port number of the endpoint"
- },
- "protocol": {
- "type": "string",
- "description": "protocol for this port; must be UDP or TCP; TCP if unspecified"
+ else {
+ property.label = "Git URL";
+ property['input-attributes'] = {
+ 'required': true
+ };
}
- },
- "additionalProperties": true,
- "javaType": "io.fabric8.kubernetes.api.model.EndpointPort"
- },
- "kubernetes_EndpointSubset": {
- "type": "object",
- "description": "",
- "properties": {
- "addresses": {
- "type": "array",
- "description": "IP addresses which offer the related ports",
- "items": {
- "$ref": "#/definitions/kubernetes_EndpointAddress",
- "javaType": "io.fabric8.kubernetes.api.model.EndpointAddress"
- }
- },
- "ports": {
- "type": "array",
- "description": "port numbers available on the related IP addresses",
- "items": {
- "$ref": "#/definitions/kubernetes_EndpointPort",
- "javaType": "io.fabric8.kubernetes.api.model.EndpointPort"
- }
+ });
+ _.forIn(specConfig.properties, function (property, name) {
+ if (name !== 'source') {
+ Kubernetes.log.info("Hiding property: ", name);
+ property.hidden = true;
}
+ });
+ break;
+ case 'edit':
+ default:
+ }
+ $scope.specConfig = specConfig;
+ }]);
+})(Kubernetes || (Kubernetes = {}));
+
+///
@@ -83,6 +83,11 @@
\n
\n ",
- link: function (scope, element, attrs) {
- if (!initialized) {
- try {
- }
- catch (err) {
- }
- initialized = true;
- }
- scope.HawtioSubTabs = HawtioSubTabs;
- var collapsed = false;
- scope.getClass = function () {
- //log.debug("My class: ", element.attr('class'));
- if (!scope.subTabConfig || !scope.subTabConfig.length) {
- return 'hidden';
- }
- if (collapsed) {
- return 'collapsed';
- }
- return '';
- };
- scope.$on('hawtioCollapseNav', function () {
- collapsed = !collapsed;
- });
- scope.$watch('HawtioSubTabs.get()', function (subTabConfig) {
- scope.subTabConfig = subTabConfig;
- });
- }
- };
- }]);
- Navigation._module.directive('hawtioBreadcrumbsOutlet', ['HawtioBreadcrumbs', 'HawtioSubTabs', function (HawtioBreadcrumbs, HawtioSubTabs) {
- return {
- restrict: 'E',
- scope: {},
- template: "\n \n \n \n ![]()
\n {{subTab.label}}\n \n \n
\n \n \n \n
\n ",
- link: function (scope, element, attrs) {
- scope.breadcrumbs = HawtioBreadcrumbs;
- scope.tabs = HawtioSubTabs;
- scope.$watchCollection('breadcrumbs.get()', function (breadcrumbConfig) {
- scope.breadcrumbConfig = breadcrumbConfig;
- });
- scope.$watchCollection('tabs.get()', function (tabs) {
- var active = _.find(tabs, function (tab) { return tab.active; });
- if (active) {
- scope.pageTitle = active.label;
- }
- else {
- scope.pageTitle = undefined;
- }
- });
- }
- };
- }]);
- Navigation._module.directive('platformSubTabsOutlet', ['HawtioSubTabs', function (HawtioSubTabs) {
- var initialized = false;
- return {
- restrict: 'AE',
- replace: true,
- template: "\n \n \n
\n ",
- link: function (scope, element, attrs) {
- if (!initialized) {
- try {
- }
- catch (err) {
- }
- initialized = true;
- }
- scope.HawtioSubTabs = HawtioSubTabs;
- var collapsed = false;
- scope.getClass = function () {
- //log.debug("My class: ", element.attr('class'));
- if (!scope.subTabConfig || !scope.subTabConfig.length) {
- return 'hidden';
- }
- if (collapsed) {
- return 'collapsed';
- }
- return '';
- };
- scope.$on('hawtioCollapseNav', function () {
- collapsed = !collapsed;
- });
- scope.$watch('HawtioSubTabs.get()', function (subTabConfig) {
- scope.subTabConfig = subTabConfig;
- });
- }
- };
+ function selectPods(pods, namespace, labels) {
+ return pods.filter(function (pod) {
+ return Kubernetes.getNamespace(pod) === namespace && Kubernetes.selectorMatches(labels, Kubernetes.getLabels(pod));
+ });
+ }
+ return $scope;
}]);
- //hawtioPluginLoader.addModule('patternfly');
- hawtioPluginLoader.addModule(Navigation.pluginName);
-})(Navigation || (Navigation = {}));
+})(Kubernetes || (Kubernetes = {}));
/// ' + build.displayName + '
' + + 'duration: ' + y + ' seconds
'; + if (date) { + tooltip += 'started: ' + date + '
'; + } + if (result) { + tooltip += 'result: ' + result + '
'; + } + if (x) { + var data = buildsSucceeded; + var key = successBuildKey; + if (!successBuildKey && (!result || !result.startsWith("SUCC"))) { + data = buildsFailed; + key = failedBuildKey; + } + data.push({ + tooltip: tooltip, + color: color, + x: x, y: y }); + } }); - $scope.checkboxes = { - checked: false, - items: {} - }; - } - function updateSqlStatus(url) { - var items = []; - if ($scope.model && $scope.model.length > 0) { - angular.forEach($scope.model, function (item) { - if ($scope.checkboxes.items[item.id]) - items.push(item); + $scope.data = []; + if (buildsSucceeded.length) { + $scope.data.push({ + key: successBuildKey, + values: buildsSucceeded + }); + } + if (buildsFailed.length) { + $scope.data.push({ + key: failedBuildKey, + values: buildsFailed + }); + } + $scope.api.updateWithData($scope.data); + $timeout(function () { + $scope.api.update(); + }, 50); + } + function updateData() { + var metricsPath = $scope.jobId ? UrlHelpers.join("job", $scope.jobId, "fabric8/metrics") : "fabric8/metrics"; + var url = Kubernetes.kubernetesProxyUrlForServiceCurrentNamespace(Developer.jenkinsServiceNameAndPort, metricsPath); + Developer.log.info(""); + if (url && (!$scope.jenkins || Kubernetes.keepPollingModel)) { + $http.get(url, Developer.jenkinsHttpConfig). + success(function (data, status, headers, config) { + if (data) { + if (Developer.hasObjectChanged(data, $scope.entityChangedCache)) { + Developer.log.info("entity has changed!"); + $scope.metrics = data; + updateChartData(); + } + } + $scope.model.fetched = true; + Core.$apply($scope); + }). + error(function (data, status, headers, config) { + Developer.log.warn("Failed to load " + url + " " + data + " " + status); }); } - if (items.length <= 0) - return; - Configs.create_mask(); //创建遮罩层 - Kubernetes.create_locadEffect("正在更新文件,请稍等！"); //创建数据加载效果层 - $http({ - url: url, - method: 'POST', - data: JSON.stringify(items) - }).success(function (data, header, config, status) { - $scope.model = SystemModel.sqlInfo = data.data; - shareUpdate($scope.model, $scope.optionsFilter); - $("#load").remove(); - Kubernetes.removeMask(); - //响应成功 - }).error(function (data, header, config, status) { - //处理响应失败 - $("#load").remove(); - Kubernetes.removeMask(); - Configs.customAlert("提示", "一键审核或归档失败！", '', null, 0, "error"); - }); } }]); -})(System || (System = {})); +})(Developer || (Developer = {})); ///\n
\n ",
+ link: function (scope, element, attr) {
+ var link = scope.$eval('podLink');
+ var name = scope.$eval('containerName');
+ if (!link) {
+ return;
+ }
+ scope.fetched = false;
+ scope.previous = false;
+ scope.messages = [];
+ link = UrlHelpers.join(Kubernetes.masterApiUrl(), link, 'log');
+ link = KubernetesAPI.wsUrl(link);
+ link.search({
+ follow: true,
+ tailLines: 1000,
+ access_token: userDetails.token
+ });
+ var messages = [];
+ var pullMessages = _.debounce(function () {
+ scope.messages = scope.messages.concat(_.remove(messages, function () { return true; }).map(function (msg) {
+ PodLogReplacements.forEach(function (replFunc) {
+ if (angular.isFunction(replFunc)) {
+ msg = replFunc(msg);
+ }
+ });
+ return msg;
+ }));
+ if (!scope.fetched) {
+ scope.fetched = true;
+ }
+ Core.$apply(scope);
+ }, 1000);
+ function initSocket(link) {
+ scope.fetched = false;
+ messages.length = 0;
+ scope.messages.length = 0;
+ var ws = new WebSocket(link.toString(), 'base64.binary.k8s.io');
+ ws.onmessage = function (event) {
+ try {
+ var message = window.atob(event.data);
+ messages.push(message);
+ pullMessages();
+ }
+ catch (err) {
+ }
+ };
+ return ws;
+ }
+ var ws = initSocket(link);
+ scope.$watch('previous', function (value, old) {
+ if (value !== old) {
+ if (link.hasSearch('previous')) {
+ link.removeSearch('previous').addSearch('previous', scope.previous);
+ }
+ else {
+ link.addSearch('previous', scope.previous);
+ }
+ ws.close();
+ ws = initSocket(link);
+ }
+ });
+ element.on('$destroy', function () {
+ if (ws) {
+ try {
+ ws.close();
+ }
+ catch (err) {
+ }
+ delete ws;
+ }
+ });
+ }
+ };
+ }]);
+ Kubernetes._module.directive('podLogWindow', ["$compile", "TerminalService", function ($compile, TerminalService) {
+ return {
+ restrict: 'A',
+ scope: false,
+ link: function (scope, element, attr) {
+ Kubernetes.addWindowActions(scope, element, TerminalService);
+ scope.atBottom = true;
+ scope.$watch('atBottom', function (val) {
+ });
+ }
+ };
+ }]);
+})(Kubernetes || (Kubernetes = {}));
+
+/// Please wait, fetching logs...
\nView previous container logs?
\n \n\n
\n ",
- link: function (scope, element, attr) {
- var link = scope.$eval('podLink');
- var name = scope.$eval('containerName');
- if (!link) {
- return;
- }
- scope.fetched = false;
- scope.previous = false;
- scope.messages = [];
- link = UrlHelpers.join(Kubernetes.masterApiUrl(), link, 'log');
- link = KubernetesAPI.wsUrl(link);
- link.search({
- follow: true,
- tailLines: 1000,
- access_token: userDetails.token
- });
- var messages = [];
- var pullMessages = _.debounce(function () {
- scope.messages = scope.messages.concat(_.remove(messages, function () { return true; }).map(function (msg) {
- PodLogReplacements.forEach(function (replFunc) {
- if (angular.isFunction(replFunc)) {
- msg = replFunc(msg);
- }
- });
- return msg;
- }));
- if (!scope.fetched) {
- scope.fetched = true;
- }
- Core.$apply(scope);
- }, 1000);
- function initSocket(link) {
- scope.fetched = false;
- messages.length = 0;
- scope.messages.length = 0;
- var ws = new WebSocket(link.toString(), 'base64.binary.k8s.io');
- ws.onmessage = function (event) {
- try {
- var message = window.atob(event.data);
- messages.push(message);
- pullMessages();
- }
- catch (err) {
- }
- };
- return ws;
- }
- var ws = initSocket(link);
- scope.$watch('previous', function (value, old) {
- if (value !== old) {
- if (link.hasSearch('previous')) {
- link.removeSearch('previous').addSearch('previous', scope.previous);
- }
- else {
- link.addSearch('previous', scope.previous);
- }
- ws.close();
- ws = initSocket(link);
- }
- });
- element.on('$destroy', function () {
- if (ws) {
- try {
- ws.close();
- }
- catch (err) {
- }
- delete ws;
- }
- });
+ /**
+ * Returns the service link for the given service name
+ *
+ * @param serviceName the name of the service
+ * @return {null}
+ */
+ ServiceRegistryService.prototype.serviceLink = function (serviceName) {
+ var service = this.findService(serviceName);
+ return Kubernetes.serviceLinkUrl(service);
+ };
+ /**
+ * Returns the service link for the given service name if its ready (has at least one ready pod)
+ *
+ * @param serviceName the name of the service
+ * @return {null}
+ */
+ ServiceRegistryService.prototype.serviceReadyLink = function (serviceName) {
+ var service = this.findService(serviceName);
+ if (Kubernetes.readyPodCount(service)) {
+ return Kubernetes.serviceLinkUrl(service);
+ }
+ else {
+ return null;
}
};
- }]);
- Kubernetes._module.directive('podLogWindow', ["$compile", "TerminalService", function ($compile, TerminalService) {
- return {
- restrict: 'A',
- scope: false,
- link: function (scope, element, attr) {
- Kubernetes.addWindowActions(scope, element, TerminalService);
- scope.atBottom = true;
- scope.$watch('atBottom', function (val) {
- });
+ ServiceRegistryService.prototype.getModel = function () {
+ var answer = this.model;
+ // lets allow lazy load so we can be invoked before the injector has been created
+ if (!answer) {
+ var injector = HawtioCore.injector;
+ if (injector) {
+ this.model = injector.get('KubernetesModel');
+ }
}
+ answer = this.model;
+ return answer;
};
- }]);
+ return ServiceRegistryService;
+ }());
+ Kubernetes.ServiceRegistryService = ServiceRegistryService;
})(Kubernetes || (Kubernetes = {}));
/// Please wait, fetching logs...
\nView previous container logs?
\n \n\n = [];
+ function systemModelServices() {
+ this.systemInfoList = [];
+ this.systemInfo = [];
+ this.regionalismInfo = [];
+ this.sqlInfo = [];
+ this.updateCodeInfo();
+ this.updateExcelInfo();
+ this.updateSqlInfo();
+ //this.updateCheckInfo();
+ //console.log(classifyCountry(this.regionalismInfo, '南京市'));
+ }
+ systemModelServices.prototype.updateExcelInfo = function () {
+ var result = [];
+ $.ajax({
+ async: false,
+ type: "POST",
+ url: "/java/console/api/fileOperation/findAll",
+ success: function (data) {
+ if (data)
+ result = data.data;
}
- var property = {
- key: key,
- label: label,
- tooltip: tooltip,
- rows: rows,
- value: text,
- type: type
- };
- return property;
- }
- function updateData() {
- $scope.item = null;
- $scope.changed = false;
- $scope.entity = {
- name: $scope.id,
- properties: {}
- };
- if ($scope.id) {
- angular.forEach($scope.model.secrets, function (secret) {
- var name = Kubernetes.getName(secret);
- if (name === $scope.id) {
- $scope.secret = secret;
- angular.forEach(secret.data, function (value, key) {
- var text = "";
- if (angular.isString(value) && value) {
- text = window.atob(value);
- }
- var property = createProperty(key, text);
- $scope.entity.properties[key] = property;
- });
- $scope.fetched = true;
- Core.$apply($scope);
- }
- });
+ });
+ this.systemInfoList = result;
+ };
+ systemModelServices.prototype.updateSqlInfo = function () {
+ var result = [];
+ $.ajax({
+ async: false,
+ type: "POST",
+ url: "/java/console/api/filePackage/findAll",
+ success: function (data) {
+ if (data)
+ result = data.data;
}
- else {
- if (createKind === "ssh") {
- $scope.addFields($scope.sshKeys);
- }
- else if (createKind === "https") {
- $scope.addFields($scope.httpsKeys);
+ });
+ this.sqlInfo = result;
+ };
+ systemModelServices.prototype.updateCodeInfo = function () {
+ var result = [];
+ $.ajax({
+ async: false,
+ type: "POST",
+ url: "/java/console/api/code/list",
+ success: function (data) {
+ if (data) {
+ result = data;
}
- $scope.fetched = true;
- Core.$apply($scope);
}
- }
+ });
+ this.regionalismInfo = result["regionalism"];
+ this.systemInfo = result["system"];
+ };
+ return systemModelServices;
+ }());
+ System._module.factory('SystemModel', ['$rootScope', '$http', function ($rootScope, $http) {
+ return new systemModelServices();
}]);
-})(Kubernetes || (Kubernetes = {}));
+})(System || (System = {}));
///
\n
\n ",
+ link: function (scope, element, attrs) {
+ if (!initialized) {
+ try {
+ }
+ catch (err) {
+ }
+ initialized = true;
}
- var data = {};
- angular.forEach(entity.properties, function (property) {
- var key = property.key;
- var value = property.value || "";
- if (key) {
- data[key] = window.btoa(value);
+ scope.HawtioSubTabs = HawtioSubTabs;
+ var collapsed = false;
+ scope.getClass = function () {
+ //log.debug("My class: ", element.attr('class'));
+ if (!scope.subTabConfig || !scope.subTabConfig.length) {
+ return 'hidden';
}
- });
- $scope.secret.metadata.name = name;
- $scope.secret.data = data;
- Core.notification('info', "Saving secret " + name);
- kubeClient.put($scope.secret, function (data) {
- var secretsLink = onSaveUrl || Developer.namespaceLink($scope, $routeParams, "secrets");
- var params = {};
- if (onSaveUrl) {
- params['secret'] = name;
+ if (collapsed) {
+ return 'collapsed';
}
- $location.path(secretsLink);
- $location.search(params);
- Kubernetes.log.info("navigating to URL: " + secretsLink + " with params " + angular.toJson($location.search()));
- }, function (err) {
- Core.notification('error', "Failed to secret " + name + "\n" + err);
+ return '';
+ };
+ scope.$on('hawtioCollapseNav', function () {
+ collapsed = !collapsed;
+ });
+ scope.$watch('HawtioSubTabs.get()', function (subTabConfig) {
+ scope.subTabConfig = subTabConfig;
});
}
};
- updateData();
- function createProperty(key, text) {
- var label = secretLabels[key] || Core.humanizeValue(key);
- var tooltip = secretTooltips[key] || "Value of the " + label;
- var rows = 5;
- var lines = text.split("\n").length + 1;
- if (lines > rows) {
- rows = lines;
+ }]);
+ Navigation._module.directive('hawtioBreadcrumbsOutlet', ['HawtioBreadcrumbs', 'HawtioSubTabs', function (HawtioBreadcrumbs, HawtioSubTabs) {
+ return {
+ restrict: 'E',
+ scope: {},
+ template: "\n \n \n \n ![]()
\n {{subTab.label}}\n \n \n
\n \n \n \n
\n ",
+ link: function (scope, element, attrs) {
+ scope.breadcrumbs = HawtioBreadcrumbs;
+ scope.tabs = HawtioSubTabs;
+ scope.$watchCollection('breadcrumbs.get()', function (breadcrumbConfig) {
+ scope.breadcrumbConfig = breadcrumbConfig;
+ });
+ scope.$watchCollection('tabs.get()', function (tabs) {
+ var active = _.find(tabs, function (tab) { return tab.active; });
+ if (active) {
+ scope.pageTitle = active.label;
+ }
+ else {
+ scope.pageTitle = undefined;
+ }
+ });
}
- var type = "textarea";
- if (key === "username") {
- type = "text";
- if (!text) {
- text = Kubernetes.currentUserName();
+ };
+ }]);
+ Navigation._module.directive('platformSubTabsOutlet', ['HawtioSubTabs', function (HawtioSubTabs) {
+ var initialized = false;
+ return {
+ restrict: 'AE',
+ replace: true,
+ template: "\n \n \n
\n ",
+ link: function (scope, element, attrs) {
+ if (!initialized) {
+ try {
+ }
+ catch (err) {
+ }
+ initialized = true;
}
+ scope.HawtioSubTabs = HawtioSubTabs;
+ var collapsed = false;
+ scope.getClass = function () {
+ //log.debug("My class: ", element.attr('class'));
+ if (!scope.subTabConfig || !scope.subTabConfig.length) {
+ return 'hidden';
+ }
+ if (collapsed) {
+ return 'collapsed';
+ }
+ return '';
+ };
+ scope.$on('hawtioCollapseNav', function () {
+ collapsed = !collapsed;
+ });
+ scope.$watch('HawtioSubTabs.get()', function (subTabConfig) {
+ scope.subTabConfig = subTabConfig;
+ });
}
- else if (key === "password") {
- type = "password";
+ };
+ }]);
+ //hawtioPluginLoader.addModule('patternfly');
+ hawtioPluginLoader.addModule(Navigation.pluginName);
+})(Navigation || (Navigation = {}));
+
+/// - \r\n
- \r\n {{item.label}}\r\n \r\n
\r\n
\r\n");
-$templateCache.put("plugins/configs/html/kubeClusterSetting.html","\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n \r\n
\r\n
\r\n | 已启用 | \r\n已停止 | \r\n\r\n {{volume.name}}\r\n | \r\n\r\n 云路径：{{volume.path}}\r\n | \r\n\r\n \r\n | \r\n\r\n 已用 {{volume.formatUsedSize}} / 共 {{volume.formatTotalSize}}\r\n | \r\n\r\n \r\n \r\n | \r\n
|---|---|---|---|---|---|---|
| \r\n \r\n \r\n | \r\n\r\n 服务器{{$index+1}}\r\n | \r\n\r\n {{row.ip}}\r\n | \r\n\r\n 存储路径:{{row.path}}\r\n | \r\n\r\n 已用 {{row.formatUsedSize}} / 可用 {{row.formatAllSize}}\r\n | \r\n\r\n |
\r\n
\r\n\r\n
\r\n \r\n 是否删除：{{showDeleteVolume.item.name}} 云盘?\r\n
\r\n\r\n
\r\n");
-$templateCache.put("plugins/configs/html/shareLayout.html","\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n
\r\n\r\n
\r\n 当前没有配置汇总库信息,请配置,否则汇总操作将不可用！
\r\n\r\n
\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n
\r\n 编辑汇总库连接信息:
\r\n添加汇总库信息:
\r\n\r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n");
-$templateCache.put("plugins/developer/html/addDataFile.html","\r\n \r\n \r\n
");
+angular.module("hawtio-kubernetes-templates", []).run(["$templateCache", function($templateCache) {$templateCache.put("plugins/developer/html/addDataFile.html","江苏省审计厅数据汇总平台
\r\n\r\n
\r\n\r\n\r\n\r\n\r\n
\r\n \r\n 本地文件列表
\r\n- \r\n
- 文件名 \r\n \r\n \r\n \r\n \r\n \r\n \r\n
- \r\n
- 文件属性 \r\n \r\n \r\n
\r\n
\r\n \r\n\r\n 服务器文件列表
\r\n\r\n
\r\n \r\n employee: {{node.name}} age {{node.age}}\r\n
\r\n \r\n \r\n
\r\n - \r\n
- 文件名 \r\n \r\n \r\n \r\n \r\n \r\n \r\n
- \r\n
- 文件属性 \r\n
\r\n \r\n \r\n
");
$templateCache.put("plugins/developer/html/code.html","江苏省审计厅数据汇总平台
\r\n\r\n
\r\n\r\n\r\n\r\n\r\n
\r\n \r\n 本地文件列表
\r\n- \r\n
- 文件名 \r\n \r\n \r\n \r\n \r\n \r\n \r\n
- \r\n
- 文件属性 \r\n \r\n \r\n
\r\n
\r\n \r\n\r\n 服务器文件列表
\r\n\r\n
\r\n \r\n employee: {{node.name}} age {{node.age}}\r\n
\r\n \r\n \r\n
\r\n - \r\n
- 文件名 \r\n \r\n \r\n \r\n \r\n \r\n \r\n
- \r\n
- 文件属性 \r\n
\r\n
\r\n");
$templateCache.put("plugins/developer/html/environment.html","environment!!!!");
$templateCache.put("plugins/developer/html/environmentPanel.html","\r\n \r\n
\r\n\r\n \r\n \r\n
\r\n\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n There are no tools currently available.
\r\n\r\n
\r\n \r\n
\r\n There are no tools currently available.
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n {{env.label}}\r\n
\r\n \r\n\r\n
\r\n
-
+
\r\n
\r\n");
@@ -21428,4 +21369,8 @@ $templateCache.put("plugins/system/html/regionalismCodeSearch.html","\r\n
\r\n\r\n \r\n \r\n \r\n {{env.label}}\r\n \r\n
\r\n\r\n
\r\n \r\n
\r\n\r\n \r\n
\r\n\r\n\r\n \r\n
\r\n \r\n \r\n \r\n {{rc.$name}}\r\n : {{version}}\r\n \r\n \r\n \r\n {{rc.$name}}\r\n : {{version}}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {{rc.$podCounters.ready}}\r\n {{rc.$podCounters.valid}}\r\n {{rc.$podCounters.waiting}}\r\n {{rc.$podCounters.error}}\r\n \r\n \r\n
\r\n \r\n \r\n \r\n Build #{{rc.$buildId}}\r\n \r\n \r\n \r\n \r\n \r\n \r\n Commit {{rc.$gitCommit | limitTo:7}}\r\n \r\n \r\n \r\n Commit {{rc.$gitCommit | limitTo:7}}\r\n \r\n
\r\n \r\n \r\n \r\n
\r\n");
$templateCache.put("plugins/system/html/systemList.html","\r\n
\r\n \r\n
\r\n \r\n
\r\n 当前没有可以查看的数据.
\r\n\r\n \r\n
\r\n
\r\n | \r\n {{row.code}} | \r\n\r\n {{row.systemName}} | \r\n
\r\n \r\n
\r\n");
$templateCache.put("plugins/system/html/systemSQLManagement.html","\r\n
\r\n\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n 当前没有可以查看的数据，请点击Excel导入按钮导入Excel数据
\r\n | \r\n {{row[col.field]}}\r\n \r\n | \r\n
\r\n \r\n
\r\n");
-$templateCache.put("plugins/system/html/systemVerification.html","\r\n
\r\n\r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n \r\n \r\n 当前没有查到符合过滤条件的数据，请重新选择过滤条件
\r\n | \r\n \r\n | \r\n\r\n 有缺失\r\n 正常\r\n 待归档\r\n 待审核\r\n | \r\n{{row.areaCode}} | \r\n{{row.cityName}} | \r\n{{row.districtName}} | \r\n{{row.sysName}} | \r\n{{row.dataBaseType}} | \r\n\r\n \r\n \r\n \r\n \r\n —\r\n | \r\n\r\n \r\n \r\n \r\n \r\n —\r\n | \r\n\r\n \r\n \r\n \r\n \r\n —\r\n | \r\n
\r\n \r\n
\r\n");}]); hawtioPluginLoader.addModule("hawtio-kubernetes-templates");
\ No newline at end of file
+$templateCache.put("plugins/system/html/systemVerification.html","\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n 0\" ng-table=\"tableParams\" class=\"table table-condensed table-bordered table-striped table_sj_td_center\">\r\n
\r\n
\r\n | \r\n \r\n | \r\n{{row.checkResult}} | \r\n{{row.collection}} | \r\n\r\n 未校验\r\n 不需校验\r\n 校验中\r\n 标准表存在\r\n 标准表不存在\r\n 待抽取\r\n 正在抽取\r\n 抽取完成\r\n | \r\n\r\n 未校验\r\n 不需校验\r\n 校验中\r\n 标准表存在\r\n 标准表不存在\r\n 待抽取\r\n 正在抽取\r\n 抽取完成\r\n | \r\n{{row.cityName}} | \r\n{{row.districtName}} | \r\n{{row.areaCode}} | \r\n\r\n \r\n 否\r\n | \r\n{{row.sysName}} | \r\n{{row.dataVersion}} | \r\n{{row.departmentManager}} | \r\n{{row.managerContacts}} | \r\n{{row.dataBaseType}} | \r\n\r\n \r\n | \r\n
0\" class=\"col-sm-12 alert alert-warning sj_alert-warning\">\r\n \r\n 当前没有选择需要校验的数据，请选择需要校验的数据！\r\n \r\n
\r\n \r\n \r\n
\r\n");
+$templateCache.put("plugins/configs/html/configMenuItem.html","\r\n
\r\n\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n 0\" ng-table=\"tableParams\" class=\"table table-condensed table-bordered table-striped table_sj_td_center\">\r\n
\r\n
\r\n | \r\n \r\n | \r\n{{row.checkResult}} | \r\n{{row.collection}} | \r\n\r\n 未校验\r\n 不需校验\r\n 校验中\r\n 标准表存在\r\n 标准表不存在\r\n 待抽取\r\n 正在抽取\r\n 抽取完成\r\n | \r\n\r\n 未校验\r\n 不需校验\r\n 校验中\r\n 标准表存在\r\n 标准表不存在\r\n 待抽取\r\n 正在抽取\r\n 抽取完成\r\n | \r\n{{row.cityName}} | \r\n{{row.districtName}} | \r\n{{row.areaCode}} | \r\n\r\n \r\n 否\r\n | \r\n{{row.sysName}} | \r\n{{row.dataVersion}} | \r\n{{row.departmentManager}} | \r\n{{row.managerContacts}} | \r\n{{row.dataBaseType}} | \r\n\r\n 热区\r\n 冷区\r\n 无\r\n | \r\n\r\n \r\n | \r\n
0\" class=\"col-sm-12 alert alert-warning sj_alert-warning\">\r\n \r\n 当前没有选择需要校验的数据，请选择需要校验的数据！\r\n \r\n
\r\n - \r\n
- \r\n {{item.label}}\r\n \r\n
\r\n
\r\n");
+$templateCache.put("plugins/configs/html/kubeClusterSetting.html","\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n \r\n
\r\n
\r\n | 已启用 | \r\n已停止 | \r\n\r\n {{volume.name}}\r\n | \r\n\r\n 云路径：{{volume.path}}\r\n | \r\n\r\n \r\n | \r\n\r\n 已用 {{volume.formatUsedSize}} / 共 {{volume.formatTotalSize}}\r\n | \r\n\r\n \r\n \r\n | \r\n
|---|---|---|---|---|---|---|
| \r\n \r\n \r\n | \r\n\r\n 服务器{{$index+1}}\r\n | \r\n\r\n {{row.ip}}\r\n | \r\n\r\n 存储路径:{{row.path}}\r\n | \r\n\r\n 已用 {{row.formatUsedSize}} / 可用 {{row.formatAllSize}}\r\n | \r\n\r\n |
\r\n
\r\n\r\n
\r\n \r\n 是否删除：{{showDeleteVolume.item.name}} 云盘?\r\n
\r\n\r\n
\r\n");
+$templateCache.put("plugins/configs/html/shareLayout.html","\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n \r\n
\r\n
\r\n
\r\n\r\n
\r\n 当前没有配置汇总库信息,请配置,否则汇总操作将不可用！
\r\n\r\n
\r\n
\r\n \r\n
\r\n \r\n \r\n
\r\n \r\n
\r\n
\r\n 编辑汇总库连接信息:
\r\n添加汇总库信息:
\r\n\r\n \r\n
\r\n \r\n
\r\n \r\n
\r\n");}]); hawtioPluginLoader.addModule("hawtio-kubernetes-templates");
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index a4e3610d..21be3332 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -248,8 +248,8 @@ gulp.task('connect', ['watch'], function() {
targetPath: '/hawtio/git'
}, {
proto: "http",
- port: "8080",
- hostname: "192.168.0.181",
+ port: "8088",
+ hostname: "192.168.0.110",
path: '/java/console/api',
targetPath: "/"
}];
diff --git a/plugins/configs/html/shareLayout.html b/plugins/configs/html/shareLayout.html
index 73fa0b6b..bb88b872 100644
--- a/plugins/configs/html/shareLayout.html
+++ b/plugins/configs/html/shareLayout.html
@@ -414,7 +414,16 @@
-
+
-
+ | {{row.departmentManager}} | {{row.managerContacts}} | {{row.dataBaseType}} | ++ 热区 + 冷区 + 无 + |