Change endpoint to /logger/webhook

minio · May 7, 2024 · 7f4bc60 · 7f4bc60
1 parent 3268d66
commit 7f4bc60
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 25 deletions.
diff --git a/cmd/metrics-v2.go b/cmd/metrics-v2.go
@@ -294,6 +294,8 @@ const (
 	kmsRequestsError   = "request_error"
 	kmsRequestsFail    = "request_failure"
 	kmsUptime          = "uptime"
+
+	webhookOnline = "online"
 )
 
 const (

diff --git a/cmd/metrics-v3-cluster-webhook.go b/cmd/metrics-v3-cluster-webhook.go
@@ -24,7 +24,6 @@ import (
 )
 
 const (
-	webhookOnline         = "online"
 	webhookQueueLength    = "queue_length"
 	webhookTotalMessages  = "total_messages"
 	webhookFailedMessages = "failed_messages"
@@ -33,10 +32,7 @@ const (
 )
 
 var (
-	allWebhookLabels = []string{nameL, endpointL}
-	webhookOnlineMD  = NewGaugeMD(webhookOnline,
-		"Is the webhook online?",
-		allWebhookLabels...)
+	allWebhookLabels        = []string{nameL, endpointL}
 	webhookFailedMessagesMD = NewCounterMD(webhookFailedMessages,
 		"Number of messages that failed to send",
 		allWebhookLabels...)
@@ -48,17 +44,12 @@ var (
 		allWebhookLabels...)
 )
 
-// loadClusterWebhookMetrics - `MetricsLoaderFn` for cluster webhook
+// loadLoggerWebhookMetrics - `MetricsLoaderFn` for logger webhook
 // such as failed messages and total messages.
-func loadClusterWebhookMetrics(ctx context.Context, m MetricValues, c *metricsCache) error {
+func loadLoggerWebhookMetrics(ctx context.Context, m MetricValues, c *metricsCache) error {
 	tgts := append(logger.SystemTargets(), logger.AuditTargets()...)
 	for _, t := range tgts {
-		isOnline := 0
-		if t.IsOnline(ctx) {
-			isOnline = 1
-		}
 		labels := []string{nameL, t.String(), endpointL, t.Endpoint()}
-		m.Set(webhookOnline, float64(isOnline), labels...)
 		m.Set(webhookFailedMessages, float64(t.Stats().FailedMessages), labels...)
 		m.Set(webhookQueueLength, float64(t.Stats().QueueLength), labels...)
 		m.Set(webhookTotalMessages, float64(t.Stats().TotalMessages), labels...)

diff --git a/cmd/metrics-v3.go b/cmd/metrics-v3.go
@@ -51,7 +51,8 @@ const (
 	clusterAuditCollectorPath        collectorPath = "/cluster/audit"
 	clusterNotificationCollectorPath collectorPath = "/cluster/notification"
 	clusterIAMCollectorPath          collectorPath = "/cluster/iam"
-	clusterWebhookCollectorPath      collectorPath = "/cluster/webhook"
+
+	loggerWebhookCollectorPath collectorPath = "/logger/webhook"
 )
 
 const (
@@ -300,14 +301,13 @@ func newMetricGroups(r *prometheus.Registry) *metricsV3Collection {
 		loadClusterIAMMetrics,
 	)
 
-	clusterWebhookMG := NewMetricsGroup(clusterWebhookCollectorPath,
+	clusterWebhookMG := NewMetricsGroup(loggerWebhookCollectorPath,
 		[]MetricDescriptor{
 			webhookFailedMessagesMD,
-			webhookOnlineMD,
 			webhookQueueLengthMD,
 			webhookTotalMessagesMD,
 		},
-		loadClusterWebhookMetrics,
+		loadLoggerWebhookMetrics,
 	)
 
 	allMetricGroups := []*MetricsGroup{

diff --git a/docs/metrics/v3.md b/docs/metrics/v3.md
@@ -207,15 +207,6 @@ The standard metrics group for GoCollector is not shown below.
 | `minio_cluster_audit_target_queue_length` | `gauge`   | Number of unsent messages in queue for target            | `target_id` |
 | `minio_cluster_audit_total_messages`      | `counter` | Total number of messages sent since start                | `target_id` |
 
-### `/cluster/webhook`
-
-| Name                                    | Type      | Help                                         | Labels          |
-|-----------------------------------------|-----------|----------------------------------------------|-----------------|
-| `minio_cluster_webhook_failed_messages` | `counter` | Number of messages that failed to send       | `name,endpoint` |
-| `minio_cluster_webhook_online`          | `gauge`   | Is the webhook online?                       | `name,endpoint` |
-| `minio_cluster_webhook_queue_length`    | `gauge`   | Webhook queue length                         | `name,endpoint` |
-| `minio_cluster_webhook_total_message`   | `counter` | Total number of messages sent to this target | `name,endpoint` |
-
 ### `/cluster/usage/objects`
 
 | Name                                                     | Type    | Help                                                           | Labels  |
@@ -277,3 +268,11 @@ The standard metrics group for GoCollector is not shown below.
 | `minio_cluster_iam_since_last_sync_millis`                      | `counter` | Time (in milliseconds) since last successful IAM data sync                                                               |        |
 | `minio_cluster_iam_sync_failures`                               | `counter` | Number of failed IAM data syncs since server start                                                                       |        |
 | `minio_cluster_iam_sync_successes`                              | `counter` | Number of successful IAM data syncs since server start                                                                   |        |
+
+### `/logger/webhook`
+
+| Name                                    | Type      | Help                                         | Labels                 |
+|-----------------------------------------|-----------|----------------------------------------------|------------------------|
+| `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` |