Skip to content

Commit 04d5a59

Browse files
drrevdrrev
authored
Merge pull request #189 from fastly/rreeves/add-new-fields
[STATS-2239]: Update Fastly-exporter with new fields (and remove vcl_on_compute)
2 parents 151a904 + 06bfe28 commit 04d5a59

File tree

8 files changed

+3685
-3562
lines changed

8 files changed

+3685
-3562
lines changed

‎pkg/domain/process.go

+2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ func process(serviceID, serviceName, datacenter, domain string, stats Stats, m *
5656
m.OriginStatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "503").Add(float64(stats.OriginStatus503))
5757
m.OriginStatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "504").Add(float64(stats.OriginStatus504))
5858
m.OriginStatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "505").Add(float64(stats.OriginStatus505))
59+
m.OriginStatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "530").Add(float64(stats.OriginStatus530))
5960
m.OriginStatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "5xx").Add(float64(stats.OriginStatus5xx))
6061
m.RequestsTotal.WithLabelValues(serviceID, serviceName, datacenter, domain).Add(float64(stats.Requests))
6162
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 *
8283
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "503").Add(float64(stats.Status503))
8384
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "504").Add(float64(stats.Status504))
8485
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "505").Add(float64(stats.Status505))
86+
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "530").Add(float64(stats.Status530))
8587
m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, domain, "5xx").Add(float64(stats.Status5xx))
8688
}

‎pkg/domain/response.go

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

‎pkg/origin/process.go

+3
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ func process(serviceID, serviceName, datacenter, origin string, stats Stats, m *
5959
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcDelivery, "503").Add(float64(stats.Status503))
6060
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcDelivery, "504").Add(float64(stats.Status504))
6161
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcDelivery, "505").Add(float64(stats.Status505))
62+
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcDelivery, "530").Add(float64(stats.Status530))
6263
m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcDelivery, "5xx").Add(float64(stats.Status5xx))
6364

6465
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 *
8283
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute, "503").Add(float64(stats.ComputeStatus503))
8384
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute, "504").Add(float64(stats.ComputeStatus504))
8485
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute, "505").Add(float64(stats.ComputeStatus505))
86+
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute, "530").Add(float64(stats.ComputeStatus530))
8587
m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcCompute, "5xx").Add(float64(stats.ComputeStatus5xx))
8688

8789
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 *
106108
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf, "503").Add(float64(stats.WafStatus503))
107109
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf, "504").Add(float64(stats.WafStatus504))
108110
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf, "505").Add(float64(stats.WafStatus505))
111+
m.StatusCodeTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf, "530").Add(float64(stats.WafStatus530))
109112
m.StatusGroupTotal.WithLabelValues(serviceID, serviceName, datacenter, origin, srcWaf, "5xx").Add(float64(stats.WafStatus5xx))
110113

111114
// Latency stats are clearly from xxx_bucket{le="v"} metrics,

‎pkg/origin/response.go

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ type Stats struct {
4747
Status503 uint64 `json:"status_503"` // Number of responses received with status code 503 (Service Unavailable) from origin.
4848
Status504 uint64 `json:"status_504"` // Number of responses received with status code 504 (Gateway Timeout) from origin.
4949
Status505 uint64 `json:"status_505"` // Number of responses received with status code 505 (HTTP Version Not Supported) from origin.
50+
Status530 uint64 `json:"status_530"` // Number of responses received from origin with status code 530.
5051
Status5xx uint64 `json:"status_5xx"` // Number of 5xx "Server Error" codes delivered from origin.
5152
Latency0to1 uint64 `json:"latency_0_to_1ms"` // Number of responses from origin with latency between 0 and 1 millisecond.
5253
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 {
8687
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.
8788
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.
8889
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.
90+
WafStatus530 uint64 `json:"waf_status_530"` // Number of responses received with status code 530 received for origin requests made by the Fastly WAF.
8991
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.
9092
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.
9193
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 {
124126
ComputeStatus503 uint64 `json:"compute_status_503"` // Number of responses received with status code 503 (Service Unavailable) for origin received by Compute@Edge.
125127
ComputeStatus504 uint64 `json:"compute_status_504"` // Number of responses received with status code 504 (Gateway Timeout) for origin received by Compute@Edge.
126128
ComputeStatus505 uint64 `json:"compute_status_505"` // Number of responses received with status code 505 (HTTP Version Not Supported) for origin received by Compute@Edge.
129+
ComputeStatus530 uint64 `json:"compute_status_530"` // Number of responses received with status code 530 for origin received by the Compute platform.
127130
ComputeLatency0to1 uint64 `json:"compute_latency_0_to_1ms"` // Number of responses with latency between 0 and 1 millisecond for origin received by Compute@Edge.
128131
ComputeLatency1to5 uint64 `json:"compute_latency_1_to_5ms"` // Number of responses with latency between 1 and 5 milliseconds for origin received by Compute@Edge.
129132
ComputeLatency5to10 uint64 `json:"compute_latency_5_to_10ms"` // Number of responses with latency between 5 and 10 milliseconds for origin received by Compute@Edge.

0 commit comments

Comments
 (0)