Merge branch 'v3' into PMM-12573-update-ui-podman

Percona-Lab · Oct 14, 2024 · 930ab8a · 930ab8a
2 parents c62c55e + 0fa80c9
commit 930ab8a
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 22 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -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
@@ -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"]

diff --git 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/clickhouse_exporter/src/github.com/Percona-Lab/clickhouse_exporter b/sources/clickhouse_exporter/src/github.com/Percona-Lab/clickhouse_exporter
diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards
diff --git a/sources/grafana/src/github.com/grafana/grafana b/sources/grafana/src/github.com/grafana/grafana
diff --git a/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter b/sources/mongodb_exporter/src/github.com/percona/mongodb_exporter
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/node_exporter/src/github.com/prometheus/node_exporter b/sources/node_exporter/src/github.com/prometheus/node_exporter
diff --git a/sources/pmm-dump b/sources/pmm-dump
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
diff --git a/sources/postgres_exporter/src/github.com/percona/postgres_exporter b/sources/postgres_exporter/src/github.com/percona/postgres_exporter