Merge branch 'PMM-2.0' into PMM-12078-HA-Phase-3-Active-Active-PoC

Percona-Lab · Oct 17, 2023 · 4377b16 · 4377b16
2 parents 2aace4b + 9227ff0
commit 4377b16
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter b/sources/mysqld_exporter/src/github.com/percona/mysqld_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-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests
diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
+7 −1		pmm-tests/check_upgrade.py
+2 −0		pmm-tests/product_version_download_helper
+6 −1		pmm-tests/psmdb_setup.sh
+51 −3		tests/configuration/pages/pmmInventoryPage.js
+311 −0		tests/configuration/verifyPMMInventory_test.js
+106 −74		tests/pages/remoteInstancesPage.js
+1 −0		tests/remoteInstances/remoteInstancesHelper.js
+1 −0		.golangci.yml
+60 −57		cli-tests/package-lock.json
+3 −3		cli-tests/package.json
+1 −1		managed/services/config/config.go
+2 −0		managed/services/config/pmm-managed.yaml
+33 −0		managed/services/telemetry/config.default.yml
+34 −16		managed/services/telemetry/config.go
+6 −6		managed/services/telemetry/config_test.go
+84 −0		managed/services/telemetry/datasource_envvars.go
+151 −0		managed/services/telemetry/datasource_envvars_test.go
+1 −1		managed/services/telemetry/datasource_grafana_sqlitedb.go
+1 −1		managed/services/telemetry/datasource_grafana_sqlitedb_test.go
+1 −1		managed/services/telemetry/datasource_pmmdb_select.go
+1 −1		managed/services/telemetry/datasource_qandb_select.go
+7 −4		managed/services/telemetry/datasources.go
+22 −14		managed/services/telemetry/telemetry.go
+5 −12		managed/services/telemetry/telemetry_test.go
+23 −2		managed/services/telemetry/transform.go
+127 −18		managed/services/telemetry/transform_test.go
+1 −1		update/ansible/playbook/tasks/roles/clickhouse/defaults/main.yml
+461 −124		update/ansible/playbook/tasks/roles/clickhouse/files/config.xml
+10 −1		update/ansible/playbook/tasks/roles/clickhouse/tasks/main.yml