Merge pull request #33 from f5devcentral/mirror

Enhance devops with adding dumping and trailing support.

Author: zongzw

main.go

@@ -131,8 +131,8 @@ func main() {
 	prometheus.MustRegister(utils.FunctionDurationTimeCostTotal)
 	prometheus.MustRegister(f5_bigip.BIGIPiControlTimeCostCount)
 	prometheus.MustRegister(f5_bigip.BIGIPiControlTimeCostTotal)
-	mgr.AddMetricsExtraHandler("/stats", promhttp.Handler())
-	mgr.AddMetricsExtraHandler("/runtime", dumpRuntimeHandler())
+	mgr.AddMetricsExtraHandler("/stats/", promhttp.Handler())
+	mgr.AddMetricsExtraHandler("/runtime/", dumpRuntimeHandler())
 
 	setupReconcilers(mgr)
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
@@ -329,6 +329,7 @@ func setupBIGIPs(credsDir, confDir string) error {
 }
 
 func dumpRuntimeHandler() http.HandlerFunc {
+	slog := utils.LogFromContext(context.TODO())
 	if level != utils.LogLevel_Type_DEBUG {
 		return func(w http.ResponseWriter, r *http.Request) {
 			w.Header().Add("Content-Type", "application/json")
@@ -338,12 +339,38 @@ func dumpRuntimeHandler() http.HandlerFunc {
 	} else {
 		return func(w http.ResponseWriter, r *http.Request) {
 			w.Header().Add("Content-Type", "application/json")
-			if rlt, err := pkg.ActiveSIGs.DumpsAllResources(); err != nil {
-				w.WriteHeader(400)
-				fmt.Fprintf(w, `{"error": "failed to dump runtime objects: %s"}`, err.Error())
-			} else {
+			slog.Debugf("dumping request: %s?%s", r.URL.Path, r.URL.Query().Encode())
+			if r.URL.Path == "/runtime/" {
 				w.WriteHeader(200)
-				d, _ := json.MarshalIndent(rlt, "", "  ")
+				d, _ := json.MarshalIndent(pkg.ActiveSIGs, "", "  ")
+				fmt.Fprintf(w, "%s", string(d))
+				return
+			} else if strings.HasPrefix(r.URL.Path, "/runtime/trail") {
+				rlts := map[string]interface{}{}
+
+				queries := r.URL.Query()
+				for k, v := range queries {
+					switch k {
+					case "gatewayclass":
+						for _, cls := range v {
+							gwc := pkg.ActiveSIGs.GetGatewayClass(cls)
+							gws := pkg.ActiveSIGs.AttachedGateways(gwc)
+							if rlt, err := pkg.ParseGatewayRelatedForClass(cls, gws); err != nil {
+								w.WriteHeader(500)
+								fmt.Fprintf(w, `{"error": "failed to parse gateway class: %s: %s"}`, cls, err.Error())
+								return
+							} else {
+								rlts[cls] = rlt
+							}
+						}
+					default:
+						w.WriteHeader(400)
+						fmt.Fprintf(w, `{"error": "%s"}`, fmt.Sprintf("unsupported query type %s", k))
+						return
+					}
+				}
+				w.WriteHeader(200)
+				d, _ := json.MarshalIndent(rlts, "", "  ")
 				fmt.Fprintf(w, "%s", string(d))
 			}
 		}

pkg/cache.go

@@ -2,7 +2,6 @@ package pkg
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"os"
 	"reflect"
@@ -669,101 +668,3 @@ func (c *SIGCache) SyncAllResources(mgr manager.Manager) {
 	slog.Infof("Finished syncing resources to local")
 	c.SyncedAtStart = true
 }
-
-func (c *SIGCache) DumpsAllResources() (map[string]interface{}, error) {
-	defer utils.TimeItToPrometheus()()
-
-	c.mutex.Lock()
-	defer c.mutex.Unlock()
-
-	rlt := map[string]interface{}{}
-
-	dump := func(k string, v interface{}, rlt *map[string]interface{}) error {
-		if b, err := json.Marshal(v); err != nil {
-			return fmt.Errorf("failed to dump %s: %s", k, err.Error())
-		} else {
-			var d map[string]interface{}
-			if err := json.Unmarshal(b, &d); err != nil {
-				return fmt.Errorf("failed to unmarshal data from sigcache: %s", err)
-			} else {
-				(*rlt)[k] = d
-			}
-		}
-		return nil
-	}
-
-	// TODO: use reflect to deduplicate the following code.
-
-	// Namespace
-	namespaces := map[string]interface{}{}
-	for k, v := range c.Namespace {
-		if err := dump(k, v, &namespaces); err != nil {
-			return nil, err
-		}
-	}
-	rlt["Namespace"] = namespaces
-
-	// Endpoints
-	endpoints := map[string]interface{}{}
-	for k, v := range c.Endpoints {
-		if err := dump(k, v, &endpoints); err != nil {
-			return nil, err
-		}
-	}
-	rlt["Endpoints"] = endpoints
-
-	// Service
-	services := map[string]interface{}{}
-	for k, v := range c.Service {
-		if err := dump(k, v, &services); err != nil {
-			return nil, err
-		}
-	}
-	rlt["Service"] = services
-
-	// Gateway
-	gateways := map[string]interface{}{}
-	for k, v := range c.Gateway {
-		if err := dump(k, v, &gateways); err != nil {
-			return nil, err
-		}
-	}
-	rlt["Gateway"] = gateways
-
-	// GatewayClass
-	gatewayclasses := map[string]interface{}{}
-	for k, v := range c.GatewayClass {
-		if err := dump(k, v, &gatewayclasses); err != nil {
-			return nil, err
-		}
-	}
-	rlt["GatewayClass"] = gatewayclasses
-
-	// HTTPRoute
-	httproutes := map[string]interface{}{}
-	for k, v := range c.HTTPRoute {
-		if err := dump(k, v, &httproutes); err != nil {
-			return nil, err
-		}
-	}
-	rlt["HTTPRoute"] = httproutes
-
-	// ReferenceGrant
-	referencegrants := map[string]interface{}{}
-	for k, v := range c.ReferenceGrant {
-		if err := dump(k, v, &referencegrants); err != nil {
-			return nil, err
-		}
-	}
-	rlt["ReferenceGrant"] = referencegrants
-
-	// ControllerName
-	rlt["ControllerName"] = c.ControllerName
-
-	// refFromTo
-	if err := dump("refFromTo", refFromTo, &rlt); err != nil {
-		return nil, err
-	}
-
-	return rlt, nil
-}

pkg/irule_templates/rules.tmpl

@@ -30,9 +30,10 @@
     */}}
     if { {{ parseMatches $Rule.Matches }} } {
       {{ parseReqFilters $Rule.Filters $hr }}
-
-      set pool $static::pools_{{ $RuleIndex }}([expr {int(rand()*$static::pools_{{ $RuleIndex }}_size)}])
-      pool $pool
+      if { $static::pools_{{ $RuleIndex }}_size != 0 }{
+        set pool $static::pools_{{ $RuleIndex }}([expr {int(rand()*$static::pools_{{ $RuleIndex }}_size)}])
+        pool $pool
+      }
       return
     }
   {{ end }}