From 66e2dc73f97d8b32c58479a31b20f0125b65f86f Mon Sep 17 00:00:00 2001
From: yubo <yubo@yubo.org>
Date: Sun, 24 Jan 2021 14:09:08 +0800
Subject: [PATCH] remove prober RPC.port from config (#543)

* remove prober rpc.port from yml config

* remove prober.config.rpcPort && add prober.plugins.config.metrics checker
---
 etc/address.yml                     |  1 -
 src/modules/prober/config/config.go |  2 +-
 src/modules/prober/config/plugin.go | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/etc/address.yml b/etc/address.yml
index 744e9525..0a7e06d7 100644
--- a/etc/address.yml
+++ b/etc/address.yml
@@ -44,7 +44,6 @@ judge:
 
 prober:
   http: 0.0.0.0:8023
-  rpc: 0.0.0.0:8024
   addresses:
     - 127.0.0.1
 
diff --git a/src/modules/prober/config/config.go b/src/modules/prober/config/config.go
index 2dafb3af..9cc3a99f 100644
--- a/src/modules/prober/config/config.go
+++ b/src/modules/prober/config/config.go
@@ -87,7 +87,7 @@ func Parse(conf string) error {
 	}
 
 	Config.Report.HTTPPort = strconv.Itoa(address.GetHTTPPort("prober"))
-	Config.Report.RPCPort = strconv.Itoa(address.GetRPCPort("prober"))
+	// Config.Report.RPCPort = strconv.Itoa(address.GetRPCPort("prober"))
 
 	return err
 }
diff --git a/src/modules/prober/config/plugin.go b/src/modules/prober/config/plugin.go
index 6ccc9768..056dedfa 100644
--- a/src/modules/prober/config/plugin.go
+++ b/src/modules/prober/config/plugin.go
@@ -53,6 +53,20 @@ func (p *pluginConfig) Validate() error {
 	default:
 		p.mode = PluginModeWhitelist
 	}
+
+	for k, v := range p.Metrics {
+		if v.Name == "" {
+			return fmt.Errorf("metrics[%d].name must be set", k)
+		}
+		if v.Type == "" {
+			v.Type = dataobj.GAUGE
+		}
+		if v.Type != dataobj.GAUGE &&
+			v.Type != dataobj.COUNTER &&
+			v.Type != dataobj.SUBTRACT {
+			return fmt.Errorf("metrics[%s].type.%s unsupported", v.Name, v.Type)
+		}
+	}
 	return nil
 }