Merge branch 'PMM-2.0' into PMM-12462-ha-usage-telemetry

Percona-Lab · Oct 16, 2023 · a848939 · a848939
2 parents 5e5f088 + 20208e6
commit a848939
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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
+1 −0		.golangci.yml
+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