From fb2abd38d7c469b4d5cef5e43f6f1b268c9fc447 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Thu, 21 Mar 2024 05:24:34 +0300 Subject: [PATCH 1/4] PMM-12899 Use module and build cache --- ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci.yml b/ci.yml index e69de29bb2d1..e5668a0556ea 100644 --- a/ci.yml +++ b/ci.yml @@ -0,0 +1,3 @@ +deps: + - name: pmm + branch: PMM-12899-use-module-and-build-cache From 97ca69cca341801ae355a65dde96183e423f65ca Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Thu, 21 Mar 2024 05:26:51 +0300 Subject: [PATCH 2/4] PMM-12899 add more files to .gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 65175e055dea..d1d879bfd4ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +# CI build related build/pmm-server-docker/RPMS/ *.swp *~ @@ -5,5 +6,9 @@ tmp/ results/ .DS_Store .git-sources +go-build/ +go-path/ + +# editors .vscode/ .idea/ From 776c248156797798dd2908cb8ec82332e659c8c5 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Thu, 21 Mar 2024 13:10:32 +0300 Subject: [PATCH 3/4] PMM-12899 trigger the build From 261614bfdf800d5f6ddec67b96e16612e402f58c Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Sat, 19 Oct 2024 21:28:02 +0300 Subject: [PATCH 4/4] PMM-12899 remove clickhouse_exporter --- ci-default.yml | 6 ------ sources/grafana-dashboards | 2 +- sources/grafana/src/github.com/grafana/grafana | 2 +- .../src/github.com/percona/mongodb_exporter | 2 +- .../mysqld_exporter/src/github.com/percona/mysqld_exporter | 2 +- .../node_exporter/src/github.com/prometheus/node_exporter | 2 +- .../percona-toolkit/src/github.com/percona/percona-toolkit | 2 +- sources/pmm-dump | 2 +- sources/pmm-qa/src/github.com/percona/pmm-qa | 2 +- sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests | 2 +- sources/pmm/src/github.com/percona/pmm | 2 +- .../src/github.com/percona/postgres_exporter | 2 +- .../src/github.com/percona/proxysql_exporter | 2 +- sources/rds_exporter/src/github.com/percona/rds_exporter | 2 +- 14 files changed, 13 insertions(+), 19 deletions(-) diff --git a/ci-default.yml b/ci-default.yml index b7dba7f4332b..9bf5643d53f0 100644 --- a/ci-default.yml +++ b/ci-default.yml @@ -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 diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards index b1257b6df923..3b2494f299d6 160000 --- a/sources/grafana-dashboards +++ b/sources/grafana-dashboards @@ -1 +1 @@ -Subproject commit b1257b6df9237aa53928080929cecde62c5c0641 +Subproject commit 3b2494f299d668ef16306b0cb43805013910d27a diff --git a/sources/grafana/src/github.com/grafana/grafana b/sources/grafana/src/github.com/grafana/grafana index f283b87d773d..6b522eb9be6a 160000 --- a/sources/grafana/src/github.com/grafana/grafana +++ b/sources/grafana/src/github.com/grafana/grafana @@ -1 +1 @@ -Subproject commit f283b87d773da4ad61ca65660e72c084ac8f8716 +Subproject commit 6b522eb9be6aaf0b85d6bf8fb27e75dd76338308 diff --git a/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter b/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter index a6e2d249e764..abcde29f4927 160000 --- a/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter +++ b/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter @@ -1 +1 @@ -Subproject commit a6e2d249e764f7ca7f3903d8baeac262c531cf85 +Subproject commit abcde29f492712996d6409018c2e11bf2566080f diff --git a/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter b/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter index 37633759a766..70740e148536 160000 --- a/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter +++ b/sources/mysqld_exporter/src/github.com/percona/mysqld_exporter @@ -1 +1 @@ -Subproject commit 37633759a76607c8ce0fe951ca1356e3e3c4c7e6 +Subproject commit 70740e148536e452af59602f5e9507358d229fce diff --git a/sources/node_exporter/src/github.com/prometheus/node_exporter b/sources/node_exporter/src/github.com/prometheus/node_exporter index 4cc37bc4cd40..80d7128dfe7a 160000 --- a/sources/node_exporter/src/github.com/prometheus/node_exporter +++ b/sources/node_exporter/src/github.com/prometheus/node_exporter @@ -1 +1 @@ -Subproject commit 4cc37bc4cd4094150c902b9bdcd916d8456656af +Subproject commit 80d7128dfe7ad43b0cf748d83066d118cc88debd diff --git a/sources/percona-toolkit/src/github.com/percona/percona-toolkit b/sources/percona-toolkit/src/github.com/percona/percona-toolkit index c1ba474a8496..a4f1f4d6bd55 160000 --- a/sources/percona-toolkit/src/github.com/percona/percona-toolkit +++ b/sources/percona-toolkit/src/github.com/percona/percona-toolkit @@ -1 +1 @@ -Subproject commit c1ba474a84963f3fb58608849fdcba4f96c2d872 +Subproject commit a4f1f4d6bd552f6b00694b6d697cf2aece163073 diff --git a/sources/pmm-dump b/sources/pmm-dump index e85f85c441ce..6ee5d7a6e439 160000 --- a/sources/pmm-dump +++ b/sources/pmm-dump @@ -1 +1 @@ -Subproject commit e85f85c441cefaccaa9048dd88c403d4a4e2373d +Subproject commit 6ee5d7a6e439dff50247448f1c8b0f4b1b2dd5d7 diff --git a/sources/pmm-qa/src/github.com/percona/pmm-qa b/sources/pmm-qa/src/github.com/percona/pmm-qa index 48f03d7b4ddc..5361d947b861 160000 --- a/sources/pmm-qa/src/github.com/percona/pmm-qa +++ b/sources/pmm-qa/src/github.com/percona/pmm-qa @@ -1 +1 @@ -Subproject commit 48f03d7b4ddc393cfaf2a1fbfd091223d9b3abd5 +Subproject commit 5361d947b86150e59e921cf3ac54e645692cf891 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 index 4c90620bc118..78fc1fa55241 160000 --- a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests +++ b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests @@ -1 +1 @@ -Subproject commit 4c90620bc118dde39c38a795af26fa84938dc405 +Subproject commit 78fc1fa55241dd2b5e7dfca7ea390f0919ad74c8 diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm index f9fd3a773f75..f35a85f16afa 160000 --- a/sources/pmm/src/github.com/percona/pmm +++ b/sources/pmm/src/github.com/percona/pmm @@ -1 +1 @@ -Subproject commit f9fd3a773f757c4cdfedc86681093eabdf6095d3 +Subproject commit f35a85f16afa21f964837605f5194f0094f0ed99 diff --git a/sources/postgres_exporter/src/github.com/percona/postgres_exporter b/sources/postgres_exporter/src/github.com/percona/postgres_exporter index 0ad955de4788..54c79bb5dd57 160000 --- a/sources/postgres_exporter/src/github.com/percona/postgres_exporter +++ b/sources/postgres_exporter/src/github.com/percona/postgres_exporter @@ -1 +1 @@ -Subproject commit 0ad955de47885b011f8b0782dcfbd37d49b3fdec +Subproject commit 54c79bb5dd576f66a4ceaf29033400fd49759a89 diff --git a/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter b/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter index f1c6d315e511..d6f850e938a4 160000 --- a/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter +++ b/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter @@ -1 +1 @@ -Subproject commit f1c6d315e511a1a69169aa758d063e5890ebad5d +Subproject commit d6f850e938a451b5f3c7744142e88dc76fae46fc diff --git a/sources/rds_exporter/src/github.com/percona/rds_exporter b/sources/rds_exporter/src/github.com/percona/rds_exporter index d206d79acfd8..0dccbce9a196 160000 --- a/sources/rds_exporter/src/github.com/percona/rds_exporter +++ b/sources/rds_exporter/src/github.com/percona/rds_exporter @@ -1 +1 @@ -Subproject commit d206d79acfd8596a7aa4ecec7952a5e914a942e9 +Subproject commit 0dccbce9a196f1416a09d90ef975e4216f72c5ee