diff --git a/api/pkg/routes/public_routes.go b/api/pkg/routes/public_routes.go index f95521f4a..3bdbe150a 100644 --- a/api/pkg/routes/public_routes.go +++ b/api/pkg/routes/public_routes.go @@ -21,5 +21,4 @@ func EntriesRoutes(fiberApp *fiber.App) { routeGroup.Get("/tapStatus", controllers.GetTappingStatus) // get tapping status routeGroup.Get("/analyzeStatus", controllers.AnalyzeInformation) - } diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index b1b0c2326..59b2e39c1 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -3,6 +3,7 @@ package cmd import ( "context" "fmt" + "net/http" "os" "os/signal" "regexp" @@ -74,7 +75,6 @@ func RunMizuTap(podRegexQuery *regexp.Regexp, tappingOptions *MizuTapOptions) { go portForwardApiPod(ctx, kubernetesProvider, cancel, tappingOptions) // TODO convert this to job for built in pod ttl or have the running app handle this go watchPodsForTapping(ctx, kubernetesProvider, cancel, podRegexQuery, tappingOptions) go syncApiStatus(ctx, cancel, tappingOptions) - //go spamHealthcheck(ctx, tappingOptions) //block until exit signal or error waitForFinish(ctx, cancel) @@ -248,8 +248,18 @@ func portForwardApiPod(ctx context.Context, kubernetesProvider *kubernetes.Provi cancel() } }() - fmt.Printf("Mizu is available at http://%s\n", kubernetes.GetMizuCollectorProxiesHostAndPath(tappingOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName)) + mizuProxiedUrl := kubernetes.GetMizuCollectorProxiesHostAndPath(tappingOptions.GuiPort, mizu.ResourcesNamespace, mizu.AggregatorPodName) + fmt.Printf("Mizu is available at http://%s\n", mizuProxiedUrl) + time.Sleep(time.Second * 5) // Waiting to be sure the proxy is ready + if tappingOptions.Analyze { + if _, err := http.Get(fmt.Sprintf("http://%s/api/uploadEntries?dest=%s", mizuProxiedUrl, tappingOptions.AnalyzeDestination)); err != nil { + fmt.Println(err) + } else { + fmt.Printf(mizu.Purple, "Traffic is uploading to UP9 cloud for further analsys") + fmt.Println() + } + } isPodReady = true } diff --git a/cli/kubernetes/proxy.go b/cli/kubernetes/proxy.go index 9cbd59d3d..131a7fa24 100644 --- a/cli/kubernetes/proxy.go +++ b/cli/kubernetes/proxy.go @@ -28,8 +28,7 @@ func StartProxy(kubernetesProvider *Provider, mizuPort uint16, mizuNamespace str mux.Handle(k8sProxyApiPrefix, proxyHandler) //work around to make static resources available to the dashboard (all .svgs will not load without this) mux.Handle("/static/", getRerouteHttpHandler(proxyHandler, mizuProxiedUrl)) - - //l, err := server.Listen("127.0.0.1", int(mizuPort)) + l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", "127.0.0.1", int(mizuPort))) if err != nil { return err