diff --git a/lib/service/etcd-data.js b/lib/service/etcd-data.js index c1a6977..42923ac 100644 --- a/lib/service/etcd-data.js +++ b/lib/service/etcd-data.js @@ -63,16 +63,17 @@ class EtcdData extends Events { } async getResult() { - const [discovery, algorithms, pipelines, algorithmBuilds, experiments, dataSources, boards] = await Promise.all([ + const [discovery, algorithms, pipelines, algorithmBuilds, experiments, dataSources, devenvs, boards] = await Promise.all([ this._getDiscovery(), this._getAlgorithms(), this._getStoredPipelines(), this._getAlgorithmBuilds(), this._getExperiments(), this._getDataSources(), + this._getDevEnvs(), this._getBoards() ]); - this.lastResults = { discovery, algorithms, pipelines, algorithmBuilds, experiments, dataSources, boards }; + this.lastResults = { discovery, algorithms, pipelines, algorithmBuilds, experiments, dataSources, devenvs, boards }; return this.lastResults; } @@ -144,6 +145,10 @@ class EtcdData extends Events { return this._db.dataSources.listDataSources(); } + async _getDevEnvs() { + return this._db.devenvs.fetchAll({ sort: { created: 'desc' }, limit: MAX_ITEMS }); + } + async _getAlgorithmBuilds() { return this._db.algorithms.builds.fetchAll({ sort: { startTime: 'desc' }, limit: MAX_ITEMS }); } diff --git a/lib/service/result-gather.js b/lib/service/result-gather.js index ef82816..4b7d688 100644 --- a/lib/service/result-gather.js +++ b/lib/service/result-gather.js @@ -90,7 +90,7 @@ class ResultGather extends Events { this._working = true; const { nodeStatistics, diskSpace } = nodeStatisticsData.getLatestResult(); - const { jobs, discovery, algorithms, pipelines, algorithmBuilds, boards, experiments, dataSources } = etcdApi.getLastResults(); + const { jobs, discovery, algorithms, pipelines, algorithmBuilds, boards, experiments, dataSources, devenvs } = etcdApi.getLastResults(); const { taskMap, batchMap, nodeMap } = board.mapBoards(boards); await board.addHasMetricsToMap(nodeMap); for (const exp of jobs) { @@ -109,6 +109,7 @@ class ResultGather extends Events { pipelines, experiments, dataSources, + devenvs, algorithmBuilds, boards: { batchMap, taskMap, nodeMap } }); diff --git a/package-lock.json b/package-lock.json index d28d146..fd4ae40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -180,11 +180,11 @@ "integrity": "sha512-6V8BqJCE06vS88FA1Zwbyr7KZsXc9p91LfQWW2NHB/zRsQpIxdaCDsm9MU7mcQHhzgky+qVO39SSxTXmG4kDNw==" }, "@hkube/db": { - "version": "1.0.42", - "resolved": "https://registry.npmjs.org/@hkube/db/-/db-1.0.42.tgz", - "integrity": "sha512-qDTVzWPFVDSd+GUvuryzXYZVGotghLD8AwGoLtJjWHEaAU3P2dEv5FN4vDdX1IE0LvIYSXMOYD9PLq8dKFvO+A==", + "version": "1.0.46", + "resolved": "https://registry.npmjs.org/@hkube/db/-/db-1.0.46.tgz", + "integrity": "sha512-gmVwVsQeBwO1Q4auUaK1AxIlmdEqCc3RfL1kPyXkadyIJ7Vb1q93FcG230yrrvJosq5w/HieQ2DYmd/xq716GQ==", "requires": { - "@hkube/consts": "^1.0.31", + "@hkube/consts": "^1.0.40", "lodash.clonedeep": "^4.5.0", "lodash.merge": "^4.6.2", "moment": "^2.29.1", @@ -192,6 +192,11 @@ "performance-now": "^2.1.0" }, "dependencies": { + "@hkube/consts": { + "version": "1.0.43", + "resolved": "https://registry.npmjs.org/@hkube/consts/-/consts-1.0.43.tgz", + "integrity": "sha512-09QeMcDNrZfM1+vG2Xc+wRA8DSJSHI9/H+YzkurwuLRaCHB0YwPsFXnET1eLzxqIRPmyo39vZVrXRZTB7Gbyog==" + }, "moment": { "version": "2.29.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", @@ -3629,14 +3634,14 @@ "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==" }, "mongodb": { - "version": "3.6.11", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.11.tgz", - "integrity": "sha512-4Y4lTFHDHZZdgMaHmojtNAlqkvddX2QQBEN0K//GzxhGwlI9tZ9R0vhbjr1Decw+TF7qK0ZLjQT292XgHRRQgw==", + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.7.3.tgz", + "integrity": "sha512-Psm+g3/wHXhjBEktkxXsFMZvd3nemI0r3IPsE0bU+4//PnvNWKkzhZcEsbPcYiWqe8XqXJJEg4Tgtr7Raw67Yw==", "requires": { "bl": "^2.2.1", "bson": "^1.1.4", "denque": "^1.4.1", - "optional-require": "^1.0.3", + "optional-require": "^1.1.8", "safe-buffer": "^5.1.2", "saslprep": "^1.0.0" } @@ -3965,9 +3970,9 @@ } }, "optional-require": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.1.7.tgz", - "integrity": "sha512-cIeRZocXsZnZYn+SevbtSqNlLbeoS4mLzuNn4fvXRMDRNhTGg0sxuKXl0FnZCtnew85LorNxIbZp5OeliILhMw==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/optional-require/-/optional-require-1.1.8.tgz", + "integrity": "sha512-jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA==", "requires": { "require-at": "^1.0.6" } diff --git a/package.json b/package.json index fee9f6b..06975e4 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "dependencies": { "@hkube/config": "^2.0.11", "@hkube/consts": "^1.0.36", - "@hkube/db": "^1.0.42", + "@hkube/db": "^1.0.46", "@hkube/elastic-client": "^1.0.0", "@hkube/etcd": "^5.1.6", "@hkube/healthchecks": "^1.0.2",