Merge branch 'PMM-2.0' into dependabot/pip/gitpython-3.1.41

Percona-Lab · Jan 17, 2024 · a06d685 · a06d685
2 parents 0519d79 + 4e9993a
commit a06d685
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,7 +16,7 @@
 [submodule "mongodb_exporter"]
 	path = sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
 	url = https://github.com/percona/mongodb_exporter.git
-	branch = release-0.40.0
+	branch = main
 [submodule "postgres_exporter"]
 	path = sources/postgres_exporter/src/github.com/percona/postgres_exporter
 	url = https://github.com/percona/postgres_exporter

diff --git a/ci-default.yml b/ci-default.yml
@@ -20,7 +20,7 @@ deps:
     component: client
 
   - name: mongodb_exporter
-    branch: release-0.40.0
+    branch: main
     path: sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
     url: https://github.com/percona/mongodb_exporter
     component: client

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-pyaml==23.9.5
 GitPython==3.1.41
+pyaml==23.12.0
 PyGithub==1.59.1
diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards
diff --git a/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter b/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
diff --git a/sources/pmm-qa/src/github.com/percona/pmm-qa b/sources/pmm-qa/src/github.com/percona/pmm-qa
diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
diff --git a/sources/postgres_exporter/src/github.com/percona/postgres_exporter b/sources/postgres_exporter/src/github.com/percona/postgres_exporter
+1 −1		pmm-tests/product_version_download_helper
+1 −1		pmm-tests/psmdb_setup.sh
+1 −1		.golangci.yml
+33 −3		agent/connectionchecker/connection_checker.go
+5 −19		agent/serviceinfobroker/service_info_broker.go
+0 −3		agent/serviceinfobroker/service_info_broker_test.go
+46 −0		agent/utils/version/mongo.go
+3 −0		api/managementpb/json/client/rds/add_rds_responses.go
+5 −0		api/managementpb/json/managementpb.json
+91 −79		api/managementpb/rds.pb.go
+2 −0		api/managementpb/rds.pb.validate.go
+2 −0		api/managementpb/rds.proto
+5 −0		api/swagger/swagger-dev.json
+5 −0		api/swagger/swagger.json
+12 −13		go.mod
+22 −23		go.sum
+8 −4		managed/services/agents/mongodb.go
+155 −0		managed/services/agents/mongodb_test.go
+1 −1		managed/services/agents/service_info_broker.go
+17 −15		managed/services/management/rds.go
+7 −2		managed/services/victoriametrics/scrape_configs.go
+2 −2		managed/services/victoriametrics/scrape_configs_test.go
+17 −17		managed/utils/platform/client.go
+6 −6		tools/go.mod
+12 −12		tools/go.sum
+1 −1		.github/workflows/go.yml
+1 −1		.github/workflows/golangci-lint.yml
+1 −1		collector/pg_wal.go
+3 −3		go.mod
+6 −8		go.sum
+19 −18		tools/go.mod
+44 −33		tools/go.sum