Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/PMM-2.0' into PMM-7-fb-test-latest
Browse files Browse the repository at this point in the history
  • Loading branch information
tshcherban committed Jan 19, 2023
2 parents 8eabde0 + 9844942 commit c1ed8a8
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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.35.0
branch = release-0.36.0
[submodule "postgres_exporter"]
path = sources/postgres_exporter/src/github.com/percona/postgres_exporter
url = https://github.com/percona/postgres_exporter
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.34.0
2.35.0
2 changes: 1 addition & 1 deletion ci-default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ deps:
component: client

- name: mongodb_exporter
branch: release-0.35.0
branch: release-0.36.0
path: sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
url: https://github.com/percona/mongodb_exporter
component: client
Expand Down
2 changes: 1 addition & 1 deletion sources/grafana/src/github.com/grafana/grafana
Submodule mysqld_exporter updated 1 files
+7 −0 Makefile
Submodule node_exporter updated 1 files
+7 −0 Makefile
2 changes: 1 addition & 1 deletion sources/pmm-qa/src/github.com/percona/pmm-qa
Submodule pmm-qa updated 38 files
+153 −0 .github/workflows/pmm2-integration-tests.yml
+1 −0 .gitignore
+6 −0 package-lock.json
+99 −0 pmm-integration/.eslintrc
+15 −0 pmm-integration/README.md
+111 −0 pmm-integration/availableArgs.ts
+91 −0 pmm-integration/helpers/commandLine.ts
+27 −0 pmm-integration/helpers/docker.ts
+8 −0 pmm-integration/helpers/setupParameters.interface.ts
+17 −0 pmm-integration/helpers/validateArgs.ts
+74 −0 pmm-integration/integration-setup.ts
+107 −0 pmm-integration/mongoDb/mongo_psmdb_setup/psmdb_setup.sh
+98 −0 pmm-integration/mongoDb/mongo_psmdb_setup/psmdb_setup.yml
+49 −0 pmm-integration/mongoDb/mongo_psmdb_setup/setup_pmm_psmdb_integration.sh
+10 −0 pmm-integration/mongoDb/mongo_replica_for_backup/setup_mongo_replica_for_backup.sh
+28 −0 pmm-integration/mongoDb/mongodb_user_setup.js
+72 −0 pmm-integration/mysql/pmm_ps_integration/client_container_ps_setup.sh
+36 −0 pmm-integration/mysql/pmm_ps_integration/pmm_ps_integration.sh
+70 −0 pmm-integration/mysql/pmm_ps_integration/ps_pmm_setup.yml
+9 −0 pmm-integration/otherConfigs/clearAllSetups.ts
+18 −0 pmm-integration/otherConfigs/haproxy/haproxy.cfg
+30 −0 pmm-integration/otherConfigs/haproxy/haproxy_setup.sh
+75 −0 pmm-integration/otherConfigs/haproxy/haproxy_setup.yml
+21 −0 pmm-integration/otherConfigs/haproxy/pmm-haproxy-setup.sh
+9 −0 pmm-integration/otherConfigs/installDockerCompose.ts
+5,666 −0 pmm-integration/package-lock.json
+21 −0 pmm-integration/package.json
+51 −0 pmm-integration/pmmClient/pmm2ClientTarbal.ts
+49 −0 pmm-integration/postgres/pgsql-vacuum-setup.ts
+115 −0 pmm-integration/postgres/pgsql_pgsm_setup/pg_stat_monitor_setup.sh
+10 −0 pmm-integration/postgres/pgsql_pgsm_setup/pgsm_run_queries.sh
+86 −0 pmm-integration/postgres/pgsql_pgsm_setup/pgsql_pgsm_setup.yml
+30 −0 pmm-integration/postgres/pgsql_pgsm_setup/setup_pmm_pgsm_integration.ts
+91 −0 pmm-integration/postgres/pgsql_pgss_setup/pg_stat_statements_setup.sh
+78 −0 pmm-integration/postgres/pgsql_pgss_setup/pgsql_pgss_setup.yml
+10 −0 pmm-integration/tsconfig.json
+2 −2 pmm-tests/check_upgrade.py
+23 −23 pmm-tests/mongodb_user_setup.js
2 changes: 1 addition & 1 deletion sources/pmm/src/github.com/percona/pmm
Submodule pmm updated 114 files
Submodule proxysql_exporter updated 1 files
+6 −0 Makefile
2 changes: 1 addition & 1 deletion sources/rds_exporter/src/github.com/percona/rds_exporter
Submodule rds_exporter updated 3 files
+7 −0 Makefile
+1 −0 VERSION
+1 −0 main.go

0 comments on commit c1ed8a8

Please sign in to comment.