Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PMM-12899 Use module and build cache #3595

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# CI build related
build/pmm-server-docker/RPMS/
*.swp
*~
tmp/
results/
.DS_Store
.git-sources
go-build/
go-path/

# editors
.vscode/
.idea/
6 changes: 0 additions & 6 deletions ci-default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ deps:
url: https://github.com/percona/postgres_exporter
component: client

- name: clickhouse_exporter
branch: main
path: sources/clickhouse_exporter/src/github.com/Percona-Lab/clickhouse_exporter
url: https://github.com/Percona-Lab/clickhouse_exporter
component: client

- name: proxysql_exporter
branch: main
path: sources/proxysql_exporter/src/github.com/percona/proxysql_exporter
Expand Down
3 changes: 3 additions & 0 deletions ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
deps:
- name: pmm
branch: PMM-12899-use-module-and-build-cache
2 changes: 1 addition & 1 deletion sources/grafana-dashboards
2 changes: 1 addition & 1 deletion sources/grafana/src/github.com/grafana/grafana
Submodule grafana updated 12942 files
Submodule mongodb_exporter updated 53 files
+3 −3 .github/workflows/release.yml
+6 −5 .goreleaser.yml
+25 −0 CHANGELOG
+9 −3 CONTRIBUTING.md
+6 −3 Makefile
+19 −2 README.md
+33 −29 REFERENCE.md
+84 −25 docker-compose.yml
+7 −0 docker/mongodb-auth.dockerfile
+4 −0 docker/pbm/config/pbm.yaml
+4 −0 docker/scripts/init-shard.sh
+15 −0 docker/scripts/setup-pbm.sh
+10 −1 docker/scripts/setup.sh
+16 −0 docker/secret/keyfile
+2 −2 exporter/base_collector.go
+6 −2 exporter/collstats_collector.go
+2 −1 exporter/common.go
+11 −13 exporter/currentop_collector.go
+12 −10 exporter/currentop_collector_test.go
+1 −1 exporter/dbstats_collector.go
+2 −2 exporter/debug.go
+1 −1 exporter/debug_test.go
+65 −33 exporter/diagnostic_data_collector.go
+78 −2 exporter/diagnostic_data_collector_test.go
+67 −39 exporter/exporter.go
+39 −53 exporter/exporter_test.go
+80 −0 exporter/feature_compatibility_version_collector.go
+89 −0 exporter/feature_compatibility_version_collector_test.go
+59 −0 exporter/gatherer_wrapper.go
+23 −11 exporter/general_collector.go
+74 −25 exporter/general_collector_test.go
+6 −1 exporter/indexstats_collector.go
+0 −1 exporter/metrics.go
+66 −4 exporter/multi_target_test.go
+203 −0 exporter/pbm_collector.go
+66 −0 exporter/pbm_collector_test.go
+3 −4 exporter/profile_status_collector.go
+1 −1 exporter/replset_status_collector.go
+88 −0 exporter/seedlist.go
+52 −0 exporter/seedlist_test.go
+80 −6 exporter/server.go
+77 −1 exporter/shards_collector.go
+2 −2 exporter/top_collector.go
+5 −2 exporter/topology_info.go
+36 −117 exporter/v1_compatibility.go
+52 −13 exporter/v1_compatibility_test.go
+51 −27 go.mod
+150 −476 go.sum
+53 −0 internal/tu/testutils.go
+70 −13 main.go
+67 −6 main_test.go
+87 −111 tools/go.mod
+197 −250 tools/go.sum
Submodule percona-toolkit updated 942 files
2 changes: 1 addition & 1 deletion sources/pmm-dump
Submodule pmm-dump updated 64 files
+3 −1 .env.example
+3 −3 .github/workflows/ci.yml
+5 −1 Makefile
+41 −34 cmd/pmm-dump/main.go
+24 −26 cmd/pmm-dump/util.go
+1 −1 docker-compose.yaml
+130 −33 go.mod
+372 −93 go.sum
+30 −15 internal/test/README.md
+342 −0 internal/test/deployment/container.go
+104 −0 internal/test/deployment/controller.go
+90 −0 internal/test/deployment/env.go
+69 −0 internal/test/deployment/exec.go
+113 −0 internal/test/deployment/image.go
+57 −0 internal/test/deployment/naming.go
+64 −0 internal/test/deployment/ping.go
+491 −0 internal/test/deployment/pmm.go
+30 −11 internal/test/e2e/basic_test.go
+20 −11 internal/test/e2e/contentlimit_test.go
+172 −0 internal/test/e2e/dashboard_test.go
+4 −4 internal/test/e2e/errmsg_test.go
+76 −0 internal/test/e2e/main_test.go
+100 −33 internal/test/e2e/qan_test.go
+4,705 −0 internal/test/e2e/testdata/dashboards/pmm-home-with-const.json
+2,639 −0 internal/test/e2e/testdata/dashboards/se-98-dashboard.json
+ internal/test/e2e/testdata/onlymeta.tar.gz
+0 −0 internal/test/e2e/testdata/versions.yaml
+114 −45 internal/test/e2e/validate_test.go
+34 −33 internal/test/e2e/version_test.go
+3 −1 internal/test/util/binary.go
+0 −345 internal/test/util/pmm.go
+39 −0 internal/test/util/retry.go
+11 −4 internal/test/util/util.go
+12 −10 pkg/clickhouse/source.go
+2 −1 pkg/grafana/client/client.go
+0 −152 pkg/grafana/dashboards.go
+35 −0 pkg/grafana/expr/globalvar.go
+252 −0 pkg/grafana/expr/vm.go
+80 −0 pkg/grafana/expr/vmquery.go
+193 −0 pkg/grafana/expr/vmtmpl.go
+139 −0 pkg/grafana/grafana.go
+0 −141 pkg/grafana/selectors.go
+158 −0 pkg/grafana/templating/interpolate.go
+51 −0 pkg/grafana/templating/templating.go
+82 −0 pkg/grafana/types/types.go
+2 −2 pkg/transferer/export.go
+1 −1 pkg/transferer/export_test.go
+8 −1 pkg/transferer/import.go
+4 −4 pkg/transferer/import_test.go
+20 −46 pkg/transferer/load.go
+1 −1 pkg/transferer/meta.go
+5 −2 pkg/transferer/transferer.go
+2 −0 pkg/transferer/transferer_test.go
+5 −3 pkg/util/util.go
+1 −1 pkg/victoriametrics/config.go
+30 −0 pkg/victoriametrics/metric.go
+8 −24 pkg/victoriametrics/source.go
+3 −3 pkg/victoriametrics/source_test.go
+43 −0 pkg/victoriametrics/util.go
+10 −34 setup/test/init-test-configs.sh
+15 −0 support-files/destroy-test-resources
+3 −23 support-files/run-tests
+114 −130 tools/go.mod
+262 −387 tools/go.sum
2 changes: 1 addition & 1 deletion sources/pmm-qa/src/github.com/percona/pmm-qa
Submodule pmm-qa updated 45 files
+60 −0 .github/workflows/e2e-tests.yml
+130 −0 .github/workflows/e2e-upgrade-tests-matrix-full.yml
+122 −0 .github/workflows/e2e-upgrade-tests-matrix.yml
+153 −0 .github/workflows/e2e-upgrade-tests.yml
+289 −0 .github/workflows/fb-e2e-suite.yml
+71 −0 .github/workflows/fb-integration-suite.yml
+79 −0 .github/workflows/fb-tarball-suite.yml
+114 −0 .github/workflows/helm-tests.yml
+374 −0 .github/workflows/integration-cli-tests.yml
+97 −0 .github/workflows/package-test-fb.yml
+160 −0 .github/workflows/package-test-matrix-full.yml
+75 −0 .github/workflows/package-test-matrix.yml
+115 −0 .github/workflows/package-test-single.yml
+116 −0 .github/workflows/pmm-version-getter.yml
+0 −148 .github/workflows/pmm2-integration-tests.yml
+84 −0 .github/workflows/pmm3-upgrade-tests.yml
+205 −0 .github/workflows/runner-e2e-tests-codeceptjs.yml
+192 −0 .github/workflows/runner-e2e-tests-playwright.yml
+264 −0 .github/workflows/runner-e2e-tests-podman.yml
+436 −0 .github/workflows/runner-e2e-upgrade-tests.yml
+156 −0 .github/workflows/runner-integration-cli-tests.yml
+321 −0 .github/workflows/runner-package-test.yml
+0 −13 .github/workflows/testsuite.yml
+90 −0 .github/workflows/v3-cron-fb-daily.yml
+1 −0 .gitignore
+6 −0 pmm-integration/postgres/addClientPdPgsql.ts
+2 −2 pmm-tests/check_and_restart_mysql.sh
+7 −1 pmm-tests/client_container_ms_setup.sh
+1 −1 pmm-tests/ms_pmm_setup.yml
+0 −238 pmm-tests/pmm-2-0-bats-tests/helm-test.bats
+177 −0 pmm-tests/pmm-2-0-bats-tests/k8s/helm-test.bats
+39 −0 pmm-tests/pmm-2-0-bats-tests/k8s/k8s_helper.sh
+34 −0 pmm-tests/pmm-2-0-bats-tests/k8s/pmm_helper.sh
+0 −23 pmm-tests/pmm-2-0-bats-tests/k8s_helper.sh
+23 −0 pmm-tests/pmm-2-0-bats-tests/setup_bats_libs.sh
+44 −56 pmm-tests/pmm-framework.sh
+5 −5 pmm-tests/pmm2-client-setup-centos.sh
+41 −32 pmm-tests/pmm2-client-setup.sh
+3 −3 pmm-tests/product_version_download_helper
+49 −53 pmm-tests/psmdb_setup.sh
+16 −20 pmm-tests/psmdb_setup.yml
+23 −20 pmm-tests/tls-ssl-setup/mongodb/mongodb_ssl_setup.sh
+3 −7 pmm-tests/tls-ssl-setup/mongodb_tls_setup.yml
+2 −1 pmm-tests/tls-ssl-setup/mysql/mysql_ssl_setup.sh
+1 −1 pmm-tests/tls-ssl-setup/postgres/setup_pgsql.sh
2 changes: 1 addition & 1 deletion sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests
Submodule pmm-ui-tests updated 75 files
+1 −1 .github/CODEOWNERS
+7 −7 cli/package-lock.json
+1 −1 cli/tests/generic.spec.ts
+2 −2 cli/tests/pmm-client-docker.spec.ts
+5 −3 cli/tests/pmm-server-only.spec.ts
+3 −3 cli/tests/remove.spec.ts
+4 −4 docker-compose.yml
+13,192 −4,648 package-lock.json
+29 −29 package.json
+5 −6 playwright-tests/api/okta.api.ts
+6 −4 playwright-tests/helpers/portal-helper.ts
+4 −1 playwright-tests/helpers/types/portal-user.class.ts
+20 −47 playwright-tests/package-lock.json
+4 −4 playwright-tests/package.json
+2 −1 playwright-tests/pages/home-dashboard.page.ts
+8 −0 playwright-tests/pages/page-components/pmm-upgrade-widget.ts
+1 −1 playwright-tests/playwright.config.ts
+2 −2 playwright-tests/tests/portal/connect-portal.spec.ts
+2 −2 playwright-tests/tests/portal/users-cleanup.spec.ts
+3 −2 pr.codecept.js
+1 −1 tests/QAN/common_test.js
+5 −3 tests/QAN/details_test.js
+2 −2 tests/QAN/filters_test.js
+3 −4 tests/QAN/overview_test.js
+1 −0 tests/QAN/pages/qanDetailsFragment.js
+2 −2 tests/QAN/pages/qanFiltersFragment.js
+1 −1 tests/QAN/pagination_test.js
+30 −25 tests/QAN/timerange_test.js
+8 −0 tests/addAmiInstanceId_test.js
+3 −3 tests/backup/inventory_test.js
+6 −7 tests/backup/locations_test.js
+2 −2 tests/backup/pages/testData.js
+11 −6 tests/backup/scheduled_test.js
+3 −3 tests/configuration/pages/paginationFragment.js
+1 −1 tests/configuration/pages/pmmInventoryPage.js
+6 −12 tests/configuration/pages/pmmSettingsPage.js
+60 −20 tests/configuration/verifyPMMInventory_test.js
+53 −3 tests/configuration/verifyPMMSettingsPageElements_test.js
+6 −4 tests/configuration/verifyPMMSettingsPageFunctionality_test.js
+57 −1 tests/custom_steps.js
+12 −4 tests/dashboards/pages/searchDashboardsModal.js
+32 −6 tests/dashboards/verifyMongodbDashboards_test.js
+14 −1 tests/dashboards/verifyMysqlDashboards_test.js
+53 −0 tests/dockerConfiguration/pmmClientDockerMultiArch_test.js
+3 −1 tests/helper/file_helper.js
+22 −2 tests/helper/grafana_helper.js
+1 −1 tests/ia/alertRules_test.js
+3 −3 tests/ia/common_test.js
+10 −4 tests/ia/pages/iaCommonPage.js
+7 −7 tests/ia/pagination_test.js
+5 −5 tests/ia/ruleTemplates_test.js
+0 −4 tests/leftNavigation_test.js
+68 −64 tests/metrics/verifyMongoDBCollectionFlags_test.js
+19 −21 tests/metrics/verifyMongoDBExperimental_test.js
+2 −2 tests/metrics/verifyMongoDB_test.js
+2 −9 tests/metrics/verifyMysqlLogLevel_test.js
+10 −0 tests/pages/adminPage.js
+38 −0 tests/pages/api/addInstanceAPI.js
+4 −4 tests/pages/api/inventoryAPI.js
+2 −0 tests/pages/api/settingsAPI.js
+4 −0 tests/pages/credentials.js
+257 −44 tests/pages/dashboardPage.js
+7 −4 tests/pages/homePage.js
+4 −2 tests/pages/leftNavMenu.js
+0 −1 tests/pages/menuTemplates.js
+22 −57 tests/pages/remoteInstancesPage.js
+34 −0 tests/qa-integration/pmm_ps_integration_test.js
+52 −18 tests/qa-integration/pmm_psmdb_integration_test.js
+4 −2 tests/remoteInstances/remoteInstancesHelper.js
+40 −0 tests/serverLogs_test.js
+44 −43 tests/upgradePMM_test.js
+2 −3 tests/verifyAWSRDSPostgreSQLInstance_test.js
+3 −3 tests/verifyAnnotations_test.js
+1 −2 tests/verifyMongodbSharding_test.js
+26 −4 tests/verifyTLSMySQLRemoteInstance_test.js
2 changes: 1 addition & 1 deletion sources/pmm/src/github.com/percona/pmm
Submodule pmm updated 1687 files