[prometheus] add prometheus ip configuration flag

Signed-off-by: Leo Chen <leo@harmony.one>

api/service/prometheus/service.go

@@ -49,7 +49,7 @@ func NewService(config nodeconfig.PrometheusServerConfig, additionalHandlers ...
 		mux.HandleFunc(h.Path, h.Handler)
 	}
 
-	utils.Logger().Info().Int("port", config.HTTPPort).
+	utils.Logger().Debug().Int("port", config.HTTPPort).
 		Str("ip", config.HTTPIp).
 		Msg("Starting Prometheus server")
 	endpoint := fmt.Sprintf("%s:%d", config.HTTPIp, config.HTTPPort)

cmd/harmony/config.go

@@ -112,6 +112,7 @@ type httpConfig struct {
 	RosettaEnabled    bool
 	RosettaPort       int
 	PrometheusEnabled bool
+	PrometheusIP      string
 	PrometheusPort    int
 }
 

cmd/harmony/config_test.go

@@ -30,7 +30,7 @@ func init() {
 }
 
 func TestV1_0_0Config(t *testing.T) {
-	testConfig := `Version = "1.0.0"
+	testConfig := `Version = "1.0.3"
 
 [BLSKeys]
   KMSConfigFile = ""
@@ -56,6 +56,7 @@ func TestV1_0_0Config(t *testing.T) {
   IP = "127.0.0.1"
   Port = 9500
   PrometheusEnabled = true
+  PrometheusIP = "0.0.0.0"
   PrometheusPort = 9900
 
 [Log]
@@ -107,8 +108,8 @@ func TestV1_0_0Config(t *testing.T) {
 	if config.P2P.IP != defaultConfig.P2P.IP {
 		t.Errorf("Expect default p2p IP if old config is provided")
 	}
-	if config.Version != "1.0.0" {
+	if config.Version != "1.0.3" {
-		t.Errorf("Expected config version: 1.0.0, not %v", config.Version)
+		t.Errorf("Expected config version: 1.0.3, not %v", config.Version)
 	}
 	config.Version = defaultConfig.Version // Shortcut for testing, value checked above
 	if !reflect.DeepEqual(config, defaultConfig) {

cmd/harmony/default.go

@@ -31,6 +31,7 @@ var defaultConfig = harmonyConfig{
 		Port:              nodeconfig.DefaultRPCPort,
 		RosettaPort:       nodeconfig.DefaultRosettaPort,
 		PrometheusEnabled: true,
+		PrometheusIP:      "0.0.0.0",
 		PrometheusPort:    nodeconfig.DefaultPrometheusPort,
 	},
 	WS: wsConfig{

cmd/harmony/flags.go

@@ -52,6 +52,7 @@ var (
 		httpPortFlag,
 		httpRosettaPortFlag,
 		httpPrometheusEnabledFlag,
+		httpPrometheusIPFlag,
 		httpPrometheusPortFlag,
 	}
 
@@ -452,6 +453,11 @@ var (
 		Usage:    "enable HTTP / Prometheus requests",
 		DefValue: defaultConfig.HTTP.PrometheusEnabled,
 	}
+	httpPrometheusIPFlag = cli.StringFlag{
+		Name:     "http.prometheus.ip",
+		Usage:    "ip address to listen for prometheus service",
+		DefValue: defaultConfig.HTTP.PrometheusIP,
+	}
 	httpPrometheusPortFlag = cli.IntFlag{
 		Name:     "http.prometheus.port",
 		Usage:    "prometheus port to listen for HTTP requests",
@@ -477,6 +483,11 @@ func applyHTTPFlags(cmd *cobra.Command, config *harmonyConfig) {
 		isRosettaSpecified = true
 	}
 
+	if cli.IsFlagChanged(cmd, httpPrometheusIPFlag) {
+		config.HTTP.PrometheusIP = cli.GetStringFlagValue(cmd, httpPrometheusIPFlag)
+		isPrometheusSpecified = true
+	}
+
 	if cli.IsFlagChanged(cmd, httpPrometheusPortFlag) {
 		config.HTTP.PrometheusPort = cli.GetIntFlagValue(cmd, httpPrometheusPortFlag)
 		isPrometheusSpecified = true

cmd/harmony/flags_test.go

@@ -61,6 +61,7 @@ func TestHarmonyFlags(t *testing.T) {
 					RosettaEnabled:    false,
 					RosettaPort:       9700,
 					PrometheusEnabled: true,
+					PrometheusIP:      "0.0.0.0",
 					PrometheusPort:    9900,
 				},
 				WS: wsConfig{
@@ -361,6 +362,7 @@ func TestRPCFlags(t *testing.T) {
 				Port:              defaultConfig.HTTP.Port,
 				RosettaPort:       defaultConfig.HTTP.RosettaPort,
 				PrometheusEnabled: true,
+				PrometheusIP:      defaultConfig.HTTP.PrometheusIP,
 				PrometheusPort:    defaultConfig.HTTP.PrometheusPort,
 			},
 		},
@@ -373,6 +375,7 @@ func TestRPCFlags(t *testing.T) {
 				Port:              9001,
 				RosettaPort:       defaultConfig.HTTP.RosettaPort,
 				PrometheusEnabled: true,
+				PrometheusIP:      defaultConfig.HTTP.PrometheusIP,
 				PrometheusPort:    defaultConfig.HTTP.PrometheusPort,
 			},
 		},
@@ -385,6 +388,7 @@ func TestRPCFlags(t *testing.T) {
 				Port:              9001,
 				RosettaPort:       10001,
 				PrometheusEnabled: true,
+				PrometheusIP:      defaultConfig.HTTP.PrometheusIP,
 				PrometheusPort:    defaultConfig.HTTP.PrometheusPort,
 			},
 		},
@@ -397,6 +401,7 @@ func TestRPCFlags(t *testing.T) {
 				Port:              defaultConfig.HTTP.Port,
 				RosettaPort:       10001,
 				PrometheusEnabled: true,
+				PrometheusIP:      defaultConfig.HTTP.PrometheusIP,
 				PrometheusPort:    defaultConfig.HTTP.PrometheusPort,
 			},
 		},
@@ -409,6 +414,7 @@ func TestRPCFlags(t *testing.T) {
 				Port:              9501,
 				RosettaPort:       9701,
 				PrometheusEnabled: true,
+				PrometheusIP:      defaultConfig.HTTP.PrometheusIP,
 				PrometheusPort:    defaultConfig.HTTP.PrometheusPort + 1,
 			},
 		},
@@ -421,6 +427,20 @@ func TestRPCFlags(t *testing.T) {
 				Port:              defaultConfig.HTTP.Port,
 				RosettaPort:       defaultConfig.HTTP.RosettaPort,
 				PrometheusEnabled: true,
+				PrometheusIP:      defaultConfig.HTTP.PrometheusIP,
+				PrometheusPort:    20001,
+			},
+		},
+		{
+			args: []string{"--http.prometheus.ip", "8.8.8.8", "--http.prometheus.port", "20001"},
+			expConfig: httpConfig{
+				Enabled:           true,
+				RosettaEnabled:    false,
+				IP:                defaultConfig.HTTP.IP,
+				Port:              defaultConfig.HTTP.Port,
+				RosettaPort:       defaultConfig.HTTP.RosettaPort,
+				PrometheusEnabled: true,
+				PrometheusIP:      "8.8.8.8",
 				PrometheusPort:    20001,
 			},
 		},

cmd/harmony/main.go

@@ -332,7 +332,7 @@ func setupNodeAndRun(hc harmonyConfig) {
 	// Pares Prometheus config
 	nodeConfig.PrometheusServer = nodeconfig.PrometheusServerConfig{
 		HTTPEnabled: hc.HTTP.PrometheusEnabled,
-		HTTPIp:      hc.HTTP.IP,
+		HTTPIp:      hc.HTTP.PrometheusIP,
 		HTTPPort:    hc.HTTP.PrometheusPort,
 	}