Percona-Lab · YaroslavPodorvanov · Apr 23, 2022 · Apr 24, 2022 · Apr 25, 2022 · Apr 27, 2022
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ tmp/
 results/
 .DS_Store
 .git-sources
-.vscode
+.vscode/
+.idea/
diff --git a/.gitmodules b/.gitmodules
@@ -6,14 +6,6 @@
 
 # PMM Client
 
-[submodule "pmm-admin"]
-	path = sources/pmm-admin/src/github.com/percona/pmm-admin
-	url = https://github.com/percona/pmm-admin.git
-	branch = main
-[submodule "pmm-agent"]
-	path = sources/pmm-agent/src/github.com/percona/pmm-agent
-	url = https://github.com/percona/pmm-agent.git
-	branch = main
 [submodule "node_exporter"]
 	path = sources/node_exporter/src/github.com/prometheus/node_exporter
 	url = https://github.com/percona/node_exporter.git

diff --git a/build/bin/build-client-binary b/build/bin/build-client-binary
@@ -14,9 +14,10 @@ extract_source_tarball() {
 
 gobuild_component() {
     local component=$1
-    local extract_path=${2:-"github.com/percona/$component"}
-    local component_path=$3
-    local result_file=${4:-bin/$(basename ${component_path:-$extract_path})}
+    local parent_component=${2:-$component}
+    local extract_path=${3:-"github.com/percona/$parent_component"}
+    local component_path=$4
+    local result_file=${5:-bin/$(basename ${component_path:-$extract_path})}
 
     if [ ${component} = 'azure_metrics_exporter' ]; then
         result_file=${result_file/_metrics/}
@@ -50,9 +51,9 @@ gobuild_component() {
         # for 'make release'
         export PMM_RELEASE_VERSION=${full_pmm_version}
         export PMM_RELEASE_TIMESTAMP=$(date '+%s')
-        export PMM_RELEASE_FULLCOMMIT=$(cd sources/${component}/src/${extract_path} && git rev-parse HEAD)
-        export COMPONENT_VERSION=$(cd sources/${component}/src/${extract_path} && git describe --abbrev=0 --always)
-        export COMPONENT_BRANCH=$(cd sources/${component}/src/${extract_path} && git describe --always --contains --all)
+        export PMM_RELEASE_FULLCOMMIT=$(cd sources/${parent_component}/src/${extract_path} && git rev-parse HEAD)
+        export COMPONENT_VERSION=$(cd sources/${parent_component}/src/${extract_path} && git describe --abbrev=0 --always)
+        export COMPONENT_BRANCH=$(cd sources/${parent_component}/src/${extract_path} && git describe --always --contains --all)
         export PMM_RELEASE_BRANCH=""
         sudo chown -R builder:builder /home/builder/tmp
 
@@ -63,7 +64,8 @@ gobuild_component() {
         mkdir -p \$binary_dir/bin
 
         mkdir -p /tmp/go/src/${extract_path}
-        tar -C /tmp/go/src/${extract_path} --strip-components=1 -zxpf \${source_dir}/${component}-*.tar.gz
+        archive=$(ls ${source_dir} | grep -e "${parent_component}-\w*\.tar\.gz")
+        tar -C /tmp/go/src/${extract_path} --strip-components=1 -zxpf \${source_dir}/\$archive
         pushd /tmp/go
             export GOPATH=\$(pwd -P)
             ${build_command}
@@ -92,18 +94,18 @@ copy_component() {
 main() {
     extract_source_tarball
 
-    gobuild_component "vmagent" "github.com/VictoriaMetrics/VictoriaMetrics" "app/vmagent"
-    gobuild_component "node_exporter"     "github.com/prometheus/node_exporter"
+    gobuild_component "vmagent" "" "github.com/VictoriaMetrics/VictoriaMetrics" "app/vmagent"
+    gobuild_component "node_exporter" "" "github.com/prometheus/node_exporter"
     gobuild_component "mysqld_exporter"
-    gobuild_component "postgres_exporter" "" "cmd/postgres_exporter"
+    gobuild_component "postgres_exporter" "" "" "cmd/postgres_exporter"
     gobuild_component "mongodb_exporter"
     gobuild_component "proxysql_exporter"
     gobuild_component "rds_exporter"
     gobuild_component "azure_metrics_exporter"
-    gobuild_component "clickhouse_exporter"     "github.com/Percona-Lab/clickhouse_exporter"
+    gobuild_component "clickhouse_exporter" "" "github.com/Percona-Lab/clickhouse_exporter"
 
-    gobuild_component "pmm-admin" "" "" "github.com/percona/pmm-agent/bin/pmm-admin"
-    gobuild_component "pmm-agent" "" "" "github.com/percona/pmm-agent/bin/pmm-agent"
+    gobuild_component "pmm-admin" "pmm" "" "" "github.com/percona/pmm/bin/pmm-admin"
+    gobuild_component "pmm-agent" "pmm" "" "" "github.com/percona/pmm/bin/pmm-agent"
 
     echo ${version} > ${binary_dir}/VERSION
 
@@ -120,8 +122,8 @@ main() {
 
     copy_component "percona-toolkit" "bin/pt-summary"
     copy_component "percona-toolkit" "bin/pt-mysql-summary"
-    gobuild_component "percona-toolkit" "github.com/percona/percona-toolkit" "src/go/pt-mongodb-summary"
-    gobuild_component "percona-toolkit" "github.com/percona/percona-toolkit" "src/go/pt-pg-summary"
+    gobuild_component "percona-toolkit" "" "github.com/percona/percona-toolkit" "src/go/pt-mongodb-summary"
+    gobuild_component "percona-toolkit" "" "github.com/percona/percona-toolkit" "src/go/pt-pg-summary"
 
     rm -rf ${binary_tarball}
     mkdir -p $(dirname ${binary_tarball}) || :

diff --git a/build/bin/build-client-source b/build/bin/build-client-source
@@ -68,8 +68,7 @@ main() {
 
     prepare_vmagent_tarball
     prepare_tarball pmm-submodules
-    prepare_tarball pmm-admin
-    prepare_tarball pmm-agent
+    prepare_tarball pmm
     prepare_tarball mongodb_exporter
     prepare_tarball mysqld_exporter
     prepare_tarball postgres_exporter

diff --git a/build/bin/create-tags.py b/build/bin/create-tags.py
@@ -6,8 +6,6 @@
 REPOS = [
     "sources/grafana/src/github.com/grafana/grafana",
     "sources/grafana-dashboards",
-    "sources/pmm-admin/src/github.com/percona/pmm-admin",
-    "sources/pmm-agent/src/github.com/percona/pmm-agent",
     "sources/pmm-managed/src/github.com/percona/pmm-managed",
     "sources/pmm-server",
     "sources/pmm-update/src/github.com/percona/pmm-update",

@@ -7,18 +7,6 @@ deps:
     component: common
 
   # CLIENT
-  - name: pmm-admin
-    branch: main
-    path: sources/pmm-admin/src/github.com/percona/pmm-admin
-    url: https://github.com/percona/pmm-admin
-    component: client
-
-  - name: pmm-agent
-    branch: main
-    path: sources/pmm-agent/src/github.com/percona/pmm-agent
-    url: https://github.com/percona/pmm-agent
-    component: client
-
   - name: node_exporter
     branch: main
     path: sources/node_exporter/src/github.com/prometheus/node_exporter

diff --git a/ci.yml b/ci.yml
@@ -0,0 +1,6 @@
+deps:
+  - name: pmm
+    branch: PMM-9968-pmm-admin-inventory-with-log-level
+
+  - name: pmm-managed
+    branch: PMM-9968-pmm-admin-inventory-with-log-level
diff --git a/sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller b/sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller
diff --git a/sources/pmm-admin/src/github.com/percona/pmm-admin b/sources/pmm-admin/src/github.com/percona/pmm-admin
diff --git a/sources/pmm-agent/src/github.com/percona/pmm-agent b/sources/pmm-agent/src/github.com/percona/pmm-agent
diff --git a/sources/pmm-dump b/sources/pmm-dump
diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed
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-update/src/github.com/percona/pmm-update b/sources/pmm-update/src/github.com/percona/pmm-update
diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
+19 −0		README.md
+11 −2		cmd/pmm-dump/main.go
+18 −15		cmd/pmm-dump/util.go
+2 −0		pkg/transferer/meta.go
+2 −0		pkg/transferer/transferer.go
+1 −1		go.mod
+2 −2		go.sum
+9 −6		services/management/ia/alerts_service.go
+19 −1		services/management/ia/alerts_service_test.go
+10 −0		utils/envvars/parser.go
+21 −0		utils/envvars/parser_test.go
+12 −13		pmm-tests/minikube_operators_setup.sh
+1 −1		pmm-tests/pg_stat_monitor_setup.sh
+1 −1		pmm-tests/pgsql_pgsm_setup.yml
+1 −1		README.md
+2 −1		codeceptConfigHelper.js
+0 −11		linksHelper.js
+50 −47		tests/DbaaS/verifyDBaaSPXCCluster_test.js
+0 −1		tests/QAN/pages/qanOverviewFragment.js
+1 −1		tests/backup/scheduled_test.js
+19 −0		tests/helper/linksHelper.js
+1 −1		tests/pages/api/platformAPI.js
+137 −67		tests/pages/pmmSettingsPage.js
+13 −3		tests/qa-integration/pmm_pgsm_integration_test.js
+69 −12		tests/verifyPMMSettingsPageFunctionality_test.js