Fix envoy proxy log levels in pilot agent (istio#9186)

Signed-off-by: Joshua Benjamin <joshuabnjmn@gmail.com>

pilot/cmd/pilot-agent/main.go

@@ -351,9 +351,9 @@ func init() {
 	proxyCmd.PersistentFlags().StringVar(&customConfigFile, "customConfigFile", values.CustomConfigFile,
 		"Path to the custom configuration file")
 	// Log levels are provided by the library https://github.com/gabime/spdlog, used by Envoy.
-	proxyCmd.PersistentFlags().StringVar(&proxyLogLevel, "proxyLogLevel", "warn",
+	proxyCmd.PersistentFlags().StringVar(&proxyLogLevel, "proxyLogLevel", "warning",
 		fmt.Sprintf("The log level used to start the Envoy proxy (choose from {%s, %s, %s, %s, %s, %s, %s})",
-			"trace", "debug", "info", "warn", "err", "critical", "off"))
+			"trace", "debug", "info", "warning", "error", "critical", "off"))
 	proxyCmd.PersistentFlags().IntVar(&concurrency, "concurrency", int(values.Concurrency),
 		"number of worker threads to run")
 	proxyCmd.PersistentFlags().StringVar(&templateFile, "templateFile", "",

tests/e2e/tests/dashboard/dashboard_test.go

@@ -22,6 +22,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"net/http"
 	"os"
 	"strings"
 	"testing"
@@ -500,15 +501,34 @@ func waitForMixerProxyReadiness() error {
 		time.Sleep(duration)
 
 		for _, pod := range mixerPods {
-			logs, err := util.ShellMuteOutput(fmt.Sprintf("kubectl logs %s -n %s -c istio-proxy", pod, tc.Kube.Namespace))
+			options := &kube.PodSelectOptions{
+				PodNamespace: tc.Kube.Namespace,
+				PodName:      pod,
+			}
+
+			forwarder, err := kube.NewPortForwarder(tc.Kube.KubeConfig, options, 16000, 15000)
 			if err != nil {
-				log.Infof("Failure retrieving logs for pod %s (container: istio-proxy): %v", pod, err)
+				log.Infof("Error creating port forwarder: %v", err)
+				continue
+			}
+			if err := forwarder.Start(); err != nil {
+				log.Infof("Error starting port forwarder: %v", err)
 				continue
 			}
-			if strings.Contains(logs, "starting main dispatch loop") {
-				log.Infof("Envoy started main dispatch loop.")
+
+			resp, err := http.Get("http://localhost:16000/server_info")
+			forwarder.Close()
+
+			if err != nil {
+				log.Infof("Failure retrieving status for pod %s (container: istio-proxy): %v", pod, err)
+				continue
+			}
+
+			if resp.StatusCode == 200 {
 				return nil
 			}
+
+			log.Infof("Failure retrieving status for pod %s (container: istio-proxy) status code should be 200 got: %d", pod, resp.StatusCode)
 		}
 	}
 	return errors.New("proxy for mixer never started main dispatch loop")