Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[STATS-2239]: Update Fastly-exporter with new fields (and remove vcl_on_compute) #189

Merged
merged 6 commits into from
Mar 13, 2025
Merged

[STATS-2239]: Update Fastly-exporter with new fields (and remove vcl_on_compute) #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
12e9df3
sort fields
drrev Mar 12, 2025
2d2c171
add new fields, remove vcl_compute
drrev Mar 12, 2025
91ef215
remove vcl_compute_*, add new request, bot, and ddos metrics
drrev Mar 12, 2025
37f70cb
sync help from api-documentation
drrev Mar 12, 2025
b7796f5
fix acronym Api to API
drrev Mar 12, 2025
06bfe28
add status 530 and *_operations_count metrics
drrev Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/domain/process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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))
}
2 changes: 2 additions & 0 deletions pkg/domain/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
}
3 changes: 3 additions & 0 deletions pkg/origin/process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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))
Expand All @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions pkg/origin/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
Loading
Loading