[monitoring] Change metric ports (#53)

Signed-off-by: v.oleynikov <[email protected]>
deckhouse · May 22, 2024 · 578a6ec · 578a6ec
1 parent 80cd81e
commit 578a6ec
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/images/agent/README.md b/images/agent/README.md
@@ -22,7 +22,7 @@
 
 `NODE_NAME`
 
-`METRICS_PORT` - default : 8080
+`METRICS_PORT` - default : 9695
 
 
 #### Metrics

diff --git a/images/agent/cmd/main.go b/images/agent/cmd/main.go
@@ -28,6 +28,7 @@ import (
 	"sds-node-configurator/pkg/kubutils"
 	"sds-node-configurator/pkg/logger"
 	"sds-node-configurator/pkg/monitoring"
+	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	v1 "k8s.io/api/core/v1"
 	sv1 "k8s.io/api/storage/v1"
@@ -89,9 +90,9 @@ func main() {
 	log.Info("[main] successfully read scheme CR")
 
 	managerOpts := manager.Options{
-		Scheme: scheme,
-		//MetricsBindAddress: cfgParams.MetricsPort,
-		Logger: log.GetLogger(),
+		Scheme:  scheme,
+		Logger:  log.GetLogger(),
+		Metrics: server.Options{BindAddress: cfgParams.MetricsPort},
 	}
 
 	mgr, err := manager.New(kConfig, managerOpts)

diff --git a/images/agent/config/config.go b/images/agent/config/config.go
@@ -72,7 +72,7 @@ func NewConfig() (*Options, error) {
 
 	opts.MetricsPort = os.Getenv(MetricsPort)
 	if opts.MetricsPort == "" {
-		opts.MetricsPort = ":8080"
+		opts.MetricsPort = ":9695"
 	}
 
 	scanInt := os.Getenv(ScanInterval)

diff --git a/images/agent/config/config_test.go b/images/agent/config/config_test.go
@@ -107,7 +107,7 @@ func TestNewConfig(t *testing.T) {
 
 	t.Run("MetricsPortNotSet_ReturnsDefaultPort", func(t *testing.T) {
 		expNodeName := "test-node"
-		expMetricsPort := ":8080"
+		expMetricsPort := ":9695"
 		expMachineId := "test-id"
 
 		err := os.Setenv(NodeName, expNodeName)