Change endpoint from /cluster/scanner to /scanner

minio · May 14, 2024 · 162ae33 · 162ae33
1 parent f2def60
commit 162ae33
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/cmd/metrics-v3-cluster-scanner.go → cmd/metrics-v3-scanner.go b/cmd/metrics-v3-cluster-scanner.go → cmd/metrics-v3-scanner.go
diff --git a/cmd/metrics-v3.go b/cmd/metrics-v3.go
@@ -51,10 +51,10 @@ const (
  clusterErasureSetCollectorPath collectorPath = "/cluster/erasure-set"
  clusterNotificationCollectorPath collectorPath = "/cluster/notification"
  clusterIAMCollectorPath collectorPath = "/cluster/iam"
- clusterScannerCollectorPath collectorPath = "/cluster/scanner"
 
  auditCollectorPath collectorPath = "/audit"
  loggerWebhookCollectorPath collectorPath = "/logger/webhook"
+ scannerCollectorPath collectorPath = "/scanner"
 )
 
 const (
@@ -297,7 +297,7 @@ func newMetricGroups(r *prometheus.Registry) *metricsV3Collection {
  loadClusterIAMMetrics,
  )
 
- clusterScannerMG := NewMetricsGroup(clusterScannerCollectorPath,
+ scannerMG := NewMetricsGroup(scannerCollectorPath,
  []MetricDescriptor{
  scannerBucketScansFinishedMD,
  scannerBucketScansStartedMD,
@@ -343,7 +343,7 @@ func newMetricGroups(r *prometheus.Registry) *metricsV3Collection {
  clusterErasureSetMG,
  clusterNotificationMG,
  clusterIAMMG,
- clusterScannerMG,
+ scannerMG,
 
  auditMG,
  loggerWebhookMG,

diff --git a/docs/metrics/v3.md b/docs/metrics/v3.md
@@ -50,6 +50,14 @@ These are metrics about the minio logger webhooks
 |-------------------|------------------------------------|
 | `/logger/webhook` | Metrics related to logger webhooks |
 
+### Scanner metrics
+
+These are metrics about the minio scanner
+
+| Path | Description |
+|------------|--------------------------------------|
+| `/scanner` | Metrics related to the MinIO scanner |
+
 ### System metrics
 
 These are metrics about the minio process and the node.
@@ -229,17 +237,6 @@ The standard metrics group for GoCollector is not shown below.
 | `minio_cluster_health_capacity_usable_total_bytes` | `gauge` | Total cluster usable storage capacity in bytes | |
 | `minio_cluster_health_capacity_usable_free_bytes` | `gauge` | Total cluster usable storage free in bytes | |
 
-### `/cluster/scanner`
-
-| Name | Type | Help | Labels |
-|----------------------------------------------------|-----------|------------------------------------------------------------|--------|
-| `minio_cluster_scanner_bucket_scans_finished` | `counter` | Total number of bucket scans finished since server start | |
-| `minio_cluster_scanner_bucket_scans_started` | `counter` | Total number of bucket scans started since server start | |
-| `minio_cluster_scanner_directories_scanned` | `counter` | Total number of directories scanned since server start | |
-| `minio_cluster_scanner_last_activity_seconds` | `gauge` | Time elapsed (in seconds) since last scan activity | |
-| `minio_cluster_scanner_objects_scanned` | `counter` | Total number of unique objects scanned since server start | |
-| `minio_cluster_scanner_versions_scanned` | `counter` | Total number of object versions scanned since server start | |
-
 ### `/cluster/usage/objects`
 
 | Name | Type | Help | Labels |
@@ -313,3 +310,14 @@ The standard metrics group for GoCollector is not shown below.
 | `minio_logger_webhook_failed_messages` | `counter` | Number of messages that failed to send | `server,name,endpoint` |
 | `minio_logger_webhook_queue_length` | `gauge` | Webhook queue length | `server,name,endpoint` |
 | `minio_logger_webhook_total_message` | `counter` | Total number of messages sent to this target | `server,name,endpoint` |
+
+### `/scanner`
+
+| Name | Type | Help | Labels |
+|--------------------------------------------|-----------|------------------------------------------------------------|--------|
+| `minio_scanner_bucket_scans_finished` | `counter` | Total number of bucket scans finished since server start | |
+| `minio_scanner_bucket_scans_started` | `counter` | Total number of bucket scans started since server start | |
+| `minio_scanner_directories_scanned` | `counter` | Total number of directories scanned since server start | |
+| `minio_scanner_last_activity_seconds` | `gauge` | Time elapsed (in seconds) since last scan activity | |
+| `minio_scanner_objects_scanned` | `counter` | Total number of unique objects scanned since server start | |
+| `minio_scanner_versions_scanned` | `counter` | Total number of object versions scanned since server start | |