tag version v0.9.3

BeryJu · Oct 17, 2024 · 39ae9f9 · 39ae9f9
1 parent c7ab40b
commit 39ae9f9
Show file tree

Hide file tree

Showing 108 changed files with 585 additions and 720 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 PWD = $(shell pwd)
 UID = $(shell id -u)
 GID = $(shell id -g)
-VERSION = "0.9.2"
+VERSION = "0.9.3"
 LD_FLAGS = -X beryju.io/gravity/pkg/extconfig.Version=${VERSION}
 GO_FLAGS = -ldflags "${LD_FLAGS}" -v
 SCHEMA_FILE = schema.yml

diff --git a/api/.openapi-generator/FILES b/api/.openapi-generator/FILES
@@ -102,6 +102,7 @@ docs/TsdbAPIRoleConfigOutput.md
 docs/TsdbRoleConfig.md
 docs/TypesAPIMetricsGetOutput.md
 docs/TypesAPIMetricsRecord.md
+docs/TypesAPIMetricsRole.md
 docs/TypesDHCPOption.md
 docs/TypesOIDCConfig.md
 git_push.sh
@@ -187,6 +188,7 @@ model_tsdb_api_role_config_output.go
 model_tsdb_role_config.go
 model_types_api_metrics_get_output.go
 model_types_api_metrics_record.go
+model_types_api_metrics_role.go
 model_types_dhcp_option.go
 model_types_oidc_config.go
 response.go

diff --git a/api/README.md b/api/README.md
@@ -5,7 +5,7 @@ No description provided (generated by Openapi Generator https://github.com/opena
 ## Overview
 This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [OpenAPI-spec](https://www.openapis.org/) from a remote server, you can easily generate an API client.
 
-- API version: 0.9.2
+- API version: 0.9.3
 - Package version: 1.0.0
 - Build package: org.openapitools.codegen.languages.GoClientCodegen
 
@@ -86,8 +86,6 @@ Class | Method | HTTP request | Description
 *RolesApiApi* | [**ApiExport**](docs/RolesApiApi.md#apiexport) | **Post** /api/v1/cluster/export | Export Cluster
 *RolesApiApi* | [**ApiGetLogMessages**](docs/RolesApiApi.md#apigetlogmessages) | **Get** /api/v1/cluster/node/logs | Log messages
 *RolesApiApi* | [**ApiGetMembers**](docs/RolesApiApi.md#apigetmembers) | **Get** /api/v1/etcd/members | Etcd members
-*RolesApiApi* | [**ApiGetMetricsCpu**](docs/RolesApiApi.md#apigetmetricscpu) | **Get** /api/v1/system/metrics/cpu | System Metrics
-*RolesApiApi* | [**ApiGetMetricsMemory**](docs/RolesApiApi.md#apigetmetricsmemory) | **Get** /api/v1/system/metrics/memory | System Metrics
 *RolesApiApi* | [**ApiGetRoleConfig**](docs/RolesApiApi.md#apigetroleconfig) | **Get** /api/v1/roles/api | API role config
 *RolesApiApi* | [**ApiGetTokens**](docs/RolesApiApi.md#apigettokens) | **Get** /api/v1/auth/tokens | Tokens
 *RolesApiApi* | [**ApiGetUsers**](docs/RolesApiApi.md#apigetusers) | **Get** /api/v1/auth/users | API Users
@@ -124,7 +122,6 @@ Class | Method | HTTP request | Description
 *RolesDiscoveryApi* | [**DiscoverySubnetStart**](docs/RolesDiscoveryApi.md#discoverysubnetstart) | **Post** /api/v1/discovery/subnets/start | Discovery Subnets
 *RolesDnsApi* | [**DnsDeleteRecords**](docs/RolesDnsApi.md#dnsdeleterecords) | **Delete** /api/v1/dns/zones/records | DNS Records
 *RolesDnsApi* | [**DnsDeleteZones**](docs/RolesDnsApi.md#dnsdeletezones) | **Delete** /api/v1/dns/zones | DNS Zones
-*RolesDnsApi* | [**DnsGetMetrics**](docs/RolesDnsApi.md#dnsgetmetrics) | **Get** /api/v1/dns/metrics | DNS Metrics
 *RolesDnsApi* | [**DnsGetRecords**](docs/RolesDnsApi.md#dnsgetrecords) | **Get** /api/v1/dns/zones/records | DNS Records
 *RolesDnsApi* | [**DnsGetRoleConfig**](docs/RolesDnsApi.md#dnsgetroleconfig) | **Get** /api/v1/roles/dns | DNS role config
 *RolesDnsApi* | [**DnsGetZones**](docs/RolesDnsApi.md#dnsgetzones) | **Get** /api/v1/dns/zones | DNS Zones
@@ -134,6 +131,7 @@ Class | Method | HTTP request | Description
 *RolesEtcdApi* | [**EtcdJoinMember**](docs/RolesEtcdApi.md#etcdjoinmember) | **Post** /api/v1/etcd/join | Etcd join
 *RolesMonitoringApi* | [**MonitoringGetRoleConfig**](docs/RolesMonitoringApi.md#monitoringgetroleconfig) | **Get** /api/v1/roles/monitoring | Monitoring role config
 *RolesMonitoringApi* | [**MonitoringPutRoleConfig**](docs/RolesMonitoringApi.md#monitoringputroleconfig) | **Post** /api/v1/roles/monitoring | Monitoring role config
+*RolesTsdbApi* | [**TsdbGetMetrics**](docs/RolesTsdbApi.md#tsdbgetmetrics) | **Get** /api/v1/tsdb/metrics | Retrieve Metrics
 *RolesTsdbApi* | [**TsdbGetRoleConfig**](docs/RolesTsdbApi.md#tsdbgetroleconfig) | **Get** /api/v1/roles/tsdb | TSDB role config
 *RolesTsdbApi* | [**TsdbPutRoleConfig**](docs/RolesTsdbApi.md#tsdbputroleconfig) | **Post** /api/v1/roles/tsdb | TSDB role config
 
@@ -220,6 +218,7 @@ Class | Method | HTTP request | Description
  - [TsdbRoleConfig](docs/TsdbRoleConfig.md)
  - [TypesAPIMetricsGetOutput](docs/TypesAPIMetricsGetOutput.md)
  - [TypesAPIMetricsRecord](docs/TypesAPIMetricsRecord.md)
+ - [TypesAPIMetricsRole](docs/TypesAPIMetricsRole.md)
  - [TypesDHCPOption](docs/TypesDHCPOption.md)
  - [TypesOIDCConfig](docs/TypesOIDCConfig.md)
 

diff --git a/api/api/openapi.yaml b/api/api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   title: gravity
-  version: 0.9.2
+  version: 0.9.3
 servers:
 - url: /
 paths:
@@ -837,25 +837,6 @@ paths:
       summary: Discovery Subnets
       tags:
       - roles/discovery
-  /api/v1/dns/metrics:
-    get:
-      operationId: dns.get_metrics
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TypesAPIMetricsGetOutput'
-          description: OK
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RestErrResponse'
-          description: Internal Server Error
-      summary: DNS Metrics
-      tags:
-      - roles/dns
   /api/v1/dns/zones:
     delete:
       operationId: dns.delete_zones
@@ -1415,44 +1396,6 @@ paths:
       summary: TSDB role config
       tags:
       - roles/tsdb
-  /api/v1/system/metrics/cpu:
-    get:
-      operationId: api.get_metrics_cpu
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TypesAPIMetricsGetOutput'
-          description: OK
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RestErrResponse'
-          description: Internal Server Error
-      summary: System Metrics
-      tags:
-      - roles/api
-  /api/v1/system/metrics/memory:
-    get:
-      operationId: api.get_metrics_memory
-      responses:
-        "200":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/TypesAPIMetricsGetOutput'
-          description: OK
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RestErrResponse'
-          description: Internal Server Error
-      summary: System Metrics
-      tags:
-      - roles/api
   /api/v1/tools/ping:
     post:
       operationId: tools.ping
@@ -1525,6 +1468,59 @@ paths:
       summary: Traceroute tool
       tags:
       - roles/api
+  /api/v1/tsdb/metrics:
+    get:
+      operationId: tsdb.get_metrics
+      parameters:
+      - explode: true
+        in: query
+        name: role
+        required: true
+        schema:
+          $ref: '#/components/schemas/TypesAPIMetricsRole'
+        style: form
+      - explode: true
+        in: query
+        name: category
+        required: false
+        schema:
+          type: string
+        style: form
+      - explode: true
+        in: query
+        name: node
+        required: false
+        schema:
+          type: string
+        style: form
+      - description: Optionally set a start time for which to return datapoints after
+        explode: true
+        in: query
+        name: since
+        required: false
+        schema:
+          description: Optionally set a start time for which to return datapoints
+            after
+          format: date-time
+          nullable: true
+          type: string
+        style: form
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/TypesAPIMetricsGetOutput'
+          description: OK
+        "500":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RestErrResponse'
+          description: Internal Server Error
+      summary: Retrieve Metrics
+      tags:
+      - roles/tsdb
 components:
   schemas:
     ApiAPIExportInput:
@@ -2936,13 +2932,17 @@ components:
     TypesAPIMetricsGetOutput:
       example:
         records:
-        - handler: handler
-          node: node
-          time: time
+        - node: node
+          keys:
+          - keys
+          - keys
+          time: 2000-01-23T04:56:07.000+00:00
           value: 0
-        - handler: handler
-          node: node
-          time: time
+        - node: node
+          keys:
+          - keys
+          - keys
+          time: 2000-01-23T04:56:07.000+00:00
           value: 0
       properties:
         records:
@@ -2955,25 +2955,36 @@ components:
       type: object
     TypesAPIMetricsRecord:
       example:
-        handler: handler
         node: node
-        time: time
+        keys:
+        - keys
+        - keys
+        time: 2000-01-23T04:56:07.000+00:00
         value: 0
       properties:
-        handler:
-          type: string
+        keys:
+          items:
+            type: string
+          nullable: true
+          type: array
         node:
           type: string
         time:
+          format: date-time
           type: string
         value:
           type: integer
       required:
-      - handler
+      - keys
       - node
       - time
       - value
       type: object
+    TypesAPIMetricsRole:
+      enum:
+      - system
+      - dns
+      type: string
     TypesDHCPOption:
       example:
         value64:

diff --git a/api/api_cluster_instances.go b/api/api_cluster_instances.go