Skip to content

Commit

Permalink
Merge branch 'v3' into PMM-12573-update-ui-podman
Browse files Browse the repository at this point in the history
  • Loading branch information
BupycHuk authored Oct 14, 2024
2 parents c62c55e + 0fa80c9 commit 930ab8a
Show file tree
Hide file tree
Showing 13 changed files with 11 additions and 22 deletions.
6 changes: 1 addition & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
path = sources/postgres_exporter/src/github.com/percona/postgres_exporter
url = https://github.com/percona/postgres_exporter
branch = main
[submodule "clickhouse_exporter"]
path = sources/clickhouse_exporter/src/github.com/Percona-Lab/clickhouse_exporter
url = https://github.com/Percona-Lab/clickhouse_exporter
branch = main
[submodule "proxysql_exporter"]
path = sources/proxysql_exporter/src/github.com/percona/proxysql_exporter
url = https://github.com/percona/proxysql_exporter.git
Expand Down Expand Up @@ -55,7 +51,7 @@
[submodule "pmm-dump"]
path = sources/pmm-dump
url = https://github.com/percona/pmm-dump
branch = main
branch = v3

## PMM Tests
[submodule "pmm-qa"]
Expand Down
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
Submodule clickhouse_exporter deleted from 73e9b0
2 changes: 1 addition & 1 deletion sources/grafana-dashboards
Submodule grafana-dashboards updated 73 files
+0 −29 .github/workflows/setup-page.yml
+0 −4 README.md
+4,488 −0 dashboards/Experimental/MongoDB_Cluster_Summary_(Old).json
+0 −3,408 dashboards/Experimental/MongoDB_Cluster_Summary_(new).json
+0 −2,648 dashboards/Experimental/MongoDB_Instance_Summary_(new).json
+0 −3,259 dashboards/Experimental/MongoDB_ReplSet_Summary_(New).json
+4,327 −0 dashboards/Experimental/MongoDB_ReplSet_Summary_(Old).json
+1,309 −2,721 dashboards/MongoDB/MongoDB_Cluster_Summary.json
+671 −547 dashboards/MongoDB/MongoDB_Collections_Overview.json
+0 −1 dashboards/MongoDB/MongoDB_MMAPv1_Details.json
+212 −199 dashboards/MongoDB/MongoDB_Oplog_Details.json
+1,952 −1,906 dashboards/MongoDB/MongoDB_ReplSet_Summary.json
+1,732 −0 dashboards/MongoDB/MongoDB_Router_Summary.json
+1 −1 pmm-app/.config/.eslintrc
+1 −1 pmm-app/.eslintrc
+5 −2 pmm-app/config/jest-setup.ts
+6 −1 pmm-app/jest.config.js
+28 −25 pmm-app/package.json
+1 −1 pmm-app/src/pmm-qan/panel/components/Filters/Filters.constants.ts
+7 −5 pmm-app/src/shared/components/helpers/__snapshots__/Helpers.test.tsx.snap
+1,470 −1,498 pmm-app/yarn.lock
+0 −21 setup-page/.eslintrc
+0 −26 setup-page/.gitignore
+0 −7 setup-page/.prettierrc
+0 −2 setup-page/Makefile
+0 −22 setup-page/README.md
+ setup-page/build/favicon.56900fff.ico
+ setup-page/build/favicon.6143911e.ico
+0 −27,818 setup-page/build/index.0140dfce.js
+0 −1 setup-page/build/index.0140dfce.js.map
+0 −2 setup-page/build/index.0ae7c038.js
+0 −1 setup-page/build/index.0ae7c038.js.map
+0 −2 setup-page/build/index.13911db3.js
+0 −1 setup-page/build/index.13911db3.js.map
+0 −352 setup-page/build/index.3cb2e880.css
+0 −1 setup-page/build/index.3cb2e880.css.map
+0 −2 setup-page/build/index.69371c57.js
+0 −1 setup-page/build/index.69371c57.js.map
+0 −2 setup-page/build/index.77122661.js
+0 −1 setup-page/build/index.77122661.js.map
+0 −2 setup-page/build/index.915e2269.css
+0 −1 setup-page/build/index.915e2269.css.map
+0 −2 setup-page/build/index.a02eddff.css
+0 −1 setup-page/build/index.a02eddff.css.map
+0 −24 setup-page/build/index.html
+0 −2 setup-page/build/index.runtime.33c4f9da.js
+0 −1 setup-page/build/index.runtime.33c4f9da.js.map
+0 −2 setup-page/build/index.runtime.415a9680.js
+0 −1 setup-page/build/index.runtime.415a9680.js.map
+0 −2 setup-page/build/index.runtime.4e4175cf.js
+0 −1 setup-page/build/index.runtime.4e4175cf.js.map
+0 −2 setup-page/build/index.runtime.caf568a5.js
+0 −1 setup-page/build/index.runtime.caf568a5.js.map
+0 −1 setup-page/build/manifest.webmanifest
+0 −1 setup-page/build/pmm-logo.0bf882e7.svg
+0 −11 setup-page/build/pmm-logo.4bc613f1.svg
+0 −11 setup-page/entrypoint.sh
+0 −9,903 setup-page/package-lock.json
+0 −46 setup-page/package.json
+ setup-page/public/favicon.ico
+0 −21 setup-page/public/index.html
+0 −15 setup-page/public/manifest.json
+0 −2 setup-page/public/robots.txt
+0 −12 setup-page/src/App.constants.js
+0 −89 setup-page/src/App.jsx
+0 −12 setup-page/src/assets/pmm-logo.svg
+0 −17 setup-page/src/components/CloseIcon.jsx
+0 −11 setup-page/src/components/LoadingIcon.jsx
+0 −14 setup-page/src/components/NavBar.jsx
+0 −27 setup-page/src/components/Notification.jsx
+0 −3 setup-page/src/components/index.js
+0 −385 setup-page/src/index.css
+0 −8 setup-page/src/index.jsx
2 changes: 1 addition & 1 deletion sources/grafana/src/github.com/grafana/grafana
Submodule grafana updated 6668 files
2 changes: 1 addition & 1 deletion sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests
Submodule pmm-ui-tests updated 74 files
+2 −2 docker-compose-disconnect.yml
+16 −1 playwright-tests/api/helpers/api-helper.ts
+1 −1 playwright-tests/api/inventory.api.ts
+6 −7 playwright-tests/api/management.api.ts
+2 −1 playwright-tests/pages/page-components/network-tools.ts
+3 −4 playwright-tests/tests/configuration/api/settings.api.ts
+2 −1 tests/DbaaS/verifyDBaaSPXCCluster_test.js
+1 −1 tests/DbaaS/verifyDbaaSMongoDBCluster_test.js
+1 −1 tests/QAN/api/qanAPI.js
+2 −3 tests/QAN/overview_test.js
+25 −19 tests/QAN/timerange_test.js
+4 −3 tests/administration/serviceAccounts_test.js
+11 −10 tests/advisors/pages/api/advisorsAPI.js
+3 −3 tests/advisors/stt/checksExecution_test.js
+2 −1 tests/advisors/stt/databaseChecks_test.js
+10 −9 tests/backup/inventory_test.js
+4 −3 tests/backup/locations_test.js
+6 −4 tests/backup/mysql/inventory_mysql_test.js
+2 −1 tests/backup/mysql/scheduled_mysql_test.js
+6 −7 tests/backup/pages/api/backupAPI.js
+9 −13 tests/backup/pages/api/locationsAPI.js
+7 −10 tests/backup/pages/api/scheduledAPI.js
+3 −2 tests/backup/scheduled_test.js
+7 −7 tests/configuration/api/rolesApi.js
+1 −1 tests/configuration/pages/pmmInventoryPage.js
+4 −3 tests/configuration/verifyPMMInventory_test.js
+4 −6 tests/configuration/verifyPMMServerDisconnect_test.js
+11 −7 tests/configuration/verifyRoleBasedAccessControl_test.js
+1 −4 tests/custom_steps.js
+13 −5 tests/dashboards/pages/searchDashboardsModal.js
+1 −1 tests/dashboards/verifyMongodbDashboards_test.js
+5 −4 tests/dashboards/verifyMysqlDashboards_test.js
+7 −5 tests/dashboards/verifyPostgresqlDashboards_test.js
+2 −1 tests/helper/apiHelper.js
+57 −0 tests/helper/constants.js
+3 −2 tests/helper/grafana_helper.js
+1 −1 tests/ia/pages/api/rulesAPI.js
+3 −6 tests/ia/pages/api/templatesAPI.js
+75 −68 tests/metrics/verifyMongoDBCollectionFlags_test.js
+2 −1 tests/metrics/verifyMongoDBExperimental_test.js
+2 −2 tests/metrics/verifyMongoDB_test.js
+4 −3 tests/metrics/verifyMysqlLogLevel_test.js
+11 −1 tests/pages/adminPage.js
+2 −2 tests/pages/administration/serviceAccountsPage.js
+170 −149 tests/pages/api/addInstanceAPI.js
+1 −4 tests/pages/api/amiInstanceAPI.js
+1 −1 tests/pages/api/annotationAPI.js
+3 −3 tests/pages/api/dumpAPI.js
+62 −74 tests/pages/api/inventoryAPI.js
+2 −1 tests/pages/api/platformAPI.js
+1 −1 tests/pages/api/portalAPI.js
+22 −22 tests/pages/api/settingsAPI.js
+71 −23 tests/pages/dashboardPage.js
+1 −1 tests/product-tour/productTour_test.js
+2 −2 tests/qa-integration/pmm_pdpgsql_integration_test.js
+29 −26 tests/qa-integration/pmm_pgsm_integration_test.js
+13 −9 tests/qa-integration/pmm_pgss_integration_test.js
+5 −4 tests/qa-integration/pmm_ps_integration_test.js
+18 −14 tests/qa-integration/pmm_psmdb_integration_test.js
+6 −5 tests/qa-integration/pmm_pxc_integration_test.js
+10 −8 tests/remoteInstances/remoteInstancesHelper.js
+53 −50 tests/upgradePMM_test.js
+2 −1 tests/verifyAWSRDSMySQLInstance_test.js
+4 −3 tests/verifyAWSRDSPostgreSQLInstance_test.js
+7 −6 tests/verifyAnnotations_test.js
+3 −2 tests/verifyAuroraRemoteInstance_test.js
+3 −2 tests/verifyAzureMySQLPostgreSQLRemoteInstance_test.js
+5 −3 tests/verifyDBaaSUpgrade_test.js
+1 −1 tests/verifyInsightDashboards_test.js
+3 −2 tests/verifyOSDashboards_test.js
+4 −2 tests/verifyPTSummaryPanels_test.js
+4 −3 tests/verifyTLSMongoDBRemoteInstance_test.js
+4 −3 tests/verifyTLSMySQLRemoteInstance_test.js
+4 −3 tests/verifyTLSPostgresRemoteInstance_test.js
2 changes: 1 addition & 1 deletion sources/pmm/src/github.com/percona/pmm
Submodule pmm updated 222 files

0 comments on commit 930ab8a

Please sign in to comment.