' + 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 + var podLinkUrl = UrlHelpers.join("/kubernetes/namespace", service.metadata.namespace, "pods"); + _.assign(service.$podCounters, selector ? Kubernetes.createPodCounters(selector, _this.pods, service.$pods, Kubernetes.labelsToString(selector, ","), podLinkUrl) : {}); + service.$podCount = service.$pods.length; + var selectedPods = service.$pods; + service.connectTo = selectedPods.map(function (pod) { + return pod._key; + }).join(','); + service.$labelsText = Kubernetes.labelsToString(Kubernetes.getLabels(service)); + _this.updateIconUrlAndAppInfo(service, "serviceNames"); + var spec = service.spec || {}; + service.$portalIP = spec.portalIP; + service.$selectorText = Kubernetes.labelsToString(spec.selector); + var ports = _.map(spec.ports || [], "port"); + service.$ports = ports; + service.$portsText = ports.join(", "); + var iconUrl = service.$iconUrl; + if (iconUrl && selectedPods) { + selectedPods.forEach(function (pod) { + pod.$iconUrl = iconUrl; }); } - if (buildsFailed.length) { - $scope.data.push({ - key: failedBuildKey, - values: buildsFailed + service.$serviceUrl = Kubernetes.serviceLinkUrl(service); + }); + this.replicationControllers.forEach(function (replicationController) { + if (!replicationController.kind) + replicationController.kind = "ReplicationController"; + _this.replicationControllersByKey[replicationController._key] = replicationController; + var selector = Kubernetes.getSelector(replicationController); + replicationController.$pods = []; + if (Kubernetes.isFilterRC(replicationController) && !Kubernetes.isInclude(_this.filterReplicationcontrollers, replicationController)) + _this.filterReplicationcontrollers.push(replicationController); + replicationController.$podCounters = selector ? Kubernetes.createPodCounters(selector, _this.pods, replicationController.$pods) : null; + replicationController.$podCount = replicationController.$pods.length; + replicationController.$replicas = (replicationController.spec || {}).replicas; + replicationController.$oracleName = Kubernetes.getOracleName(Kubernetes.getName(replicationController)); + //console.log(getName(replicationController)); + replicationController.$oracleStatus = Kubernetes.getOracleStatus(Kubernetes.getLabels(replicationController)); + var selectedPods = replicationController.$pods; + replicationController.connectTo = selectedPods.map(function (pod) { + return pod._key; + }).join(','); + replicationController.$labelsText = Kubernetes.labelsToString(Kubernetes.getLabels(replicationController)); + replicationController.metadata.labels = Kubernetes.labelToChinese(Kubernetes.getLabels(replicationController)); + _this.updateIconUrlAndAppInfo(replicationController, "replicationControllerNames"); + var iconUrl = replicationController.$iconUrl; + if (iconUrl && selectedPods) { + selectedPods.forEach(function (pod) { + pod.$iconUrl = iconUrl; }); } - $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(); + }); + // services may not map to an icon but their pods may do via the RC + // so lets default it... + this.services.forEach(function (service) { + var iconUrl = service.$iconUrl; + var selectedPods = service.$pods; + if (selectedPods) { + if (!iconUrl || iconUrl === Kubernetes.defaultIconUrl) { + iconUrl = null; + selectedPods.forEach(function (pod) { + if (!iconUrl) { + iconUrl = pod.$iconUrl; + if (iconUrl) { + service.$iconUrl = iconUrl; + } } - } - $scope.model.fetched = true; - Core.$apply($scope); - }). - error(function (data, status, headers, config) { - Developer.log.warn("Failed to load " + url + " " + data + " " + status); - }); - } - } - }]); -})(Developer || (Developer = {})); - -///
- var codeValueTemp = itemvalue[0].split("");
- var codeValue = codeValueTemp[codeValueTemp.length - 1].split("")[0];
- //
- var sys_nameValueTemp = itemvalue[0].split("");
- var sys_nameValue = sys_nameValueTemp[sys_nameValueTemp.length - 1].split(" ")[0];
- //
- var character_setValueTemp = itemvalue[0].split("");
- var character_setValue = character_setValueTemp[character_setValueTemp.length - 1].split(" ")[0];
- //
- var sys_name_codeValueTemp = itemvalue[0].split("");
- var sys_name_codeValue = sys_name_codeValueTemp[sys_name_codeValueTemp.length - 1].split(" ")[0];
- //
- var contactValueTemp = itemvalue[0].split("");
- var contactValue = contactValueTemp[contactValueTemp.length - 1].split(" ")[0];
- //
- var phoneValueTemp = itemvalue[0].split("");
- var phoneValue = phoneValueTemp[phoneValueTemp.length - 1].split(" ")[0];
- //
- var dateValueTemp = itemvalue[0].split("");
- var dateValue = dateValueTemp[dateValueTemp.length - 1].split(" ")[0];
- //id :
- var itemId = codeValue + "_" + sys_name_codeValue;
- // http get version
- var rid = itemId; //.replace(/\"/g, "");
- // TODO typeValue 通过前端页面获取或者？？，财政01或社保02
- var typeValue = "01";
- // TODO batchValue 通过前端页面获取或者？？，批次A ：大写的A，批次B ：大写的B，
- var batchValue = "A";
- var itemname = cityValue + countyValue + sys_nameValue;
- var versionid = 1;
- var xhr = new XMLHttpRequest();
- xhr.onreadystatechange = function () {
- if (xhr.readyState == 4) {
- if (xhr.status == 200) {
- versionid = xhr.responseText;
- }
- }
- };
- xhr.open("get", "/getversion?id=" + rid, false);
- xhr.send(null);
- var jsobj = JSON.parse(versionid);
- var xmlversion = jsobj.id;
- var properValue = "{\"id\":\"" + itemId + "\", \"name\":\"" + itemname + "\", \"city\":\"" +
- cityValue + "\", \"county\":\"" + countyValue + "\", \"system\":\"" +
- sys_nameValue + "\", \"type\":\"" + typeValue + "\",\"batch\":\"" +
- batchValue + "\",\"version\":\"" + xmlversion + "\", \"province\":\"" +
- provinceValue + "\", \"code\":\"" +
- codeValue + "\", \"character_set\":\"" +
- character_setValue + "\", \"sys_name_code\":\"" +
- sys_name_codeValue + "\", \"contact\":\"" +
- contactValue + "\", \"phone\":\"" +
- phoneValue + "\", \"date\":\"" +
- dateValue + "\"}";
- resultString = resultString + properValue;
- if (k < itemsize - 1) {
- resultString = resultString + ", ";
- }
- }
- resultString = resultString + "]}";
- }
- $scope.$apply(function () {
- $scope.model.localdata = JSON.parse(resultString.toString());
- });
- };
- reader.readAsText(files[i], "utf-8");
- }
- else {
- FilterList.length += 1;
- var file_id = files[i].name.replace(/\.\w*$/, '');
- // var file_id=file[i].webkitRelativePath.replace(/^[a-z]*\/$/,'');
- // file_id = file_id.replace(/\/\w+$/,'');
- FilterList[j++] = files[i];
- }
+ }
+ function updateData() {
+ var url = Kubernetes.imageRepositoriesRestURL();
+ $http.get(url).
+ success(function (data, status, headers, config) {
+ if (data) {
+ //console.log("got data " + angular.toJson(data, true));
+ $scope.imageRepositories = Kubernetes.enrichImageRepositories(data.items);
+ $scope.fetched = true;
+ Core.$apply($scope);
}
+ }).
+ error(function (data, status, headers, config) {
+ Kubernetes.log.warn("Failed to load " + url + " " + data + " " + status);
+ });
+ }
+ updateData();
+ }]);
+})(Kubernetes || (Kubernetes = {}));
+
+/// {
- pages: {
- Source: {
- controls: ["source"]
+ "kubernetes_GCEPersistentDiskVolumeSource": {
+ "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."
+ },
+ "pdName": {
+ "type": "string",
+ "description": "unique name of the PD resource in GCE; see http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#gcepersistentdisk"
+ },
+ "readOnly": {
+ "type": "boolean",
+ "description": "read-only if true"
+ }
+ },
+ "additionalProperties": true,
+ "javaType": "io.fabric8.kubernetes.api.model.GCEPersistentDiskVolumeSource"
},
- Revision: {
- controls: ["revision"]
+ "kubernetes_GitRepoVolumeSource": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "repository": {
+ "type": "string",
+ "description": "repository URL"
+ },
+ "revision": {
+ "type": "string",
+ "description": "commit hash for the specified revision"
+ }
+ },
+ "additionalProperties": true,
+ "javaType": "io.fabric8.kubernetes.api.model.GitRepoVolumeSource"
},
- Output: {
- controls: ["output"]
+ "kubernetes_GlusterfsVolumeSource": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "endpoints": {
+ "type": "string",
+ "description": "gluster hosts endpoints name; see http://releases.k8s.io/HEAD/examples/glusterfs/README.md#create-a-pod"
+ },
+ "path": {
+ "type": "string",
+ "description": "path to gluster volume; see http://releases.k8s.io/HEAD/examples/glusterfs/README.md#create-a-pod"
+ },
+ "readOnly": {
+ "type": "boolean",
+ "description": "glusterfs volume to be mounted with read-only permissions; see http://releases.k8s.io/HEAD/examples/glusterfs/README.md#create-a-pod"
+ }
+ },
+ "additionalProperties": true,
+ "javaType": "io.fabric8.kubernetes.api.model.GlusterfsVolumeSource"
},
- Resources: {
- controls: ["resources"]
+ "kubernetes_HTTPGetAction": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "host": {
+ "type": "string",
+ "description": "hostname to connect to; defaults to pod IP"
+ },
+ "path": {
+ "type": "string",
+ "description": "path to access on the HTTP server"
+ },
+ "port": {
+ "$ref": "#/definitions/kubernetes_util_IntOrString",
+ "javaType": "io.fabric8.kubernetes.api.model.IntOrString"
+ },
+ "scheme": {
+ "type": "string",
+ "description": "scheme to connect with"
+ }
+ },
+ "additionalProperties": true,
+ "javaType": "io.fabric8.kubernetes.api.model.HTTPGetAction"
},
- Strategy: {
- controls: ["strategy"]
+ "kubernetes_Handler": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "exec": {
+ "$ref": "#/definitions/kubernetes_ExecAction",
+ "javaType": "io.fabric8.kubernetes.api.model.ExecAction"
+ },
+ "httpGet": {
+ "$ref": "#/definitions/kubernetes_HTTPGetAction",
+ "javaType": "io.fabric8.kubernetes.api.model.HTTPGetAction"
+ },
+ "tcpSocket": {
+ "$ref": "#/definitions/kubernetes_TCPSocketAction",
+ "javaType": "io.fabric8.kubernetes.api.model.TCPSocketAction"
+ }
+ },
+ "additionalProperties": true,
+ "javaType": "io.fabric8.kubernetes.api.model.Handler"
},
- Triggers: {
- controls: ["triggers"]
+ "kubernetes_HostPathVolumeSource": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "path": {
+ "type": "string",
+ "description": "path of the directory on the host; see http://releases.k8s.io/HEAD/docs/user-guide/volumes.md#hostpath"
+ }
+ },
+ "additionalProperties": true,
+ "javaType": "io.fabric8.kubernetes.api.model.HostPathVolumeSource"
},
- "Service Account": {
- controls: ["serviceAccount"]
- }
- }
- };
- */
- $scope.entity = {
- "apiVersion": "v1",
- "kind": "BuildConfig",
- "metadata": {
- "name": "",
- "labels": {}
+ "kubernetes_ISCSIVolumeSource": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "fsType": {
+ "type": "string",
+ "description": "file system type to mount"
+ },
+ "iqn": {
+ "type": "string",
+ "description": "iSCSI Qualified Name"
+ },
+ "lun": {
+ "type": "integer",
+ "description": "iscsi target lun number"
+ },
+ "readOnly": {
+ "type": "boolean",
+ "description": "read-only if true"
+ },
+ "targetPortal": {
+ "type": "string",
+ "description": "iSCSI target portal"
+ }
+ },
+ "additionalProperties": true,
+ "javaType": "io.fabric8.kubernetes.api.model.ISCSIVolumeSource"
},
- "spec": {
- "source": {
- "type": "Git"
+ "kubernetes_Lifecycle": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "postStart": {
+ "$ref": "#/definitions/kubernetes_Handler",
+ "javaType": "io.fabric8.kubernetes.api.model.Handler"
+ },
+ "preStop": {
+ "$ref": "#/definitions/kubernetes_Handler",
+ "javaType": "io.fabric8.kubernetes.api.model.Handler"
+ }
},
- "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.Lifecycle"
+ },
+ "kubernetes_List": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "apiVersion": {
+ "type": "string",
+ "description": "",
+ "default": "v1",
+ "required": true,
+ "enum": [
+ "v1"
]
+ },
+ "items": {
+ "type": "array",
+ "description": "list of objects",
+ "items": {
+ "$ref": "#/definitions/kubernetes_runtime_RawExtension",
+ "javaType": "io.fabric8.kubernetes.api.model.HasMetadata"
+ }
+ },
+ "kind": {
+ "type": "string",
+ "description": "",
+ "default": "List",
+ "required": true
+ },
+ "metadata": {
+ "$ref": "#/definitions/kubernetes_ListMeta",
+ "javaType": "io.fabric8.kubernetes.api.model.ListMeta"
}
- }
- }
- };
- $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.BaseKubernetesList",
+ "javaInterfaces": [
+ "io.fabric8.kubernetes.api.model.KubernetesResource",
+ "io.fabric8.kubernetes.api.model.KubernetesResourceList"
+ ]
+ },
+ "kubernetes_ListMeta": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "resourceVersion": {
+ "type": "string",
+ "description": "string that identifies the internal version of this object that can be used by clients to determine when objects have changed; populated by the system"
+ },
+ "selfLink": {
+ "type": "string",
+ "description": "URL for the object; populated by the system"
}
- $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.ListMeta"
+ },
+ "kubernetes_LoadBalancerIngress": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "hostname": {
+ "type": "string",
+ "description": "hostname of ingress point"
+ },
+ "ip": {
+ "type": "string",
+ "description": "IP address of ingress point"
}
- });
- }
- 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.LoadBalancerIngress"
+ },
+ "kubernetes_LoadBalancerStatus": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "ingress": {
+ "type": "array",
+ "description": "load-balancer ingress points",
+ "items": {
+ "$ref": "#/definitions/kubernetes_LoadBalancerIngress",
+ "javaType": "io.fabric8.kubernetes.api.model.LoadBalancerIngress"
+ }
}
- });
- _.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.LoadBalancerStatus"
+ },
+ "kubernetes_LocalObjectReference": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "name": {
+ "type": "string",
+ "description": "name of the referent; see http://releases.k8s.io/HEAD/docs/user-guide/identifiers.md#names"
}
- else {
- property.label = "Git URL";
- property['input-attributes'] = {
- 'required': true
- };
+ },
+ "additionalProperties": true,
+ "javaType": "io.fabric8.kubernetes.api.model.LocalObjectReference"
+ },
+ "kubernetes_MetadataFile": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "fieldRef": {
+ "$ref": "#/definitions/kubernetes_ObjectFieldSelector",
+ "javaType": "io.fabric8.kubernetes.api.model.ObjectFieldSelector"
+ },
+ "name": {
+ "type": "string",
+ "description": "the name of the file to be created"
}
- });
- _.forIn(specConfig.properties, function (property, name) {
- if (name !== 'source') {
- Kubernetes.log.info("Hiding property: ", name);
- property.hidden = true;
+ },
+ "additionalProperties": true,
+ "javaType": "io.fabric8.kubernetes.api.model.MetadataFile"
+ },
+ "kubernetes_MetadataVolumeSource": {
+ "type": "object",
+ "description": "",
+ "properties": {
+ "items": {
+ "type": "array",
+ "description": "list of metadata files",
+ "items": {
+ "$ref": "#/definitions/kubernetes_MetadataFile",
+ "javaType": "io.fabric8.kubernetes.api.model.MetadataFile"
+ }
}
- });
- break;
- case 'edit':
- default:
- }
- $scope.specConfig = specConfig;
- }]);
-})(Kubernetes || (Kubernetes = {}));
-
-/// Please wait, fetching logs...
\n View previous container logs?
\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;
+ }
+ });
+ }
+ };
+ }]);
+ 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) {
+ console.log("atBottom: ", val);
+ });
+ }
+ };
+ }]);
+})(Kubernetes || (Kubernetes = {}));
+
+/// Please wait, fetching logs...
\n View previous container logs?
\n \n \n ",
- link: function (scope, element, attr) {
- var link = scope.$eval('podLink');
- var name = scope.$eval('containerName');
- if (!link) {
- return;
+ return answer;
+ }
+ var answer = [
+ {
+ href: UrlHelpers.join(HawtioCore.documentBase(), "/workspaces", workspaceName),
+ label: "All Apps",
+ class: 'fa fa-angle-double-left',
+ title: "View the apps in this project"
+ },
+ {
+ template: ""
+ },
+ {
+ href: UrlHelpers.join(HawtioCore.documentBase(), "/workspaces", workspaceName, "projects", projectName, "environments"),
+ isActive: function (subTab, path) {
+ //console.log("subTab: ", subTab, " path: ", path);
+ if (path === subTab.href) {
+ return true;
+ }
+ var rootPath = subTab.href.replace(/\/environments/, '');
+ if (path === rootPath) {
+ return true;
+ }
+ return false;
+ },
+ //href: UrlHelpers.join("/workspaces", workspaceName, "projects", projectName),
+ label: "Dashboard",
+ class: "fa fa-tachometer",
+ title: "View the app dashboard for the activity, environments and pipelines"
+ },
+ {
+ isValid: function () { return isJenkinsBuild() && pipelinesLink; },
+ id: "pipelines",
+ href: pipelinesLink,
+ label: "Pipelines",
+ class: "fa fa-ellipsis-h",
+ title: "View the pipeline builds for this app"
+ },
+ {
+ isValid: function () { return !isJenkinsBuild(); },
+ href: buildsLink,
+ label: "Builds",
+ class: "fa fa-bars",
+ title: "View the builds for this app"
+ },
+ {
+ isValid: function () { return isJenkinsBuild(); },
+ id: "builds",
+ href: jenkinsBuildLink,
+ label: "Builds",
+ class: "fa fa-bars",
+ title: "View the Jenkins builds for this app"
+ },
+ {
+ isValid: function () { return isJenkinsBuild(); },
+ href: UrlHelpers.join(HawtioCore.documentBase(), "/workspaces", workspaceName, "projects", projectName, "jenkinsJob", jenkinsJobId, "metrics"),
+ label: "Metrics",
+ class: "fa fa-bar-chart",
+ title: "View the metrics for this project"
+ },
+ /*
+ {
+ href: UrlHelpers.join("/workspaces", workspaceName, "projects", projectName, "tools"),
+ label: "Tools",
+ title: "View the tools for this project"
+ },
+ */
+ {
+ href: UrlHelpers.join(HawtioCore.documentBase(), "/workspaces", workspaceName, "projects", projectName, "buildConfigEdit"),
+ label: "Settings",
+ class: "fa fa-cog",
+ title: "View the app configuration",
+ isActive: function (subTab, path) {
+ if (_.endsWith(path, '/buildConfigEdit')) {
+ return true;
+ }
+ if (_.endsWith(path, '/forge/secrets')) {
+ return true;
+ }
+ if (_.endsWith(path, '/forge/command/devops-edit')) {
+ return true;
+ }
+ return false;
}
- 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);
- }
+ }
+ ];
+ var context = {
+ workspaceName: workspaceName,
+ projectName: projectName,
+ projectLink: projectLink,
+ jenkinsJobId: jenkinsJobId,
+ $scope: $scope
+ };
+ angular.forEach(Developer.customProjectSubTabFactories, function (fn) {
+ if (angular.isFunction(fn)) {
+ var subtab = fn(context);
+ if (subtab) {
+ if (angular.isArray(subtab)) {
+ angular.forEach(subtab, function (t) {
+ answer.push(t);
});
- 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;
+ else {
+ answer.push(subtab);
+ }
}
- 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);
+ }
+ });
+ return activateCurrent(answer);
+ }
+ Developer.createProjectSubNavBars = createProjectSubNavBars;
+ function createProjectSettingsSubNavBars(projectName, jenkinsJobId) {
+ if (jenkinsJobId === void 0) { jenkinsJobId = null; }
+ if (!projectName) {
+ return [];
+ }
+ var workspaceName = Kubernetes.currentKubernetesNamespace();
+ var projectLink = UrlHelpers.join(HawtioCore.documentBase(), "/workspaces", workspaceName, "projects", projectName);
+ if (!jenkinsJobId) {
+ jenkinsJobId = projectName;
+ }
+ var answer = [
+ {
+ href: UrlHelpers.join(HawtioCore.documentBase(), "/workspaces", workspaceName, "projects", projectName, "buildConfigEdit"),
+ label: "Core",
+ title: "View the core build configuration"
+ },
+ {
+ href: projectSecretsLink(workspaceName, projectName),
+ label: "Secrets",
+ title: "View or change the secrets used to edit source code in the source control system"
+ },
+ {
+ href: editPipelineLink(workspaceName, projectName),
+ label: "Pipeline",
+ title: "View the DevOps and pipeline configuration"
+ },
+ {
+ isValid: function () { return forgeProjectHasBuilder("maven"); },
+ href: editMavenBuildLink(workspaceName, projectName),
+ label: "Maven",
+ title: "View the Maven build configuration"
+ }
+ ];
+ return activateCurrent(answer);
+ }
+ Developer.createProjectSettingsSubNavBars = createProjectSettingsSubNavBars;
+ function forgeProjectHasBuilder(name) {
+ var forgeProject = Kubernetes.inject("ForgeProject");
+ if (forgeProject) {
+ return forgeProject.hasBuilder(name);
+ }
+ return false;
+ }
+ Developer.forgeProjectHasBuilder = forgeProjectHasBuilder;
+ function forgeProjectHasPerspective(name) {
+ var forgeProject = Kubernetes.inject("ForgeProject");
+ if (forgeProject) {
+ return forgeProject.hasPerspective(name);
+ }
+ return false;
+ }
+ Developer.forgeProjectHasPerspective = forgeProjectHasPerspective;
+ function editPipelineLinkScope($scope) {
+ return editPipelineLink($scope.namespace, $scope.projectId || $scope.projectName || $scope.project);
+ }
+ Developer.editPipelineLinkScope = editPipelineLinkScope;
+ function createProjectLink(workspaceName) {
+ if (workspaceName === void 0) { workspaceName = null; }
+ if (!workspaceName) {
+ workspaceName = Kubernetes.currentKubernetesNamespace();
+ }
+ return UrlHelpers.join(HawtioCore.documentBase(), "/workspaces", workspaceName, "/forge/createProject");
+ }
+ Developer.createProjectLink = createProjectLink;
+ function editPipelineLink(workspaceName, projectName) {
+ return projectWorkspaceLink(workspaceName, projectName, "forge/command/devops-edit");
+ }
+ Developer.editPipelineLink = editPipelineLink;
+ function editMavenBuildLink(workspaceName, projectName) {
+ return projectWorkspaceLink(workspaceName, projectName, "forge/command/fabric8-setup");
+ }
+ Developer.editMavenBuildLink = editMavenBuildLink;
+ function projectSecretsLink(workspaceName, projectName) {
+ return projectWorkspaceLink(workspaceName, projectName, "forge/secrets", false);
+ }
+ Developer.projectSecretsLink = projectSecretsLink;
+ function secretsNamespaceLink(workspaceName, projectName, secretsNamespace) {
+ var prefix = projectWorkspaceLink(workspaceName, projectName, "") || "kubernetes";
+ return UrlHelpers.join(prefix, "namespace", secretsNamespace, "secrets");
+ }
+ Developer.secretsNamespaceLink = secretsNamespaceLink;
+ function projectWorkspaceLink(workspaceName, projectName, path, ignoreBlankProject) {
+ if (ignoreBlankProject === void 0) { ignoreBlankProject = true; }
+ if (ignoreBlankProject && !projectName) {
+ return "";
+ }
+ if (!workspaceName) {
+ workspaceName = Kubernetes.currentKubernetesNamespace();
+ }
+ return UrlHelpers.join(HawtioCore.documentBase(), "/workspaces", workspaceName, "projects", projectName, path);
+ }
+ Developer.projectWorkspaceLink = projectWorkspaceLink;
+ Developer.customProjectSubTabFactories = [];
+ function createJenkinsBreadcrumbs(projectName, jobId, buildId) {
+ var workspaceName = Kubernetes.currentKubernetesNamespace();
+ var children = [
+ {
+ id: "builds",
+ href: createBuildsLink(workspaceName, projectName, jobId),
+ label: "Builds",
+ title: "View the builds for this app"
+ }
+ ];
+ if (buildId) {
+ children.push({
+ id: "",
+ href: "",
+ label: "#" + buildId,
+ title: "Build #" + buildId
+ });
+ }
+ return createProjectBreadcrumbs(projectName, children);
+ }
+ Developer.createJenkinsBreadcrumbs = createJenkinsBreadcrumbs;
+ function createJenkinsSubNavBars(projectName, jenkinsJobId, buildId, extraOption) {
+ if (extraOption === void 0) { extraOption = null; }
+ var answer = createProjectSubNavBars(projectName, jenkinsJobId);
+ if (extraOption) {
+ extraOption.active = true;
+ answer.push(extraOption);
+ }
+ return answer;
+ }
+ Developer.createJenkinsSubNavBars = createJenkinsSubNavBars;
+ function createEnvironmentSubNavBars($scope, $location, $routeParams) {
+ var ns = Kubernetes.currentKubernetesNamespace();
+ var workspaceName = $routeParams.workspace;
+ var project = $routeParams.project;
+ var projectLink = UrlHelpers.join(HawtioCore.documentBase(), "/kubernetes");
+ if (workspaceName && project) {
+ projectLink = UrlHelpers.join(HawtioCore.documentBase(), "/workspaces", workspaceName, "projects", project);
+ }
+ var namespacesLink = UrlHelpers.join(projectLink, "namespace");
+ return activateCurrent([
+ {
+ href: UrlHelpers.join(projectLink, "environments"),
+ label: "<< Back To App",
+ title: "Go back to the Dashboard for this App",
+ isValid: function () { return project; }
+ },
+ {
+ href: UrlHelpers.join(namespacesLink, ns, "apps"),
+ label: "Overview",
+ class: "fa fa-list",
+ title: "Overview of all the apps for this project"
+ },
+ {
+ href: UrlHelpers.join(namespacesLink, ns, "services"),
+ label: "Services",
+ class: "fa fa-plug",
+ title: "View the apps for this project"
+ },
+ {
+ href: UrlHelpers.join(namespacesLink, ns, "replicationControllers"),
+ label: "Controllers",
+ class: "fa fa-clone",
+ title: "View the Replication Controllers for this project"
+ },
+ {
+ href: UrlHelpers.join(namespacesLink, ns, "pods"),
+ label: "Pods",
+ class: "fa fa-puzzle-piece",
+ title: "View the pods for this project"
+ },
+ {
+ href: UrlHelpers.join(namespacesLink, ns, "events"),
+ label: "Events",
+ class: "fa fa-newspaper-o",
+ title: "View the events for this project"
+ },
+ {
+ href: UrlHelpers.join(namespacesLink, ns, "secrets"),
+ label: "Secrets",
+ class: "fa fa-key",
+ title: "View the secrets for this project"
+ },
+ {
+ href: UrlHelpers.join(HawtioCore.documentBase(), "/kubernetes/hosts"),
+ label: "Nodes",
+ class: "fa fa-server",
+ title: "View the nodes for this project"
+ },
+ {
+ href: UrlHelpers.join(namespacesLink, ns, "overview"),
+ label: "Diagram",
+ class: "fa fa-sitemap",
+ title: "View all the objects in this project and their relationship"
+ },
+ {
+ href: UrlHelpers.join(namespacesLink, ns, "angryPods"),
+ label: "Angry Pods",
+ class: "fa fa-gamepad",
+ title: "Try the Angry Pods game!"
+ },
+ ]);
+ }
+ Developer.createEnvironmentSubNavBars = createEnvironmentSubNavBars;
+ function namespaceLink($scope, $routeParams, path) {
+ if (path === void 0) { path = null; }
+ var ns = Kubernetes.currentKubernetesNamespace();
+ var workspaceName = $routeParams.workspace;
+ var project = $routeParams.project;
+ var projectLink = UrlHelpers.join(HawtioCore.documentBase(), "/kubernetes");
+ if (workspaceName && project) {
+ projectLink = UrlHelpers.join(HawtioCore.documentBase(), "/workspaces", workspaceName, "projects", project);
+ }
+ return UrlHelpers.join(projectLink, "namespace", ns, path);
+ }
+ Developer.namespaceLink = namespaceLink;
+ /**
+ * Removes the URL query string if its inside the given text
+ */
+ function trimQuery(text) {
+ if (text) {
+ var idx = text.indexOf("?");
+ if (idx >= 0) {
+ return text.substring(0, idx);
+ }
+ }
+ return text;
+ }
+ function activateCurrent(navBarItems) {
+ navBarItems = _.compact(navBarItems);
+ var injector = HawtioCore.injector;
+ var $location = injector ? injector.get("$location") : null;
+ if ($location) {
+ var path = trimQuery($location.path());
+ var found = false;
+ function makeActive(item) {
+ item.active = true;
+ found = true;
+ }
+ angular.forEach(navBarItems, function (item) {
+ if (item) {
+ if (angular.isFunction(item.isActive)) {
+ if (!found && item.isActive(item, path)) {
+ makeActive(item);
}
- ws.close();
- ws = initSocket(link);
}
- });
- element.on('$destroy', function () {
- if (ws) {
- try {
- ws.close();
- }
- catch (err) {
+ else {
+ var href = item.href;
+ var trimHref = trimQuery(href);
+ if (!found && trimHref && trimHref === path) {
+ makeActive(item);
}
- delete ws;
}
- });
+ }
+ });
+ }
+ return navBarItems;
+ }
+ function processChildren(answer, children) {
+ if (children) {
+ if (angular.isArray(children)) {
+ answer = answer.concat(children);
}
- };
+ else {
+ answer.push(children);
+ }
+ }
+ activateCurrent(answer);
+ return answer;
+ }
+})(Developer || (Developer = {}));
+
+/// ' + build.displayName + '
' +
+ 'duration: ' + y + ' seconds
';
+ if (date) {
+ tooltip += 'started: ' + date + '
';
}
- var data = {};
- angular.forEach(entity.properties, function (property) {
- var key = property.key;
- var value = property.value || "";
- if (key) {
- data[key] = window.btoa(value);
- }
- });
- $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 (result) {
+ tooltip += 'result: ' + result + '
';
+ }
+ if (x) {
+ var data = buildsSucceeded;
+ var key = successBuildKey;
+ if (!successBuildKey && (!result || !result.startsWith("SUCC"))) {
+ data = buildsFailed;
+ key = failedBuildKey;
}
- $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);
- });
- }
- };
- 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;
- }
- var type = "textarea";
- if (key === "username") {
- type = "text";
- if (!text) {
- text = Kubernetes.currentUserName();
+ data.push({
+ tooltip: tooltip,
+ color: color,
+ x: x, y: y });
}
+ });
+ $scope.data = [];
+ if (buildsSucceeded.length) {
+ $scope.data.push({
+ key: successBuildKey,
+ values: buildsSucceeded
+ });
}
- else if (key === "password") {
- type = "password";
- }
- var property = {
- key: key,
- label: label,
- tooltip: tooltip,
- rows: rows,
- value: text,
- type: type
- };
- return property;
+ if (buildsFailed.length) {
+ $scope.data.push({
+ key: failedBuildKey,
+ values: buildsFailed
+ });
+ }
+ $scope.api.updateWithData($scope.data);
+ $timeout(function () {
+ $scope.api.update();
+ }, 50);
}
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);
+ 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);
});
}
- else {
- if (createKind === "ssh") {
- $scope.addFields($scope.sshKeys);
+ }
+ }]);
+})(Developer || (Developer = {}));
+
+/// ");
+ var provinceValue = provinceValueTemp[provinceValueTemp.length - 1].split(" ")[0];
+ //city
+ var cityValueTemp = itemvalue[0].split("");
+ var cityValue = cityValueTemp[cityValueTemp.length - 1].split(" ")[0];
+ // county
+ var countyValueTemp = itemvalue[0].split("");
+ var countyValue = countyValueTemp[countyValueTemp.length - 1].split(" ")[0];
+ //
+ var codeValueTemp = itemvalue[0].split("");
+ var codeValue = codeValueTemp[codeValueTemp.length - 1].split("")[0];
+ //
+ var sys_nameValueTemp = itemvalue[0].split("");
+ var sys_nameValue = sys_nameValueTemp[sys_nameValueTemp.length - 1].split(" ")[0];
+ //
+ var character_setValueTemp = itemvalue[0].split("");
+ var character_setValue = character_setValueTemp[character_setValueTemp.length - 1].split(" ")[0];
+ //
+ var sys_name_codeValueTemp = itemvalue[0].split("");
+ var sys_name_codeValue = sys_name_codeValueTemp[sys_name_codeValueTemp.length - 1].split(" ")[0];
+ //
+ var contactValueTemp = itemvalue[0].split("");
+ var contactValue = contactValueTemp[contactValueTemp.length - 1].split(" ")[0];
+ //
+ var phoneValueTemp = itemvalue[0].split("");
+ var phoneValue = phoneValueTemp[phoneValueTemp.length - 1].split(" ")[0];
+ //
+ var dateValueTemp = itemvalue[0].split("");
+ var dateValue = dateValueTemp[dateValueTemp.length - 1].split(" ")[0];
+ //id :
+ var itemId = codeValue + "_" + sys_name_codeValue;
+ // http get version
+ var rid = itemId; //.replace(/\"/g, "");
+ // TODO typeValue 通过前端页面获取或者？？，财政01或社保02
+ var typeValue = "01";
+ // TODO batchValue 通过前端页面获取或者？？，批次A ：大写的A，批次B ：大写的B，
+ var batchValue = "A";
+ var itemname = cityValue + countyValue + sys_nameValue;
+ var versionid = 1;
+ var xhr = new XMLHttpRequest();
+ xhr.onreadystatechange = function () {
+ if (xhr.readyState == 4) {
+ if (xhr.status == 200) {
+ versionid = xhr.responseText;
+ }
+ }
+ };
+ xhr.open("get", "/getversion?id=" + rid, false);
+ xhr.send(null);
+ var jsobj = JSON.parse(versionid);
+ var xmlversion = jsobj.id;
+ var properValue = "{\"id\":\"" + itemId + "\", \"name\":\"" + itemname + "\", \"city\":\"" +
+ cityValue + "\", \"county\":\"" + countyValue + "\", \"system\":\"" +
+ sys_nameValue + "\", \"type\":\"" + typeValue + "\",\"batch\":\"" +
+ batchValue + "\",\"version\":\"" + xmlversion + "\", \"province\":\"" +
+ provinceValue + "\", \"code\":\"" +
+ codeValue + "\", \"character_set\":\"" +
+ character_setValue + "\", \"sys_name_code\":\"" +
+ sys_name_codeValue + "\", \"contact\":\"" +
+ contactValue + "\", \"phone\":\"" +
+ phoneValue + "\", \"date\":\"" +
+ dateValue + "\"}";
+ resultString = resultString + properValue;
+ if (k < itemsize - 1) {
+ resultString = resultString + ", ";
+ }
+ }
+ resultString = resultString + "]}";
+ }
+ $scope.$apply(function () {
+ $scope.model.localdata = JSON.parse(resultString.toString());
+ });
+ };
+ reader.readAsText(files[i], "utf-8");
+ }
+ else {
+ FilterList.length += 1;
+ var file_id = files[i].name.replace(/\.\w*$/, '');
+ // var file_id=file[i].webkitRelativePath.replace(/^[a-z]*\/$/,'');
+ // file_id = file_id.replace(/\/\w+$/,'');
+ FilterList[j++] = files[i];
}
- });
- }
- });
- $scope.handleClick = function (entity, labelType, value) {
- // log.debug("handleClick, entity: ", entity, " key: ", labelType, " value: ", value);
- $scope.$emit('labelFilterUpdate', value.title);
- };
- $scope.labelClass = Kubernetes.containerLabelClass;
- }]);
- //服务状态过滤
- Kubernetes.Status = Kubernetes.controller('Status', ["$scope", "$http", "$interval", "$location", "KubernetesApiURL", function ($scope, $http, $interval, $location, KubernetesApiURL) {
- $scope.$watch('entity', function (newValue, oldValue) {
- if (newValue)
- console.log(newValue);
- }, true);
- }]);
-})(Kubernetes || (Kubernetes = {}));
-
-/// \r\n 江苏省审计厅数据汇总平台
\r\n \r\n \r\n \r\n 本地文件列表
\r\n \r\n - 文件名
\r\n \r\n \r\n \r\n \r\n \r\n \r\n
\r\n \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 \r\n \r\n \r\n\r\n \r\n\r\n\r\n\r\n");
$templateCache.put("plugins/developer/html/code.html","\n \n \n \n\n \n \n \n\n \n \n \n There are no tools currently available.
\n \n \n \n There are no tools currently available.
\n \n \n \n \n \n \n \n \n \n \n\n");
@@ -17897,7 +18537,7 @@ $templateCache.put("plugins/kubernetes/html/hosts.html","\n \n \n \n \n \n \n \n \n \n \n \n \n \n There are no image repositories available.
\n Create Image Repository\n \n \n
\n \n \n \n \n\n");
$templateCache.put("plugins/kubernetes/html/importProject.html","\n \n \n \n \n\n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n\n \n Create a project by entering or copy/pasting the Git URL for a repository, and give the project a name. By default the name will be based on the repository name.\n
\n\n \n\n \n\n \n \n \n \n\n");
$templateCache.put("plugins/kubernetes/html/kubernetesJsonDirective.html","\n \n \n \n\n \n \n ![]()
\n \n \n \n {{displayName || appTitle}}
\n \n \n \n \n \n {{containerName}} logs
\n \n \n \n \n \n No Pipeline Available
\n Pipeline is a kind of build which uses Jenkins Workflow internally which has multiple Stages. You will see the active pipelines here after you add a build to this project
\n \n \n \n \n \n \n \n \n\n");
@@ -17909,7 +18549,7 @@ $templateCache.put("plugins/kubernetes/html/pods.html","\n\n \n \n \n\n \n \n \n\n \n \n \n ![]()
{{item.metadata.name}}\n \n\n \n \n\n \n \n\n {{rawMode ? \'Form\' : \'Raw\'}}\n \n\n Edit\n \n\n Save\n \n\n \n Events\n \n\n \n\n \n Scale\n \n\n Pods:\n \n {{item.$podCounters.ready}}\n {{item.$podCounters.valid}}\n {{item.$podCounters.waiting}}\n {{item.$podCounters.error}}\n \n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n\n \n \n");
$templateCache.put("plugins/kubernetes/html/replicationControllerCreate.html","\n");
$templateCache.put("plugins/kubernetes/html/replicationControllerEdit.html","\n");
-$templateCache.put("plugins/kubernetes/html/replicationControllers.html","\n \n \n\n \n \n \n\n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n 当前没有正在运行的oracle服务.
\n \n \n
\n \n \n \n \n \n \n");
+$templateCache.put("plugins/kubernetes/html/replicationControllers.html","\n \n \n\n \n \n \n\n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n 当前没有正在运行的oracle服务.
\n \n \n
\n \n \n \n \n \n\n \n \n \n \n");
$templateCache.put("plugins/kubernetes/html/secret.html","\n \n \n \n\n \n \n \n\n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n \n\n \n \n \n \n\n\n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n \n\n\n");
$templateCache.put("plugins/kubernetes/html/secrets.html","\n \n \n \n\n \n \n \n\n \n \n \n There are no secrets currently available.
\n \n \n
\n \n \n \n \n\n");
$templateCache.put("plugins/kubernetes/html/service.html","\n \n \n \n\n \n \n \n\n \n \n \n ![]()
{{item.metadata.name}}\n \n\n \n \n\n \n\n {{rawMode ? \'Form\' : \'Raw\'}}\n \n\n Edit\n \n\n Save\n \n\n \n Connect\n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n\n\n");
diff --git a/gulpfile.js b/gulpfile.js
index 4302294b..34d9a1de 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -31,7 +31,7 @@ var time =0;
var schedule = [];
var kubectl = K8s.kubectl({
- endpoint: 'http://192.168.0.102:8080',
+ endpoint: process.env.KUBERNETES_MASTER,
binary: '/usr/bin/kubectl'
});
@@ -328,16 +328,19 @@ gulp.task('connect', ['watch'], function() {
var tmpPath = "/home/ubuntu/tmp/app";
var appSource="/home/app";
if(req.method="POST"){
- var timestamp=new Date().getTime();
- if((timestamp - time) >= 60*1000){
- time = timestamp;
- var dirName= myjs.randomString(10);
+ var timestamp=new Date();
+ if((timestamp.getTime() - time) >= 2*60*1000){
+ time = timestamp.getTime();
+ var id =fs.readFileSync("./app/version.txt");
+ var dirName= "huizongshuju-" +id;
dataPath = dataPath + dirName+"/";
fs.mkdirSync(dataPath);
//path.exists(tmpPath,function(exists){if(exists) console.log("exists");});
fs.renameSync(tmpPath, dataPath+"app");
console.log("move 'home/ubuntu/tmp/app' to " + dataPath);
- res.send(200,{path:dataPath+"app/"});
+ xmloperation.savehuizong(timestamp.Format('yyyy-MM-dd hh:mm:ss'), '10', id, "汇总数据库("+ id +")", dataPath, dirName);
+ fs.writeFileSync('./app/version.txt', 2);
+ res.send(200,{path: dataPath+"app/", name: dirName});
res.end();
shellprocess.exec("cp -rp " + appSource + " " + tmpPath);
}else{
@@ -625,13 +628,18 @@ gulp.task('connect', ['watch'], function() {
res.end();
});
});
- hawtio.use('/cancelOracleConection',function(req,res){
+ hawtio.use('/cancelOracleConection', function(req,res){
var rcName = req.query.oracleName;
cancelOracleConectionTask(rcName);
res.send(200,"Ok");
res.end();
});
+ hawtio.use('/extractOracleData', function(req,res){
+ var data = req.query.param;
+ console.log(data);
+ });
+
hawtio.listen(function(server) {
var host = server.address().address;
var port = server.address().port;
diff --git a/plugins/developer/ts/workspaces.ts b/plugins/developer/ts/workspaces.ts
index c7431d8c..f9982ccf 100644
--- a/plugins/developer/ts/workspaces.ts
+++ b/plugins/developer/ts/workspaces.ts
@@ -7,8 +7,8 @@
module Developer {
export var WorkspacesController = controller("WorkspacesController",
- ["$scope", "OracleStatusModel", "KubernetesModel", "KubernetesState", "$templateCache", "$location", "$routeParams", "$http", "$timeout", "KubernetesApiURL", "DataInfoModel", "$interval",
- ($scope, OracleStatusModel, KubernetesModel:Kubernetes.KubernetesModelService, KubernetesState, $templateCache:ng.ITemplateCacheService, $location:ng.ILocationService, $routeParams, $http, $timeout, KubernetesApiURL, DataInfoModel,$interval) => {
+ ["$scope", "KubernetesModel", "KubernetesState", "$templateCache", "$location", "$routeParams", "$http", "$timeout", "KubernetesApiURL", "DataInfoModel", "$interval",
+ ($scope, KubernetesModel:Kubernetes.KubernetesModelService, KubernetesState, $templateCache:ng.ITemplateCacheService, $location:ng.ILocationService, $routeParams, $http, $timeout, KubernetesApiURL, DataInfoModel,$interval) => {
$scope.model = DataInfoModel;
$scope.items=[];
@@ -243,7 +243,7 @@ module Developer {
var timerForUpload = $interval(function(){
if(i >= isExited.length){
// clearInterval(timerForUpload);
- $interval.cancle(timerForUpload);
+ $interval.cancel(timerForUpload);
}
if(isuploaad == 1){
var r = new Resumable({
@@ -412,17 +412,30 @@ module Developer {
function createRCObj(item: Object){
var array =item.id.split("_");
- return {
- "name": array[2] + "-" + array[3] + "-" + array[4],
- "labels": {
- "type": array[0],
- "batch": array[1],
- "region": array[2],
- "system": array[3],
- "version": array[4]
- },
- "path": item.path +"app/"
- }
+ if(array[0] === "10"){
+ //console.log(item);
+ return {
+ "name": item.fakename,
+ "labels": {
+ "name": item.fakename
+ },
+ "path": item.path +"app/",
+ "isTarget" : "true"
+ }
+ }else{
+ return {
+ "name": array[2] + "-" + array[3] + "-" + array[4],
+ "labels": {
+ "type": array[0],
+ "batch": array[1],
+ "region": array[2],
+ "system": array[3],
+ "version": array[4]
+ },
+ "path": item.path +"app/",
+ "isTarget": "false"
+ }
+ }
}
function setchmod2dir(datamessage){
diff --git a/plugins/kubernetes/html/layoutKubernetes.html b/plugins/kubernetes/html/layoutKubernetes.html
index 9f7c0f95..f8da014d 100644
--- a/plugins/kubernetes/html/layoutKubernetes.html
+++ b/plugins/kubernetes/html/layoutKubernetes.html
@@ -9,10 +9,10 @@