mirror of
https://github.com/openfaas/faas.git
synced 2025-06-08 16:26:47 +00:00
7b6cc60bd9
Fixes https://github.com/openfaas/faas/issues/1413 Fixes https://github.com/openfaas/faas-netes/issues/707 This fixes the Gateway UI not updating the invocation count automatically without a page reload. Tested by deploying on a local cluster and making sure invocations go up with and without namespace suffix Signed-off-by: Alistair Hey <alistair@heyal.co.uk>
108 lines
2.8 KiB
Go
108 lines
2.8 KiB
Go
package metrics
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"log"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"strconv"
|
|
|
|
types "github.com/openfaas/faas-provider/types"
|
|
)
|
|
|
|
// AddMetricsHandler wraps a http.HandlerFunc with Prometheus metrics
|
|
func AddMetricsHandler(handler http.HandlerFunc, prometheusQuery PrometheusQueryFetcher) http.HandlerFunc {
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
recorder := httptest.NewRecorder()
|
|
handler.ServeHTTP(recorder, r)
|
|
upstreamCall := recorder.Result()
|
|
|
|
if upstreamCall.Body == nil {
|
|
log.Println("Upstream call had empty body.")
|
|
return
|
|
}
|
|
|
|
defer upstreamCall.Body.Close()
|
|
|
|
if recorder.Code != http.StatusOK {
|
|
w.Header().Set("Content-Type", "text/plain")
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
w.Write([]byte(fmt.Sprintf("Error pulling metrics from provider/backend. Status code: %d", recorder.Code)))
|
|
return
|
|
}
|
|
|
|
upstreamBody, _ := ioutil.ReadAll(upstreamCall.Body)
|
|
var functions []types.FunctionStatus
|
|
|
|
err := json.Unmarshal(upstreamBody, &functions)
|
|
|
|
if err != nil {
|
|
log.Printf("Metrics upstream error: %s", err)
|
|
|
|
w.Header().Set("Content-Type", "text/plain")
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
w.Write([]byte("Error parsing metrics from upstream provider/backend."))
|
|
return
|
|
}
|
|
|
|
expr := url.QueryEscape(`sum(gateway_function_invocation_total{function_name=~".*", code=~".*"}) by (function_name, code)`)
|
|
// expr := "sum(gateway_function_invocation_total%7Bfunction_name%3D~%22.*%22%2C+code%3D~%22.*%22%7D)+by+(function_name%2C+code)"
|
|
results, fetchErr := prometheusQuery.Fetch(expr)
|
|
if fetchErr != nil {
|
|
log.Printf("Error querying Prometheus API: %s\n", fetchErr.Error())
|
|
w.Header().Set("Content-Type", "application/json")
|
|
w.WriteHeader(http.StatusOK)
|
|
w.Write(upstreamBody)
|
|
return
|
|
}
|
|
|
|
mixIn(&functions, results)
|
|
|
|
bytesOut, marshalErr := json.Marshal(functions)
|
|
if marshalErr != nil {
|
|
log.Println(marshalErr)
|
|
return
|
|
}
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
|
w.WriteHeader(http.StatusOK)
|
|
w.Write(bytesOut)
|
|
}
|
|
}
|
|
|
|
func mixIn(functions *[]types.FunctionStatus, metrics *VectorQueryResponse) {
|
|
|
|
if functions == nil {
|
|
return
|
|
}
|
|
|
|
// Ensure values are empty first.
|
|
for i := range *functions {
|
|
(*functions)[i].InvocationCount = 0
|
|
}
|
|
|
|
for i, function := range *functions {
|
|
for _, v := range metrics.Data.Result {
|
|
|
|
if v.Metric.FunctionName == fmt.Sprintf("%s.%s", function.Name, function.Namespace) {
|
|
metricValue := v.Value[1]
|
|
switch metricValue.(type) {
|
|
case string:
|
|
f, strconvErr := strconv.ParseFloat(metricValue.(string), 64)
|
|
if strconvErr != nil {
|
|
log.Printf("Unable to convert value for metric: %s\n", strconvErr)
|
|
continue
|
|
}
|
|
(*functions)[i].InvocationCount += f
|
|
break
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|