Removed link, Added repo name to postgres image and print URLs to Grafana and Prometheus UI

Removed link, Added repo name to postgres image and print URLs to Grafana and Prometheus UI

Signed-off-by: Alexandros Filios <[email protected]>

Author: alexandrosfilios

Diff for: integration/nwo/monitoring/monitoring/docker.go

@@ -134,6 +134,7 @@ func (n *Extension) startPrometheus() {
 		}
 	}()
 
+	logger.Infof("Prometheus running on http://localhost:%s", port)
 }
 
 func (n *Extension) startGrafana() {
@@ -162,7 +163,6 @@ func (n *Extension) startGrafana() {
 			nat.Port(port + "/tcp"): struct{}{},
 		},
 	}, &container.HostConfig{
-		Links: []string{n.platform.NetworkID() + "-prometheus"},
 		Mounts: []mount.Mount{
 			{
 				Type:   mount.TypeBind,
@@ -218,4 +218,5 @@ func (n *Extension) startGrafana() {
 			dockerLogger.Debugf("%s", scanner.Text())
 		}
 	}()
+	logger.Infof("Grafana running on http://localhost:%s with username: 'admin', password: 'admin'", port)
 }

Diff for: platform/view/services/db/driver/sql/postgres/test_utils.go

@@ -27,6 +27,8 @@ import (
 	_ "modernc.org/sqlite"
 )
 
+const PostgresImage = "postgres:latest"
+
 type Logger interface {
 	Log(...any)
 	Errorf(string, ...any)
@@ -75,8 +77,9 @@ func ReadDataSource(s string) (*ContainerConfig, error) {
 	if len(c.DBName) == 0 || c.Port == 0 || len(c.Pass) == 0 || len(c.User) == 0 {
 		return nil, fmt.Errorf("incomplete datasource: %s", s)
 	}
+
 	return &ContainerConfig{
-		Image:     "postgres:latest",
+		Image:     PostgresImage,
 		Container: fmt.Sprintf("fsc-postgres-%s", c.DBName),
 		Config:    c,
 	}, nil
@@ -101,7 +104,7 @@ func DefaultConfig(node string) *ContainerConfig {
 
 func defaultConfigWithPort(node string, port int) *ContainerConfig {
 	return &ContainerConfig{
-		Image:     "postgres:latest",
+		Image:     PostgresImage,
 		Container: fmt.Sprintf("fsc-postgres-%s", node),
 		Config: &Config{
 			DBName: node,
@@ -251,7 +254,7 @@ func StartPostgres(t Logger, printLogs bool) (func(), string, error) {
 	}
 
 	c := ContainerConfig{
-		Image:     getEnv("POSTGRES_IMAGE", "postgres:latest"),
+		Image:     getEnv("POSTGRES_IMAGE", PostgresImage),
 		Container: getEnv("POSTGRES_CONTAINER", "fsc-postgres"),
 		Config: &Config{
 			DBName: getEnv("POSTGRES_DB", "testdb"),