Merge branch 'v3' into PMM-12619-env-vars-rename

percona · Mar 3, 2024 · 68a08ad · 68a08ad
2 parents f40cc41 + 6651430
commit 68a08ad
Show file tree

Hide file tree

Showing 25 changed files with 619 additions and 530 deletions.
diff --git a/admin/commands/management/add_postgresql.go b/admin/commands/management/add_postgresql.go
@@ -30,10 +30,14 @@ var addPostgreSQLResultT = commands.ParseTemplate(`
 PostgreSQL Service added.
 Service ID  : {{ .Service.ServiceID }}
 Service name: {{ .Service.ServiceName }}
+{{ if .Warning }}
+Warning: {{ .Warning }}
+{{- end -}}
 `)
 
 type addPostgreSQLResult struct {
 	Service *postgresql.AddPostgreSQLOKBodyService `json:"service"`
+	Warning string                                 `json:"warning"`
 }
 
 func (res *addPostgreSQLResult) Result() {}
@@ -223,5 +227,6 @@ func (cmd *AddPostgreSQLCommand) RunCmd() (commands.Result, error) {
 
 	return &addPostgreSQLResult{
 		Service: resp.Payload.Service,
+		Warning: resp.Payload.Warning,
 	}, nil
 }
diff --git a/agent/serviceinfobroker/service_info_broker.go b/agent/serviceinfobroker/service_info_broker.go
@@ -26,6 +26,7 @@ import (
 
 	"github.com/go-sql-driver/mysql"
 	"github.com/lib/pq"
+	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"go.mongodb.org/mongo-driver/mongo"
 
@@ -231,6 +232,13 @@ func (sib *ServiceInfoBroker) getPostgreSQLInfo(ctx context.Context, dsn string,
 	}
 	res.Version = version
 
+	var pgsmVersion string
+	err = db.QueryRowContext(ctx, "SELECT /* agent='serviceinfobroker' */ extversion FROM pg_extension WHERE extname = 'pg_stat_monitor';").Scan(&pgsmVersion)
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		res.Error = err.Error()
+	}
+	res.PgsmVersion = pgsmVersion
+
 	return &res
 }
 

diff --git a/agent/serviceinfobroker/service_info_broker_test.go b/agent/serviceinfobroker/service_info_broker_test.go
@@ -249,6 +249,20 @@ func TestServiceInfoBroker(t *testing.T) {
 		assert.InDelta(t, 250, resp.TableCount, 150)
 	})
 
+	t.Run("PostgreSQLOptions", func(t *testing.T) {
+		cfgStorage := config.NewStorage(&config.Config{
+			Paths: config.Paths{TempDir: t.TempDir()},
+		})
+		c := New(cfgStorage)
+		resp := c.GetInfoFromService(context.Background(), &agentpb.ServiceInfoRequest{
+			Dsn:  tests.GetTestPostgreSQLDSN(t),
+			Type: inventorypb.ServiceType_POSTGRESQL_SERVICE,
+		}, 0)
+		require.NotNil(t, resp)
+		assert.Equal(t, []string{"postgres", "pmm-agent"}, resp.DatabaseList)
+		assert.Equal(t, "", resp.PgsmVersion)
+	})
+
 	t.Run("MongoDBWithSSL", func(t *testing.T) {
 		mongoDBDSNWithSSL, mongoDBTextFiles := tests.GetTestMongoDBWithSSLDSN(t, "../")
 

diff --git a/api/agentpb/agent.pb.go b/api/agentpb/agent.pb.go
diff --git a/api/agentpb/agent.pb.validate.go b/api/agentpb/agent.pb.validate.go
diff --git a/api/agentpb/agent.proto b/api/agentpb/agent.proto
@@ -474,6 +474,8 @@ message ServiceInfoResponse {
   string version = 3;
   // A list of PostgreSQL databases.
   repeated string database_list = 4;
+  // A version of pg_stat_monitor, empty if unavailable.
+  string pgsm_version = 5;
 }
 
 // JobStatusRequest is a ServerMessage asking pmm-agent for job status.

diff --git a/api/managementpb/json/client/postgre_sql/add_postgre_sql_responses.go b/api/managementpb/json/client/postgre_sql/add_postgre_sql_responses.go
diff --git a/api/managementpb/json/managementpb.json b/api/managementpb/json/managementpb.json
@@ -4626,6 +4626,11 @@
                     }
                   },
                   "x-order": 0
+                },
+                "warning": {
+                  "description": "Warning message.",
+                  "type": "string",
+                  "x-order": 4
                 }
               }
             }

diff --git a/api/managementpb/postgresql.pb.go b/api/managementpb/postgresql.pb.go
diff --git a/api/managementpb/postgresql.pb.validate.go b/api/managementpb/postgresql.pb.validate.go
diff --git a/api/managementpb/postgresql.proto b/api/managementpb/postgresql.proto
@@ -95,6 +95,8 @@ message AddPostgreSQLResponse {
   inventory.PostgresExporter postgres_exporter = 2;
   inventory.QANPostgreSQLPgStatementsAgent qan_postgresql_pgstatements_agent = 3;
   inventory.QANPostgreSQLPgStatMonitorAgent qan_postgresql_pgstatmonitor_agent = 4;
+  // Warning message.
+  string warning = 5;
 }
 
 // PostgreSQL service provides public Management API methods for PostgreSQL Service.

diff --git a/api/swagger/swagger-dev.json b/api/swagger/swagger-dev.json
@@ -22963,6 +22963,11 @@
                     }
                   },
                   "x-order": 3
+                },
+                "warning": {
+                  "description": "Warning message.",
+                  "type": "string",
+                  "x-order": 4
                 }
               }
             }

diff --git a/api/swagger/swagger.json b/api/swagger/swagger.json
@@ -19291,6 +19291,11 @@
                     }
                   },
                   "x-order": 3
+                },
+                "warning": {
+                  "description": "Warning message.",
+                  "type": "string",
+                  "x-order": 4
                 }
               }
             }

diff --git a/build/docker/rpmbuild/Dockerfile.el9 b/build/docker/rpmbuild/Dockerfile.el9
@@ -1,9 +1,9 @@
 FROM oraclelinux:9-slim
 
+RUN microdnf install -y yum
 # enable nodesource repo for nodejs
 RUN curl -sL https://rpm.nodesource.com/setup_18.x | bash -
 RUN curl -sL https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo
-RUN microdnf install -y yum
 
 RUN yum update -y && \
     yum install -y --setopt=skip_missing_names_on_install=False \

diff --git a/build/scripts/vars b/build/scripts/vars
@@ -16,6 +16,8 @@ pmm_branch=$(git rev-parse --abbrev-ref HEAD)
 
 pmm_base_version=$(cat ${root_dir}/VERSION)
 full_pmm_version=${pmm_base_version}-${pmm_branch}-$(git rev-parse --short HEAD)
+# Replace '/' with '-' to prevent sed from failing on dependabot-authored PRs
+full_pmm_version=${full_pmm_version//\//-}
 
 # TODO Maybe it makes sense to use variable from job here
 if [[ ${pmm_branch} =~ release-* || \