From 673a5217116180c9dbfe32e2a2ad0260917e0160 Mon Sep 17 00:00:00 2001 From: Shireesh Anjal <355479+anjalshireesh@users.noreply.github.com> Date: Fri, 24 May 2024 16:40:24 +0530 Subject: [PATCH] Change endpoint of v3 notification metrics (#19804) from /cluster/notification to /notification --- cmd/metrics-v3.go | 4 ++-- docs/metrics/v3.md | 28 ++++++++++++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/cmd/metrics-v3.go b/cmd/metrics-v3.go index 9dc36e4fc..ac254452a 100644 --- a/cmd/metrics-v3.go +++ b/cmd/metrics-v3.go @@ -51,12 +51,12 @@ const ( clusterUsageObjectsCollectorPath collectorPath = "/cluster/usage/objects" clusterUsageBucketsCollectorPath collectorPath = "/cluster/usage/buckets" clusterErasureSetCollectorPath collectorPath = "/cluster/erasure-set" - clusterNotificationCollectorPath collectorPath = "/cluster/notification" clusterIAMCollectorPath collectorPath = "/cluster/iam" auditCollectorPath collectorPath = "/audit" loggerWebhookCollectorPath collectorPath = "/logger/webhook" replicationCollectorPath collectorPath = "/replication" + notificationCollectorPath collectorPath = "/notification" ) const ( @@ -298,7 +298,7 @@ func newMetricGroups(r *prometheus.Registry) *metricsV3Collection { loadClusterErasureSetMetrics, ) - clusterNotificationMG := NewMetricsGroup(clusterNotificationCollectorPath, + clusterNotificationMG := NewMetricsGroup(notificationCollectorPath, []MetricDescriptor{ notificationCurrentSendInProgressMD, notificationEventsErrorsTotalMD, diff --git a/docs/metrics/v3.md b/docs/metrics/v3.md index ffbeea9d8..3efbf8ab8 100644 --- a/docs/metrics/v3.md +++ b/docs/metrics/v3.md @@ -36,7 +36,7 @@ These are metrics about requests served by the (current) node. ### Audit metrics -These are metrics about the minio process and the node. +These are metrics about the minio audit functionality | Path | Description | |----------|----------------------------------------| @@ -50,6 +50,14 @@ These are metrics about the minio logger webhooks |-------------------|------------------------------------| | `/logger/webhook` | Metrics related to logger webhooks | +### Notification metrics + +These are metrics about the minio notification functionality + +| Path | Description | +|----------|------------------------------------------------------| +| `/notification` | Metrics related to notification functionality | + ### System metrics These are metrics about the minio process and the node. @@ -295,15 +303,6 @@ The standard metrics group for GoCollector is not shown below. | `minio_cluster_erasure_set_read_health` | `gauge` | Health of the erasure set in a pool for read operations (1=healthy, 0=unhealthy) | `pool_id,set_id` | | `minio_cluster_erasure_set_write_health` | `gauge` | Health of the erasure set in a pool for write operations (1=healthy, 0=unhealthy) | `pool_id,set_id` | -### `/cluster/notification` - -| Name | Type | Help | Labels | -|-------------------------------------------------------|-----------|------------------------------------------------------------------------------------------|--------| -| `minio_cluster_notification_current_send_in_progress` | `counter` | Number of concurrent async Send calls active to all targets | | -| `minio_cluster_notification_events_errors_total` | `counter` | Events that were failed to be sent to the targets | | -| `minio_cluster_notification_events_sent_total` | `counter` | Total number of events sent to the targets | | -| `minio_cluster_notification_events_skipped_total` | `counter` | Events that were skipped to be sent to the targets due to the in-memory queue being full | | - ### `/cluster/iam` | Name | Type | Help | Labels | @@ -343,3 +342,12 @@ The standard metrics group for GoCollector is not shown below. | `minio_replication_max_queued_bytes` | `gauge` | Maximum number of bytes queued for replication since server start | `server` | | `minio_replication_max_queued_count` | `gauge` | Maximum number of objects queued for replication since server start | `server` | | `minio_replication_max_data_transfer_rate` | `gauge` | Maximum replication data transfer rate in bytes/sec seen since server start | `server` | + +### `/notification` + +| Name | Type | Help | Labels | +|-----------------------------------------------|-----------|------------------------------------------------------------------------------------------|----------| +| `minio_notification_current_send_in_progress` | `counter` | Number of concurrent async Send calls active to all targets | `server` | +| `minio_notification_events_errors_total` | `counter` | Events that were failed to be sent to the targets | `server` | +| `minio_notification_events_sent_total` | `counter` | Total number of events sent to the targets | `server` | +| `minio_notification_events_skipped_total` | `counter` | Events that were skipped to be sent to the targets due to the in-memory queue being full | `server` |