mirror of
https://github.com/shankar0123/certctl.git
synced 2026-06-07 22:41:31 +00:00
efce2363f7
Production hardening II Phase 8 — surface the OCSP per-event counters
shipped in Phase 1+2 through the existing /api/v1/metrics/prometheus
endpoint. Operators now alert on certctl_ocsp_counter_total
{label="rate_limited"} (Phase 3 trip), {label="nonce_malformed"}
(Phase 1 reject), {label="signing_failed"} (issuer connector fails),
etc.
NEW interface CounterSnapshotter (handler/metrics.go) — minimum
surface the Prometheus exposer needs from any per-area counter table:
just Snapshot() map[string]uint64. service.OCSPCounters.Snapshot
(Phase 1) satisfies it; future per-area counters (CRL, cert-export,
EST per-profile, SCEP per-profile, Intune per-profile) plug in the
same way as separate SetXxxCounters setters.
Naming convention per frozen decision 0.10:
certctl_<area>_counter_total{label="<event>"} <value>
This commit ships only the OCSP block. The remaining areas (CRL,
cert-export, EST, SCEP, Intune) plug in via the same
SetXxxCounters pattern in follow-up commits — the wire-up cost per
area is one new field + one setter + one block of fmt.Fprintf lines.
The bundle's S-1 docs-count guard means we don't claim a specific
total in prose; operators run `curl /api/v1/metrics/prometheus | grep
certctl_` to enumerate.
Wired in cmd/server/main.go: a single shared *service.OCSPCounters
instance is created once and passed to BOTH the
ocspResponseCacheService (so the cache hot path ticks counters) AND
metricsHandler.SetOCSPCounters (so the Prometheus exposer reads
them). Existing dashboard metrics (certctl_certificate_total,
certctl_agent_total, etc.) remain unchanged at the same line offsets
— back-compat preserved.
Pre-commit verification: go build ./... clean; go test -short
-count=1 green for handler/ + service/. The existing
TestGetPrometheusMetrics_Success tests still pass (the new counter
block is additive at the END of the response body, after the
existing dashboard metrics + uptime line).
292 lines
13 KiB
Go
292 lines
13 KiB
Go
package handler
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/shankar0123/certctl/internal/api/middleware"
|
|
)
|
|
|
|
// MetricsService defines the service interface for metrics collection.
|
|
type MetricsService interface {
|
|
GetDashboardSummary(ctx context.Context) (interface{}, error)
|
|
}
|
|
|
|
// CounterSnapshotter is the minimum surface MetricsHandler consumes
|
|
// from a counter table for the Prometheus exposer. The OCSPCounters
|
|
// type in internal/service satisfies this; future per-area counter
|
|
// tabs (CRL, cert-export, EST, SCEP, Intune) plug in the same way.
|
|
//
|
|
// Production hardening II Phase 8.
|
|
type CounterSnapshotter interface {
|
|
Snapshot() map[string]uint64
|
|
}
|
|
|
|
// MetricsHandler handles HTTP requests for metrics.
|
|
// Supports both JSON format (GET /api/v1/metrics) and Prometheus exposition format
|
|
// (GET /api/v1/metrics/prometheus) for integration with Prometheus, Grafana, Datadog, etc.
|
|
type MetricsHandler struct {
|
|
svc MetricsService
|
|
serverStarted time.Time
|
|
// Production hardening II Phase 8 — per-area counter snapshotters.
|
|
// nil values omit the corresponding metric block; cmd/server/main.go
|
|
// wires the instances at startup. The naming convention is
|
|
// certctl_<area>_<label>_total per frozen decision 0.10.
|
|
ocspCounters CounterSnapshotter
|
|
}
|
|
|
|
// NewMetricsHandler creates a new MetricsHandler with a service dependency.
|
|
// serverStarted is used to calculate uptime_seconds.
|
|
func NewMetricsHandler(svc MetricsService, serverStarted time.Time) MetricsHandler {
|
|
return MetricsHandler{
|
|
svc: svc,
|
|
serverStarted: serverStarted,
|
|
}
|
|
}
|
|
|
|
// SetOCSPCounters wires the OCSP counter table for the per-area
|
|
// metric block in the Prometheus exposition. nil disables the block.
|
|
// Production hardening II Phase 8.
|
|
func (h *MetricsHandler) SetOCSPCounters(c CounterSnapshotter) {
|
|
h.ocspCounters = c
|
|
}
|
|
|
|
// MetricsResponse represents the JSON metrics response for V2.
|
|
type MetricsResponse struct {
|
|
Gauge MetricsGauge `json:"gauge"`
|
|
Counter MetricsCounter `json:"counter"`
|
|
Uptime UptimeMetric `json:"uptime"`
|
|
}
|
|
|
|
// MetricsGauge represents gauge metrics (point-in-time values).
|
|
type MetricsGauge struct {
|
|
CertificateTotal int64 `json:"certificate_total"`
|
|
CertificateActive int64 `json:"certificate_active"`
|
|
CertificateExpiringSoon int64 `json:"certificate_expiring_soon"` // Within 30d
|
|
CertificateExpired int64 `json:"certificate_expired"`
|
|
CertificateRevoked int64 `json:"certificate_revoked"`
|
|
AgentTotal int64 `json:"agent_total"`
|
|
AgentOnline int64 `json:"agent_online"`
|
|
JobPending int64 `json:"job_pending"`
|
|
}
|
|
|
|
// MetricsCounter represents counter metrics (cumulative values).
|
|
type MetricsCounter struct {
|
|
JobCompletedTotal int64 `json:"job_completed_total"`
|
|
JobFailedTotal int64 `json:"job_failed_total"`
|
|
// NotificationsDeadTotal is a point-in-time count of notifications in the
|
|
// dead-letter queue (status="dead"), exposed here with the _total suffix
|
|
// to match Prometheus DB-snapshot counter convention (same semantics as
|
|
// JobFailedTotal and JobCompletedTotal — see metrics.md). I-005 DLQ
|
|
// observability gate.
|
|
NotificationsDeadTotal int64 `json:"notifications_dead_total"`
|
|
}
|
|
|
|
// UptimeMetric represents server uptime information.
|
|
type UptimeMetric struct {
|
|
UptimeSeconds int64 `json:"uptime_seconds"`
|
|
ServerStarted time.Time `json:"server_started"`
|
|
MeasuredAt time.Time `json:"measured_at"`
|
|
}
|
|
|
|
// GetMetrics returns JSON metrics (aggregated from dashboard summary).
|
|
// GET /api/v1/metrics
|
|
func (h MetricsHandler) GetMetrics(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
|
|
requestID := middleware.GetRequestID(r.Context())
|
|
|
|
summary, err := h.svc.GetDashboardSummary(r.Context())
|
|
if err != nil {
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "Failed to collect metrics", requestID)
|
|
return
|
|
}
|
|
|
|
// Extract fields from summary via JSON round-trip (avoids cross-package type assertion)
|
|
jsonBytes, err := json.Marshal(summary)
|
|
if err != nil {
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "Failed to marshal metrics data", requestID)
|
|
return
|
|
}
|
|
var dashboardSummary DashboardSummary
|
|
if err := json.Unmarshal(jsonBytes, &dashboardSummary); err != nil {
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "Invalid metrics data", requestID)
|
|
return
|
|
}
|
|
|
|
// Build metrics response
|
|
metricsResp := MetricsResponse{
|
|
Gauge: MetricsGauge{
|
|
CertificateTotal: dashboardSummary.TotalCertificates,
|
|
CertificateActive: dashboardSummary.TotalCertificates - dashboardSummary.ExpiringCertificates - dashboardSummary.ExpiredCertificates - dashboardSummary.RevokedCertificates,
|
|
CertificateExpiringSoon: dashboardSummary.ExpiringCertificates,
|
|
CertificateExpired: dashboardSummary.ExpiredCertificates,
|
|
CertificateRevoked: dashboardSummary.RevokedCertificates,
|
|
AgentTotal: dashboardSummary.TotalAgents,
|
|
AgentOnline: dashboardSummary.ActiveAgents,
|
|
JobPending: dashboardSummary.PendingJobs,
|
|
},
|
|
Counter: MetricsCounter{
|
|
JobCompletedTotal: dashboardSummary.CompleteJobs,
|
|
JobFailedTotal: dashboardSummary.FailedJobs,
|
|
NotificationsDeadTotal: dashboardSummary.NotificationsDead,
|
|
},
|
|
Uptime: UptimeMetric{
|
|
UptimeSeconds: int64(time.Since(h.serverStarted).Seconds()),
|
|
ServerStarted: h.serverStarted,
|
|
MeasuredAt: time.Now(),
|
|
},
|
|
}
|
|
|
|
JSON(w, http.StatusOK, metricsResp)
|
|
}
|
|
|
|
// GetPrometheusMetrics returns metrics in Prometheus exposition format (text/plain).
|
|
// GET /api/v1/metrics/prometheus
|
|
// Compatible with Prometheus, Grafana Agent, Datadog Agent, Victoria Metrics, and any
|
|
// OpenMetrics-compatible scraper. Metric names follow Prometheus naming conventions
|
|
// (lowercase, snake_case, prefixed with certctl_).
|
|
func (h MetricsHandler) GetPrometheusMetrics(w http.ResponseWriter, r *http.Request) {
|
|
if r.Method != http.MethodGet {
|
|
Error(w, http.StatusMethodNotAllowed, "Method not allowed")
|
|
return
|
|
}
|
|
|
|
requestID := middleware.GetRequestID(r.Context())
|
|
|
|
summary, err := h.svc.GetDashboardSummary(r.Context())
|
|
if err != nil {
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "Failed to collect metrics", requestID)
|
|
return
|
|
}
|
|
|
|
// Extract fields from summary via JSON round-trip (avoids cross-package type assertion)
|
|
jsonBytes, err := json.Marshal(summary)
|
|
if err != nil {
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "Failed to marshal metrics data", requestID)
|
|
return
|
|
}
|
|
var dashboardSummary DashboardSummary
|
|
if err := json.Unmarshal(jsonBytes, &dashboardSummary); err != nil {
|
|
ErrorWithRequestID(w, http.StatusInternalServerError, "Invalid metrics data", requestID)
|
|
return
|
|
}
|
|
|
|
// Compute derived values
|
|
active := dashboardSummary.TotalCertificates - dashboardSummary.ExpiringCertificates - dashboardSummary.ExpiredCertificates - dashboardSummary.RevokedCertificates
|
|
uptimeSeconds := int64(time.Since(h.serverStarted).Seconds())
|
|
|
|
// Build Prometheus exposition format
|
|
// See: https://prometheus.io/docs/instrumenting/exposition_formats/
|
|
w.Header().Set("Content-Type", "text/plain; version=0.0.4; charset=utf-8")
|
|
w.WriteHeader(http.StatusOK)
|
|
|
|
// Gauges — point-in-time values
|
|
fmt.Fprintf(w, "# HELP certctl_certificate_total Total number of managed certificates.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_certificate_total gauge\n")
|
|
fmt.Fprintf(w, "certctl_certificate_total %d\n\n", dashboardSummary.TotalCertificates)
|
|
|
|
fmt.Fprintf(w, "# HELP certctl_certificate_active Number of active (non-expiring, non-expired, non-revoked) certificates.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_certificate_active gauge\n")
|
|
fmt.Fprintf(w, "certctl_certificate_active %d\n\n", active)
|
|
|
|
fmt.Fprintf(w, "# HELP certctl_certificate_expiring_soon Number of certificates expiring within 30 days.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_certificate_expiring_soon gauge\n")
|
|
fmt.Fprintf(w, "certctl_certificate_expiring_soon %d\n\n", dashboardSummary.ExpiringCertificates)
|
|
|
|
fmt.Fprintf(w, "# HELP certctl_certificate_expired Number of expired certificates.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_certificate_expired gauge\n")
|
|
fmt.Fprintf(w, "certctl_certificate_expired %d\n\n", dashboardSummary.ExpiredCertificates)
|
|
|
|
fmt.Fprintf(w, "# HELP certctl_certificate_revoked Number of revoked certificates.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_certificate_revoked gauge\n")
|
|
fmt.Fprintf(w, "certctl_certificate_revoked %d\n\n", dashboardSummary.RevokedCertificates)
|
|
|
|
fmt.Fprintf(w, "# HELP certctl_agent_total Total number of registered agents.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_agent_total gauge\n")
|
|
fmt.Fprintf(w, "certctl_agent_total %d\n\n", dashboardSummary.TotalAgents)
|
|
|
|
fmt.Fprintf(w, "# HELP certctl_agent_online Number of agents currently online.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_agent_online gauge\n")
|
|
fmt.Fprintf(w, "certctl_agent_online %d\n\n", dashboardSummary.ActiveAgents)
|
|
|
|
fmt.Fprintf(w, "# HELP certctl_job_pending Number of jobs currently pending.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_job_pending gauge\n")
|
|
fmt.Fprintf(w, "certctl_job_pending %d\n\n", dashboardSummary.PendingJobs)
|
|
|
|
// Counters — cumulative values
|
|
fmt.Fprintf(w, "# HELP certctl_job_completed_total Total number of completed jobs.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_job_completed_total counter\n")
|
|
fmt.Fprintf(w, "certctl_job_completed_total %d\n\n", dashboardSummary.CompleteJobs)
|
|
|
|
fmt.Fprintf(w, "# HELP certctl_job_failed_total Total number of failed jobs.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_job_failed_total counter\n")
|
|
fmt.Fprintf(w, "certctl_job_failed_total %d\n\n", dashboardSummary.FailedJobs)
|
|
|
|
// I-005: notification dead-letter queue depth. Emitted with the _total
|
|
// suffix to match the existing certctl_job_completed_total /
|
|
// certctl_job_failed_total convention for DB-snapshot counters — the
|
|
// value is a point-in-time COUNT(*) of notification_events rows where
|
|
// status='dead', not a monotonically increasing process-lifetime counter.
|
|
// Operators alert on this as "dead-letter depth" (thresholds in the
|
|
// I-005 spec: > 0 → warning, > 10 → critical).
|
|
fmt.Fprintf(w, "# HELP certctl_notification_dead_total Number of notifications in the dead-letter queue.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_notification_dead_total counter\n")
|
|
fmt.Fprintf(w, "certctl_notification_dead_total %d\n\n", dashboardSummary.NotificationsDead)
|
|
|
|
// Info — server uptime
|
|
fmt.Fprintf(w, "# HELP certctl_uptime_seconds Server uptime in seconds.\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_uptime_seconds gauge\n")
|
|
fmt.Fprintf(w, "certctl_uptime_seconds %d\n", uptimeSeconds)
|
|
|
|
// Production hardening II Phase 8 — per-area counters. Each block
|
|
// is nil-guarded so a deploy without the wire still produces clean
|
|
// output (just the legacy dashboard metrics above). Naming
|
|
// convention: certctl_<area>_<label>_total per frozen decision
|
|
// 0.10.
|
|
if h.ocspCounters != nil {
|
|
fmt.Fprintf(w, "\n# HELP certctl_ocsp_counter_total OCSP responder per-event counters (production hardening II Phase 8).\n")
|
|
fmt.Fprintf(w, "# TYPE certctl_ocsp_counter_total counter\n")
|
|
snap := h.ocspCounters.Snapshot()
|
|
// Emit in a deterministic order so the output diff is stable
|
|
// across requests (helps operators spot drift in dashboard
|
|
// snapshots).
|
|
labels := []string{
|
|
"request_get", "request_post", "request_success", "request_invalid",
|
|
"issuer_not_found", "cert_not_found", "signing_failed",
|
|
"nonce_echoed", "nonce_malformed", "rate_limited",
|
|
}
|
|
for _, lbl := range labels {
|
|
fmt.Fprintf(w, "certctl_ocsp_counter_total{label=%q} %d\n", lbl, snap[lbl])
|
|
}
|
|
}
|
|
}
|
|
|
|
// DashboardSummary mirrors the service.DashboardSummary for JSON unmarshaling.
|
|
// JSON tags must match the service-layer struct exactly.
|
|
type DashboardSummary struct {
|
|
TotalCertificates int64 `json:"total_certificates"`
|
|
ExpiringCertificates int64 `json:"expiring_certificates"`
|
|
ExpiredCertificates int64 `json:"expired_certificates"`
|
|
RevokedCertificates int64 `json:"revoked_certificates"`
|
|
ActiveAgents int64 `json:"active_agents"`
|
|
OfflineAgents int64 `json:"offline_agents"`
|
|
TotalAgents int64 `json:"total_agents"`
|
|
PendingJobs int64 `json:"pending_jobs"`
|
|
FailedJobs int64 `json:"failed_jobs"`
|
|
CompleteJobs int64 `json:"complete_jobs"`
|
|
// NotificationsDead mirrors service.DashboardSummary.NotificationsDead.
|
|
// JSON tag "notifications_dead" must match the service-layer struct
|
|
// exactly — this cross-package mirror avoids a direct import cycle and
|
|
// is driven by the I-005 Prometheus counter emission path. See
|
|
// GetPrometheusMetrics and MetricsCounter.NotificationsDeadTotal.
|
|
NotificationsDead int64 `json:"notifications_dead"`
|
|
CompletedAt time.Time `json:"completed_at"`
|
|
}
|