add status 530 and *_operations_count metrics

Author: drrev

pkg/domain/process.go

@@ -56,6 +56,7 @@ func process(serviceID, serviceName, datacenter, domain string, stats Stats, m *
 	m.OriginStatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "503").Add(float64(stats.OriginStatus503))
 	m.OriginStatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "504").Add(float64(stats.OriginStatus504))
 	m.OriginStatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "505").Add(float64(stats.OriginStatus505))
+	m.OriginStatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "530").Add(float64(stats.OriginStatus530))
 	m.OriginStatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "5xx").Add(float64(stats.OriginStatus5xx))
 	m.RequestsTotal.WithLabelValues(serviceID, serviceName, datacenter, domain).Add(float64(stats.Requests))
 	m.RespBodyBytesTotal.WithLabelValues(serviceID, serviceName, datacenter, domain).Add(float64(stats.RespBodyBytes))
@@ -82,5 +83,6 @@ func process(serviceID, serviceName, datacenter, domain string, stats Stats, m *
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "503").Add(float64(stats.Status503))
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "504").Add(float64(stats.Status504))
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "505").Add(float64(stats.Status505))
+	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "530").Add(float64(stats.Status530))
 	m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "5xx").Add(float64(stats.Status5xx))
 }

pkg/domain/response.go

@@ -57,6 +57,7 @@ type Stats struct {
 	OriginStatus503            uint64  `json:"origin_status_503"`              //	integer	Number of responses received from origin with status code 503 (Service Unavailable).
 	OriginStatus504            uint64  `json:"origin_status_504"`              //	integer	Number of responses received from origin with status code 504 (Gateway Timeout).
 	OriginStatus505            uint64  `json:"origin_status_505"`              //	integer	Number of responses received from origin with status code 505 (HTTP Version Not Supported).
+	OriginStatus530            uint64  `json:"origin_status_530"`              //	integer	Number of responses received from origin with status code 530.
 	OriginStatus5xx            uint64  `json:"origin_status_5xx"`              //	integer	Number of "Server Error" codes received from origin.
 	Requests                   uint64  `json:"requests"`                       //	integer	Number of requests processed.
 	RespBodyBytes              uint64  `json:"resp_body_bytes"`                //	integer	Total body bytes delivered.
@@ -83,5 +84,6 @@ type Stats struct {
 	Status503                  uint64  `json:"status_503"`                     //	integer	Number of responses received with status code 503 (Service Unavailable).
 	Status504                  uint64  `json:"status_504"`                     //	integer	Number of responses received with status code 504 (Gateway Timeout).
 	Status505                  uint64  `json:"status_505"`                     //	integer	Number of responses received with status code 505 (HTTP Version Not Supported).
+	Status530                  uint64  `json:"status_530"`                     //	integer Number of responses delivered with status code 530.
 	Status5xx                  uint64  `json:"status_5xx"`                     //	integer	Number of 5xx "Server Error" codes delivered.
 }

pkg/origin/process.go

@@ -59,6 +59,7 @@ func process(serviceID, serviceName, datacenter, origin string, stats Stats, m *
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcDelivery, "503").Add(float64(stats.Status503))
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcDelivery, "504").Add(float64(stats.Status504))
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcDelivery, "505").Add(float64(stats.Status505))
+	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcDelivery, "530").Add(float64(stats.Status530))
 	m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcDelivery, "5xx").Add(float64(stats.Status5xx))
 
 	m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute, "1xx").Add(float64(stats.ComputeStatus1xx))
@@ -82,6 +83,7 @@ func process(serviceID, serviceName, datacenter, origin string, stats Stats, m *
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute, "503").Add(float64(stats.ComputeStatus503))
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute, "504").Add(float64(stats.ComputeStatus504))
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute, "505").Add(float64(stats.ComputeStatus505))
+	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute, "530").Add(float64(stats.ComputeStatus530))
 	m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute, "5xx").Add(float64(stats.ComputeStatus5xx))
 
 	m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf, "1xx").Add(float64(stats.WafStatus1xx))
@@ -106,6 +108,7 @@ func process(serviceID, serviceName, datacenter, origin string, stats Stats, m *
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf, "503").Add(float64(stats.WafStatus503))
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf, "504").Add(float64(stats.WafStatus504))
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf, "505").Add(float64(stats.WafStatus505))
+	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf, "530").Add(float64(stats.WafStatus530))
 	m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf, "5xx").Add(float64(stats.WafStatus5xx))
 
 	// Latency stats are clearly from xxx_bucket{le="v"} metrics,

pkg/origin/response.go

@@ -47,6 +47,7 @@ type Stats struct {
 	Status503                  uint64 `json:"status_503"`                       // Number of responses received with status code 503 (Service Unavailable) from origin.
 	Status504                  uint64 `json:"status_504"`                       // Number of responses received with status code 504 (Gateway Timeout) from origin.
 	Status505                  uint64 `json:"status_505"`                       // Number of responses received with status code 505 (HTTP Version Not Supported) from origin.
+	Status530                  uint64 `json:"status_530"`                       // Number of responses received from origin with status code 530.
 	Status5xx                  uint64 `json:"status_5xx"`                       // Number of 5xx "Server Error" codes delivered from origin.
 	Latency0to1                uint64 `json:"latency_0_to_1ms"`                 // Number of responses from origin with latency between 0 and 1 millisecond.
 	Latency1to5                uint64 `json:"latency_1_to_5ms"`                 // Number of responses from origin with latency between 1 and 5 milliseconds.
@@ -86,6 +87,7 @@ type Stats struct {
 	WafStatus503               uint64 `json:"waf_status_503"`                   // Number of responses received with status code 503 (Service Unavailable) received for origin requests made by the Fastly WAF.
 	WafStatus504               uint64 `json:"waf_status_504"`                   // Number of responses received with status code 504 (Gateway Timeout) received for origin requests made by the Fastly WAF.
 	WafStatus505               uint64 `json:"waf_status_505"`                   // Number of responses received with status code 505 (HTTP Version Not Supported) received for origin requests made by the Fastly WAF.
+	WafStatus530               uint64 `json:"waf_status_530"`                   // Number of responses received with status code 530 received for origin requests made by the Fastly WAF.
 	WafLatency0to1             uint64 `json:"waf_latency_0_to_1ms"`             // Number of responses with latency between 0 and 1 millisecond received for origin requests made by the Fastly WAF.
 	WafLatency1to5             uint64 `json:"waf_latency_1_to_5ms"`             // Number of responses with latency between 1 and 5 milliseconds received for origin requests made by the Fastly WAF.
 	WafLatency5to10            uint64 `json:"waf_latency_5_to_10ms"`            // Number of responses with latency between 5 and 10 milliseconds received for origin requests made by the Fastly WAF.
@@ -124,6 +126,7 @@ type Stats struct {
 	ComputeStatus503           uint64 `json:"compute_status_503"`               // Number of responses received with status code 503 (Service Unavailable) for origin received by Compute@Edge.
 	ComputeStatus504           uint64 `json:"compute_status_504"`               // Number of responses received with status code 504 (Gateway Timeout) for origin received by Compute@Edge.
 	ComputeStatus505           uint64 `json:"compute_status_505"`               // Number of responses received with status code 505 (HTTP Version Not Supported) for origin received by Compute@Edge.
+	ComputeStatus530           uint64 `json:"compute_status_530"`               // Number of responses received with status code 530 for origin received by the Compute platform.
 	ComputeLatency0to1         uint64 `json:"compute_latency_0_to_1ms"`         // Number of responses with latency between 0 and 1 millisecond for origin received by Compute@Edge.
 	ComputeLatency1to5         uint64 `json:"compute_latency_1_to_5ms"`         // Number of responses with latency between 1 and 5 milliseconds for origin received by Compute@Edge.
 	ComputeLatency5to10        uint64 `json:"compute_latency_5_to_10ms"`        // Number of responses with latency between 5 and 10 milliseconds for origin received by Compute@Edge.

pkg/realtime/metrics.go

@@ -43,6 +43,7 @@ type Metrics struct {
 	ComputeBackendReqTotal                     *prometheus.CounterVec
 	ComputeBackendRespBodyBytesTotal           *prometheus.CounterVec
 	ComputeBackendRespHeaderBytesTotal         *prometheus.CounterVec
+	ComputeCacheOperationsCount                *prometheus.CounterVec
 	ComputeExecutionTimeTotal                  *prometheus.CounterVec
 	ComputeGlobalsLimitExceededTotal           *prometheus.CounterVec
 	ComputeGuestErrorsTotal                    *prometheus.CounterVec
@@ -137,6 +138,8 @@ type Metrics struct {
 	MissSubTimeTotal                           *prometheus.CounterVec
 	MissTimeTotal                              *prometheus.CounterVec
 	ObjectSizeBytes                            *prometheus.HistogramVec
+	ObjectStorageClassAOperationsCount         *prometheus.CounterVec
+	ObjectStorageClassBOperationsCount         *prometheus.CounterVec
 	OriginCacheFetchesTotal                    *prometheus.CounterVec
 	OriginCacheFetchRespBodyBytesTotal         *prometheus.CounterVec
 	OriginCacheFetchRespHeaderBytesTotal       *prometheus.CounterVec
@@ -258,6 +261,7 @@ func NewMetrics(namespace, subsystem string, nameFilter filter.Filter, r prometh
 		ComputeBackendReqTotal:                     prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "compute_bereq_total", Help: "Number of backend requests started."}, []string{"service_id", "service_name", "datacenter"}),
 		ComputeBackendRespBodyBytesTotal:           prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "compute_beresp_body_bytes_total", Help: "Total body bytes received from backends (origins) by Compute@Edge."}, []string{"service_id", "service_name", "datacenter"}),
 		ComputeBackendRespHeaderBytesTotal:         prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "compute_beresp_header_bytes_total", Help: "Total header bytes received from backends (origins) by Compute@Edge."}, []string{"service_id", "service_name", "datacenter"}),
+		ComputeCacheOperationsCount:                prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "compute_cache_operations_count", Help: "Number of cache operations executed by the Compute platform."}, []string{"service_id", "service_name", "datacenter"}),
 		ComputeExecutionTimeTotal:                  prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "compute_execution_time_total", Help: "The amount of active CPU time used to process your requests (in seconds)."}, []string{"service_id", "service_name", "datacenter"}),
 		ComputeGlobalsLimitExceededTotal:           prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "compute_globals_limit_exceeded_total", Help: "Number of times a guest exceeded its globals limit."}, []string{"service_id", "service_name", "datacenter"}),
 		ComputeGuestErrorsTotal:                    prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "compute_guest_errors_total", Help: "Number of times a service experienced a guest code error."}, []string{"service_id", "service_name", "datacenter"}),
@@ -352,6 +356,8 @@ func NewMetrics(namespace, subsystem string, nameFilter filter.Filter, r prometh
 		MissSubTimeTotal:                           prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "miss_sub_time_total", Help: "Time spent inside the 'miss' Varnish subroutine (in seconds)."}, []string{"service_id", "service_name", "datacenter"}),
 		MissTimeTotal:                              prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "miss_time_total", Help: "Total amount of time spent processing cache misses (in seconds)."}, []string{"service_id", "service_name", "datacenter"}),
 		ObjectSizeBytes:                            prometheus.NewHistogramVec(prometheus.HistogramOpts{Namespace: namespace, Subsystem: subsystem, Name: "object_size_bytes", Help: "Histogram of count of objects served, bucketed by object size range.", Buckets: []float64{1024, 10240, 102400, 1.024e+06, 1.024e+07, 1.024e+08, 1.024e+09}}, []string{"service_id", "service_name", "datacenter"}),
+		ObjectStorageClassAOperationsCount:         prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "object_storage_class_a_operations_count", Help: "A count of the number of Class A Object Storage operations."}, []string{"service_id", "service_name", "datacenter"}),
+		ObjectStorageClassBOperationsCount:         prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "object_storage_class_b_operations_count", Help: "A count of the number of Class B Object Storage operations."}, []string{"service_id", "service_name", "datacenter"}),
 		OriginCacheFetchesTotal:                    prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "origin_cache_fetches_total", Help: "The total number of completed requests made to backends (origins) that returned cacheable content."}, []string{"service_id", "service_name", "datacenter"}),
 		OriginCacheFetchRespBodyBytesTotal:         prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "origin_cache_fetch_resp_body_bytes_total", Help: "Body bytes received from origin for cacheable content."}, []string{"service_id", "service_name", "datacenter"}),
 		OriginCacheFetchRespHeaderBytesTotal:       prometheus.NewCounterVec(prometheus.CounterOpts{Namespace: namespace, Subsystem: subsystem, Name: "origin_cache_fetch_resp_header_bytes_total", Help: "Header bytes received from an origin for cacheable content."}, []string{"service_id", "service_name", "datacenter"}),

pkg/realtime/process.go

@@ -56,6 +56,7 @@ func process(serviceID, serviceName, datacenter string, stats Datacenter, m *Met
 	m.ComputeBackendReqTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.ComputeBackendReqTotal))
 	m.ComputeBackendRespBodyBytesTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.ComputeBackendRespBodyBytesTotal))
 	m.ComputeBackendRespHeaderBytesTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.ComputeBackendRespHeaderBytesTotal))
+	m.ComputeCacheOperationsCount.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.ComputeCacheOperationsCount))
 	m.ComputeExecutionTimeTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.ComputeExecutionTimeMilliseconds) / 10000.0)
 	m.ComputeGlobalsLimitExceededTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.ComputeGlobalsLimitExceededTotal))
 	m.ComputeGuestErrorsTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.ComputeGuestErrorsTotal))
@@ -154,6 +155,8 @@ func process(serviceID, serviceName, datacenter string, stats Datacenter, m *Met
 	m.MissSubCountTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.MissSubCount))
 	m.MissSubTimeTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.MissSubTime))
 	m.MissTimeTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.MissTime))
+	m.ObjectStorageClassAOperationsCount.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.ObjectStorageClassAOperationsCount))
+	m.ObjectStorageClassBOperationsCount.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.ObjectStorageClassBOperationsCount))
 	m.OriginCacheFetchesTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.OriginCacheFetches))
 	m.OriginCacheFetchRespBodyBytesTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.OriginCacheFetchRespBodyBytes))
 	m.OriginCacheFetchRespHeaderBytesTotal.WithLabelValues(serviceID, serviceName, datacenter).Add(float64(stats.OriginCacheFetchRespHeaderBytes))
@@ -237,6 +240,7 @@ func process(serviceID, serviceName, datacenter string, stats Datacenter, m *Met
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, "503").Add(float64(stats.Status503))
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, "504").Add(float64(stats.Status504))
 	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, "505").Add(float64(stats.Status505))
+	m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, "530").Add(float64(stats.Status530))
 	m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, "1xx").Add(float64(stats.Status1xx))
 	m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, "2xx").Add(float64(stats.Status2xx))
 	m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, "3xx").Add(float64(stats.Status3xx))