Add support for resource metrics (#4689)

minio · Oct 4, 2023 · eca8310 · eca8310
1 parent 4be483d
commit eca8310
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/cmd/admin-prometheus-generate.go b/cmd/admin-prometheus-generate.go
@@ -31,12 +31,14 @@ import (
 )
 
 const (
-	defaultJobName     = "minio-job"
-	nodeJobName        = "minio-job-node"
-	bucketJobName      = "minio-job-bucket"
-	defaultMetricsPath = "/minio/v2/metrics/cluster"
-	nodeMetricsPath    = "/minio/v2/metrics/node"
-	bucketMetricsPath  = "/minio/v2/metrics/bucket"
+	defaultJobName      = "minio-job"
+	nodeJobName         = "minio-job-node"
+	bucketJobName       = "minio-job-bucket"
+	defaultMetricsPath  = "/minio/v2/metrics/cluster"
+	nodeMetricsPath     = "/minio/v2/metrics/node"
+	bucketMetricsPath   = "/minio/v2/metrics/bucket"
+	resourceJobName     = "minio-job-resource"
+	resourceMetricsPath = "/minio/v2/metrics/resource"
 )
 
 var prometheusFlags = []cli.Flag{
@@ -75,6 +77,9 @@ EXAMPLES:
 
   3. Generate prometheus config for bucket metrics.
      {{.Prompt}} {{.HelpName}} play bucket
+
+  4. Generate prometheus config for resource metrics.
+     {{.Prompt}} {{.HelpName}} play resource
 `,
 }
 
@@ -189,6 +194,20 @@ func generatePrometheusConfig(ctx *cli.Context) error {
 				},
 			},
 		}
+	case "resource":
+		config = PrometheusConfig{
+			ScrapeConfigs: []ScrapeConfig{
+				{
+					JobName:     resourceJobName,
+					MetricsPath: resourceMetricsPath,
+					StaticConfigs: []StatConfig{
+						{
+							Targets: []string{""},
+						},
+					},
+				},
+			},
+		}
 	case "", "cluster":
 		config = PrometheusConfig{
 			ScrapeConfigs: []ScrapeConfig{

diff --git a/cmd/admin-prometheus-metrics.go b/cmd/admin-prometheus-metrics.go
@@ -42,7 +42,7 @@ USAGE:
   {{.HelpName}} TARGET [METRIC-TYPE]
 
 METRIC-TYPE:
-  valid values are ['cluster', 'node', 'bucket']. Defaults to 'cluster' if not specified.
+  valid values are ['cluster', 'node', 'bucket', 'resource']. Defaults to 'cluster' if not specified.
 
 FLAGS:
   {{range .VisibleFlags}}{{.}}
@@ -56,6 +56,9 @@ EXAMPLES:
 
   3. List of metrics reported at bucket level.
      {{.Prompt}} {{.HelpName}} play bucket
+
+  4. List of resource metrics.
+     {{.Prompt}} {{.HelpName}} play resource
 `,
 }
 
@@ -91,7 +94,7 @@ func printPrometheusMetrics(ctx *cli.Context) error {
 	}
 	metricsSubSystem := args.Get(1)
 	switch metricsSubSystem {
-	case "node", "bucket", "cluster":
+	case "node", "bucket", "cluster", "resource":
 	case "":
 		metricsSubSystem = "cluster"
 	default: