Browse Source

Merge pull request #231 from nameczz/dev

Update sdk and add metric api
nameczz 3 years ago
parent
commit
d2e4de5105

+ 1 - 1
server/package.json

@@ -33,7 +33,7 @@
     "@nestjs/websockets": "^8.0.4",
     "@types/passport-jwt": "^3.0.5",
     "@types/passport-local": "^1.0.33",
-    "@zilliz/milvus2-sdk-node": "^1.0.16",
+    "@zilliz/milvus2-sdk-node": "^1.0.17",
     "axios": "^0.21.3",
     "body-parser": "^1.19.0",
     "cache-manager": "^3.4.4",

+ 6 - 1
server/src/milvus/milvus.controller.ts

@@ -15,7 +15,7 @@ import { MilvusService } from './milvus.service';
 @ApiTags('milvus')
 @Controller('milvus')
 export class MilvusController {
-  constructor(private milvusService: MilvusService) { }
+  constructor(private milvusService: MilvusService) {}
 
   @Post('connect')
   @UsePipes(new ValidationPipe())
@@ -32,4 +32,9 @@ export class MilvusController {
   async flush(@Body() data: Flush) {
     return await this.milvusService.flush(data);
   }
+
+  @Get('metrics')
+  async getMetrics() {
+    return await this.milvusService.getMetrics();
+  }
 }

+ 11 - 1
server/src/milvus/milvus.service.ts

@@ -1,6 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { MilvusClient } from '@zilliz/milvus2-sdk-node';
-import { FlushReq } from '@zilliz/milvus2-sdk-node/dist/milvus/types';
+import {
+  FlushReq,
+  GetMetricsResponse,
+} from '@zilliz/milvus2-sdk-node/dist/milvus/types';
 @Injectable()
 export class MilvusService {
   private milvusAddress: string;
@@ -73,4 +76,11 @@ export class MilvusService {
     const res = await this.milvusClient.dataManager.flush(data);
     return res;
   }
+
+  async getMetrics(): Promise<GetMetricsResponse> {
+    const res = await this.milvusClient.dataManager.getMetric({
+      request: { metric_type: 'system_info' },
+    });
+    return res;
+  }
 }

+ 4 - 4
server/yarn.lock

@@ -1425,10 +1425,10 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-"@zilliz/milvus2-sdk-node@^1.0.16":
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/@zilliz/milvus2-sdk-node/-/milvus2-sdk-node-1.0.16.tgz#9547d303d20e6294c2d5b49b24ba0bbeba5579e3"
-  integrity sha512-L3wJiGhu4FPH42DfUKHj8Lx2bpiSKEoy6THlAOJ7Dop4y3yEtiMmE2tiyP0C8LKPOI6qmndVGPN6xA6XAe4kUw==
+"@zilliz/milvus2-sdk-node@^1.0.17":
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/@zilliz/milvus2-sdk-node/-/milvus2-sdk-node-1.0.17.tgz#af0b132c6896147dadb73f0050eb6b95ce47908a"
+  integrity sha512-eCkCd8P0QGKXMKyzdE67INK0WSfgBfYTBQrnsZIjBdLJkUa8saWX8G60ayQt0o5W4nj0tfu+OwKL5RXzhhOSLw==
   dependencies:
     "@grpc/grpc-js" "^1.2.12"
     "@grpc/proto-loader" "^0.6.0"