Merge branch 'main' into PMM-12375-add-database-version-to-services2

percona · Sep 28, 2023 · 8f439f0 · 8f439f0
2 parents bd77a69 + d9e58e1
commit 8f439f0
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 113 deletions.
diff --git a/api-tests/inventory/nodes_test.go b/api-tests/inventory/nodes_test.go
@@ -353,7 +353,7 @@ func TestContainerNodeDeprecated(t *testing.T) {
 				ContainerID:   "docker-id",
 				ContainerName: "docker-name",
 				MachineID:     "machine-id",
-				Address:       "10.10.1.10",
+				Address:       "10.10.1.11",
 			},
 			Context: pmmapitests.Context,
 		}
@@ -377,7 +377,7 @@ func TestContainerNodeDeprecated(t *testing.T) {
 					ContainerID:   "docker-id",
 					ContainerName: "docker-name",
 					MachineID:     "machine-id",
-					Address:       "10.10.1.10",
+					Address:       "10.10.1.11",
 				},
 			},
 		}
@@ -688,7 +688,6 @@ func TestRemoveNode(t *testing.T) {
 					Address:     "localhost",
 					Port:        3306,
 					ServiceName: serviceName,
-					Cluster:     serviceName,
 				},
 			},
 		}, listAgentsOK.Payload)

diff --git a/api-tests/inventory/services_test.go b/api-tests/inventory/services_test.go
@@ -352,7 +352,6 @@ func TestMySQLService(t *testing.T) {
 					Address:     "localhost",
 					Port:        3306,
 					ServiceName: serviceName,
-					Cluster:     serviceName,
 				},
 			},
 		}, res)
@@ -373,7 +372,6 @@ func TestMySQLService(t *testing.T) {
 					Address:     "localhost",
 					Port:        3306,
 					ServiceName: serviceName,
-					Cluster:     serviceName,
 				},
 			},
 		}, serviceRes)
@@ -555,7 +553,6 @@ func TestMongoDBService(t *testing.T) {
 					ServiceID:   serviceID,
 					NodeID:      genericNodeID,
 					ServiceName: serviceName,
-					Cluster:     serviceName,
 					Address:     "localhost",
 					Port:        27017,
 				},
@@ -576,7 +573,6 @@ func TestMongoDBService(t *testing.T) {
 					ServiceID:   serviceID,
 					NodeID:      genericNodeID,
 					ServiceName: serviceName,
-					Cluster:     serviceName,
 					Address:     "localhost",
 					Port:        27017,
 				},
@@ -733,7 +729,6 @@ func TestMongoDBService(t *testing.T) {
 					ServiceID:   serviceID,
 					NodeID:      genericNodeID,
 					ServiceName: serviceName,
-					Cluster:     serviceName,
 					Socket:      "/tmp/mongodb-27017.sock",
 				},
 			},
@@ -775,7 +770,6 @@ func TestPostgreSQLService(t *testing.T) {
 					DatabaseName: defaultPostgresDBName,
 					Port:         5432,
 					ServiceName:  serviceName,
-					Cluster:      serviceName,
 				},
 			},
 		}, res)
@@ -797,7 +791,6 @@ func TestPostgreSQLService(t *testing.T) {
 					DatabaseName: defaultPostgresDBName,
 					Port:         5432,
 					ServiceName:  serviceName,
-					Cluster:      serviceName,
 				},
 			},
 		}, serviceRes)
@@ -980,7 +973,6 @@ func TestProxySQLService(t *testing.T) {
 					Address:     "localhost",
 					Port:        5432,
 					ServiceName: serviceName,
-					Cluster:     serviceName,
 				},
 			},
 		}, res)
@@ -1001,7 +993,6 @@ func TestProxySQLService(t *testing.T) {
 					Address:     "localhost",
 					Port:        5432,
 					ServiceName: serviceName,
-					Cluster:     serviceName,
 				},
 			},
 		}, serviceRes)
@@ -1193,7 +1184,6 @@ func TestExternalService(t *testing.T) {
 					ServiceID:   serviceID,
 					NodeID:      genericNodeID,
 					ServiceName: serviceName,
-					Cluster:     serviceName,
 					Group:       "redis",
 				},
 			},
@@ -1213,7 +1203,6 @@ func TestExternalService(t *testing.T) {
 					ServiceID:   serviceID,
 					NodeID:      genericNodeID,
 					ServiceName: serviceName,
-					Cluster:     serviceName,
 					Group:       "redis",
 				},
 			},
@@ -1345,7 +1334,6 @@ func TestExternalService(t *testing.T) {
 					ServiceID:   serviceID,
 					NodeID:      genericNodeID,
 					ServiceName: serviceName,
-					Cluster:     serviceName,
 					Group:       "external",
 				},
 			},

diff --git a/api-tests/management/external_test.go b/api-tests/management/external_test.go
@@ -74,7 +74,6 @@ func TestAddExternal(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Group:       "external",
 			},
 		}, *serviceOK.Payload)
@@ -226,7 +225,6 @@ func TestAddExternal(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Group:       "external",
 			},
 		}, *serviceOK.Payload)

diff --git a/api-tests/management/haproxy_test.go b/api-tests/management/haproxy_test.go
@@ -76,7 +76,6 @@ func TestAddHAProxy(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 			},
 		}, *serviceOK.Payload)
 
@@ -226,7 +225,6 @@ func TestAddHAProxy(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 			},
 		}, *serviceOK.Payload)
 

diff --git a/api-tests/management/mongodb_test.go b/api-tests/management/mongodb_test.go
@@ -79,7 +79,6 @@ func TestAddMongoDB(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        27017,
 			},
@@ -155,7 +154,6 @@ func TestAddMongoDB(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        27017,
 			},
@@ -391,7 +389,6 @@ func TestAddMongoDB(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      newNodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        27017,
 			},
@@ -610,7 +607,6 @@ func TestAddMongoDB(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Socket:      "/tmp/mongodb-27017.sock",
 			},
 		}, *serviceOK.Payload)
@@ -682,7 +678,6 @@ func TestAddMongoDB(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        27017,
 			},
@@ -755,7 +750,6 @@ func TestAddMongoDB(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        27017,
 			},
@@ -827,7 +821,6 @@ func TestAddMongoDB(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        27017,
 			},

diff --git a/api-tests/management/mysql_test.go b/api-tests/management/mysql_test.go
@@ -80,7 +80,6 @@ func TestAddMySQL(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        3306,
 			},
@@ -160,7 +159,6 @@ func TestAddMySQL(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        3306,
 			},
@@ -415,7 +413,6 @@ func TestAddMySQL(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      newNodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        27017,
 			},
@@ -669,7 +666,6 @@ func TestAddMySQL(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        3306,
 			},
@@ -745,7 +741,6 @@ func TestAddMySQL(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        3306,
 			},
@@ -820,7 +815,6 @@ func TestAddMySQL(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        3306,
 			},

diff --git a/api-tests/management/postgresql_test.go b/api-tests/management/postgresql_test.go
@@ -82,7 +82,6 @@ func TestAddPostgreSQL(t *testing.T) {
 				ServiceID:    serviceID,
 				NodeID:       nodeID,
 				ServiceName:  serviceName,
-				Cluster:      serviceName,
 				DatabaseName: defaultPostgresDBName,
 				Address:      "10.10.10.10",
 				Port:         5432,
@@ -162,7 +161,6 @@ func TestAddPostgreSQL(t *testing.T) {
 				ServiceID:    serviceID,
 				NodeID:       nodeID,
 				ServiceName:  serviceName,
-				Cluster:      serviceName,
 				DatabaseName: defaultPostgresDBName,
 				Address:      "10.10.10.10",
 				Port:         5432,
@@ -263,7 +261,6 @@ func TestAddPostgreSQL(t *testing.T) {
 				ServiceID:    serviceID,
 				NodeID:       nodeID,
 				ServiceName:  serviceName,
-				Cluster:      serviceName,
 				DatabaseName: defaultPostgresDBName,
 				Address:      "10.10.10.10",
 				Port:         5432,
@@ -413,7 +410,6 @@ func TestAddPostgreSQL(t *testing.T) {
 				ServiceID:    serviceID,
 				NodeID:       newNodeID,
 				ServiceName:  serviceName,
-				Cluster:      serviceName,
 				DatabaseName: defaultPostgresDBName,
 				Address:      "10.10.10.10",
 				Port:         27017,
@@ -640,7 +636,6 @@ func TestAddPostgreSQL(t *testing.T) {
 				ServiceID:    serviceID,
 				NodeID:       nodeID,
 				ServiceName:  serviceName,
-				Cluster:      serviceName,
 				DatabaseName: defaultPostgresDBName,
 				Address:      "10.10.10.10",
 				Port:         5432,
@@ -716,7 +711,6 @@ func TestAddPostgreSQL(t *testing.T) {
 				ServiceID:    serviceID,
 				NodeID:       nodeID,
 				ServiceName:  serviceName,
-				Cluster:      serviceName,
 				DatabaseName: defaultPostgresDBName,
 				Address:      "10.10.10.10",
 				Port:         5432,
@@ -791,7 +785,6 @@ func TestAddPostgreSQL(t *testing.T) {
 				ServiceID:    serviceID,
 				NodeID:       nodeID,
 				ServiceName:  serviceName,
-				Cluster:      serviceName,
 				DatabaseName: defaultPostgresDBName,
 				Address:      "10.10.10.10",
 				Port:         5432,

diff --git a/api-tests/management/proxysql_test.go b/api-tests/management/proxysql_test.go
@@ -80,7 +80,6 @@ func TestAddProxySQL(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        3306,
 			},
@@ -156,7 +155,6 @@ func TestAddProxySQL(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      nodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        3306,
 			},
@@ -262,12 +260,13 @@ func TestAddProxySQL(t *testing.T) {
 		params := &proxysql.AddProxySQLParams{
 			Context: pmmapitests.Context,
 			Body: proxysql.AddProxySQLBody{
-				NodeID:              nodeID,
-				PMMAgentID:          pmmAgentID,
-				ServiceName:         serviceName,
-				Address:             "10.10.10.10",
-				Port:                3306,
-				Username:            "username",
+				NodeID:      nodeID,
+				PMMAgentID:  pmmAgentID,
+				ServiceName: serviceName,
+				Address:     "10.10.10.10",
+				Port:        3306,
+				Username:    "username",
+
 				SkipConnectionCheck: true,
 			},
 		}
@@ -387,7 +386,6 @@ func TestAddProxySQL(t *testing.T) {
 				ServiceID:   serviceID,
 				NodeID:      newNodeID,
 				ServiceName: serviceName,
-				Cluster:     serviceName,
 				Address:     "10.10.10.10",
 				Port:        27017,
 			},

diff --git a/go.mod b/go.mod
@@ -65,7 +65,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/prometheus/alertmanager v0.26.0
-	github.com/prometheus/client_golang v1.16.0
+	github.com/prometheus/client_golang v1.17.0
 	github.com/prometheus/common v0.44.0
 	github.com/ramr/go-reaper v0.2.1
 	github.com/robfig/cron/v3 v3.0.1
@@ -236,10 +236,10 @@ require (
 	github.com/paulmach/orb v0.10.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
 	github.com/prometheus/common/sigv4 v0.1.0 // indirect
 	github.com/prometheus/exporter-toolkit v0.10.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/rs/xid v1.5.0 // indirect
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect