update: metrics command

Author: Esonhugh

cmd/metrics/parser.go

@@ -16,70 +16,69 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var MetricOpt struct {
-	From string
-}
-
 func init() {
 	cmdx.RootCmd.AddCommand(MetricsCmd)
-	MetricsCmd.PersistentFlags().StringVarP(&MetricOpt.From, "metric", "m", "", "metrics from (file / remote url)")
-
 }
 
 var MetricsCmd = &cobra.Command{
 	Use:   "metrics",
-	Short: "parse kube stat metrics to readable resource",
+	Short: "parse kube stat metrics to readable resource, use: k8spider metrics <file/url> <file/url> ...",
 	Run: func(cmd *cobra.Command, args []string) {
-		if MetricOpt.From == "" {
+		if len(args) != 1 {
+			cmd.Help()
 			return
 		}
-		log.Debugf("parse metrics from %v", MetricOpt.From)
-		rule := append(kube_state_metrics.DefaultMatchRules(), coredns.CoreDNSMatchRules()...)
-		if err := rule.Compile(); err != nil {
-			log.Fatalf("compile rule failed: %v", err)
-		}
-		log.Debugf("compiled rules completed, start to get resource \n")
 
-		ot := output()
-
-		var r io.Reader
-		if strings.HasPrefix("http://", MetricOpt.From) || strings.HasPrefix("https://", MetricOpt.From) {
-			resp, err := http.Get(MetricOpt.From)
-			if err != nil {
-				log.Fatalf("get metrics from %v failed: %v", MetricOpt.From, err)
-			}
-			defer resp.Body.Close()
-			r = resp.Body
-		} else {
-			f, err := os.OpenFile(MetricOpt.From, os.O_RDONLY, 0666)
-			if err != nil {
-				log.Fatalf("open file %v failed: %v", MetricOpt.From, err)
+		for _, From := range args {
+			log.Debugf("parse metrics from %v", From)
+			rule := append(kube_state_metrics.DefaultMatchRules(), coredns.CoreDNSMatchRules()...)
+			if err := rule.Compile(); err != nil {
+				log.Fatalf("compile rule failed: %v", err)
 			}
-			defer f.Close()
-			r = f
-		}
-		log.Debugf("start to parse metrics line by line\n")
+			log.Debugf("compiled rules completed, start to get resource \n")
 
-		var rx []*metrics.MetricMatcher
+			ot := output()
 
-		scanner := bufio.NewScanner(r)
-		for scanner.Scan() {
-			line := scanner.Text()
-			res, err := rule.Match(line)
-			if err != nil {
-				continue
+			var r io.Reader
+			if strings.HasPrefix("http://", From) || strings.HasPrefix("https://", From) {
+				resp, err := http.Get(From)
+				if err != nil {
+					log.Fatalf("get metrics from %v failed: %v", From, err)
+				}
+				defer resp.Body.Close()
+				r = resp.Body
 			} else {
-				log.Debugf("matched: %s", res.DumpString())
-				rx = append(rx, res)
+				f, err := os.OpenFile(From, os.O_RDONLY, 0666)
+				if err != nil {
+					log.Fatalf("open file %v failed: %v", From, err)
+				}
+				defer f.Close()
+				r = f
 			}
+			log.Debugf("start to parse metrics line by line\n")
+
+			var rx []*metrics.MetricMatcher
+
+			scanner := bufio.NewScanner(r)
+			for scanner.Scan() {
+				line := scanner.Text()
+				res, err := rule.Match(line)
+				if err != nil {
+					continue
+				} else {
+					log.Debugf("matched: %s", res.DumpString())
+					rx = append(rx, res)
+				}
+			}
+			if err := scanner.Err(); err != nil {
+				log.Warnf("scan metrics failed and break out, reason: %v", err)
+			}
+			var res define.ResourceList = metrics.ConvertToResource(rx)
+			log.Debugf("parse metrics completed, start to print result\n")
+
+			res.Print(ot)
 		}
-		if err := scanner.Err(); err != nil {
-			log.Warnf("scan metrics failed and break out, reason: %v", err)
-		}
-		var res define.ResourceList = metrics.ConvertToResource(rx)
-		log.Debugf("parse metrics completed, start to print result\n")
 
-		res.Print(ot)
 	},
 }