PMM-5560 PMM Client Docker Add/Remove for mongo and Postgresql (#312)

* Remove UI tests * PMM-5560 Adding Changes for MongoDB setup script * PMM-5560 Adding Support for PGSQL 12 * PMM-5560 Adding support for PG12, workload script (#300) * Remove UI tests * PMM-5560 Adding Changes for MongoDB setup script * PMM-5560 Adding Support for PGSQL 12 * PMM-5884 Adding Support with slowlog enabled * PMM-5884 Updating docker * PMM-5884 Mongo workload script support (#301) * Remove UI tests * PMM-5560 Adding Changes for MongoDB setup script * PMM-5560 Adding Support for PGSQL 12 * PMM-5884 Adding Support with slowlog enabled * PMM-5884 Updating docker * PMM-5884 Adding Support with workload * PMM-5884 Adding support with workload (#302) * Remove UI tests * PMM-5560 Adding Changes for MongoDB setup script * PMM-5560 Adding Support for PGSQL 12 * PMM-5884 Adding Support with slowlog enabled * PMM-5884 Updating docker * PMM-5884 Adding Support with workload * PMM-5884 Mongo Support * PMM-5884 Minor support DockerFile update * PMM-5884 Support with workload script (#303) * Remove UI tests * PMM-5560 Adding Changes for MongoDB setup script * PMM-5560 Adding Support for PGSQL 12 * PMM-5884 Adding Support with slowlog enabled * PMM-5884 Updating docker * PMM-5884 Adding Support with workload * PMM-5884 Mongo Support * PMM-5884 Minor support DockerFile update * PMM-5884 * PMM-5884 * PMM-5884 Minor fix (#304) * Remove UI tests * PMM-5560 Adding Changes for MongoDB setup script * PMM-5560 Adding Support for PGSQL 12 * PMM-5884 Adding Support with slowlog enabled * PMM-5884 Updating docker * PMM-5884 Adding Support with workload * PMM-5884 Mongo Support * PMM-5884 Minor support DockerFile update * PMM-5884 * PMM-5884 * PMM-5884 Mongo arbiter, single and replica support * PMM-5560 Adding support for Replica, Arbiter and Single Mongo Deployment (#305) * Remove UI tests * PMM-5560 Adding Changes for MongoDB setup script * PMM-5560 Adding Support for PGSQL 12 * PMM-5884 Adding Support with slowlog enabled * PMM-5884 Updating docker * PMM-5884 Adding Support with workload * PMM-5884 Mongo Support * PMM-5884 Minor support DockerFile update * PMM-5884 * PMM-5884 * PMM-5884 Mongo arbiter, single and replica support * PMM-5560 * PMM-5560 (#306) * Remove UI tests * PMM-5560 Adding Changes for MongoDB setup script * PMM-5560 Adding Support for PGSQL 12 * PMM-5884 Adding Support with slowlog enabled * PMM-5884 Updating docker * PMM-5884 Adding Support with workload * PMM-5884 Mongo Support * PMM-5884 Minor support DockerFile update * PMM-5884 * PMM-5884 * PMM-5884 Mongo arbiter, single and replica support * PMM-5560 * PMM-5560 Minor fix * PMM-5560 add wait (#307) * Remove UI tests * PMM-5560 Adding Changes for MongoDB setup script * PMM-5560 Adding Support for PGSQL 12 * PMM-5884 Adding Support with slowlog enabled * PMM-5884 Updating docker * PMM-5884 Adding Support with workload * PMM-5884 Mongo Support * PMM-5884 Minor support DockerFile update * PMM-5884 * PMM-5884 * PMM-5884 Mongo arbiter, single and replica support * PMM-5560 * PMM-5560 Minor fix * PMM-5560 Adding pmm-client docker test * PMM-5560 minor fixes * PMM-5560
percona · May 26, 2020 · 29216d1 · 29216d1
1 parent de13381
commit 29216d1
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 6 deletions.
diff --git a/pmm-tests/pmm-2-0-bats-tests/pmm-client-docker-tests.bats b/pmm-tests/pmm-2-0-bats-tests/pmm-client-docker-tests.bats
@@ -10,7 +10,7 @@ fi
 run docker exec pmm-client pmm-admin list
 echo "$output"
     [ "$status" -eq 0 ]
-    [[ ${lines[0]} =~ "Service type  Service name Address and port Service ID" ]]
+    [[ ${lines[0]} =~ "Service type" ]]
     [[ ${lines[1]} =~ "ps5.7" ]]
     [[ ${lines[4]} =~ "Running" ]]
 }
@@ -36,6 +36,48 @@ echo "$output"
     [[ ${lines[0]} =~ "Service removed." ]]
 }
 
+@test "run pmm-admin add mongodb with default options" {
+if [[ $(id -u) -eq 0 ]] ; then
+        skip "Skipping this test, because you are running under root"
+fi
+run docker exec pmm-client pmm-admin add mongodb --service-name=psmdb-3.6_2  --host=psmbd-3.6 --port=27017 --server-url=http://admin:admin@pmm-server/
+echo "$output"
+    [ "$status" -eq 0 ]
+    [[ ${lines[0]} =~ "MongoDB Service added" ]]
+    [[ ${lines[2]} =~ "psmdb-3.6_2" ]]
+}
+
+@test "run pmm-admin remove mongodb" {
+if [[ $(id -u) -eq 0 ]] ; then
+        skip "Skipping this test, because you are running under root"
+fi
+run docker exec pmm-client pmm-admin remove mongodb psmdb-3.6_2
+echo "$output"
+    [ "$status" -eq 0 ]
+    [[ ${lines[0]} =~ "Service removed." ]]
+}
+
+@test "run pmm-admin add postgresql with default options" {
+if [[ $(id -u) -eq 0 ]] ; then
+        skip "Skipping this test, because you are running under root"
+fi
+run docker exec pmm-client pmm-admin add postgresql --username=postgres --password=postgres --service-name=postgres-10_2  --host=postgres-10 --port=5432 --server-url=http://admin:admin@pmm-server/
+echo "$output"
+    [ "$status" -eq 0 ]
+    [[ ${lines[0]} =~ "PostgreSQL Service added." ]]
+    [[ ${lines[2]} =~ "postgres-10_2" ]]
+}
+
+@test "run pmm-admin remove postgresql" {
+if [[ $(id -u) -eq 0 ]] ; then
+        skip "Skipping this test, because you are running under root"
+fi
+run docker exec pmm-client pmm-admin remove postgresql postgres-10_2
+echo "$output"
+    [ "$status" -eq 0 ]
+    [[ ${lines[0]} =~ "Service removed." ]]
+}
+
 function teardown() {
     echo "$output"
 }

diff --git a/pmm-tests/pmm-framework.sh b/pmm-tests/pmm-framework.sh
@@ -2105,13 +2105,20 @@ setup_pmm2_client_docker_image () {
 
   docker run -e PMM_AGENT_SERVER_ADDRESS=pmm-server:443 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_USER=pmm-agent -e MYSQL_PASSWORD=pmm-agent -d --network docker-client-check --name=ps5.7 percona:5.7
   sleep 20
-  docker exec ps5.7 mysql -u root -proot -e "SET GLOBAL slow_query_log='ON';"
-  docker exec ps5.7 mysql -u root -proot -e "SET GLOBAL long_query_time=0;"
-  docker exec ps5.7 mysql -u root -proot -e "SET GLOBAL log_slow_rate_limit=1;"
+
+  ## Add mysql instance for monitoring.
+  docker exec pmm-client pmm-admin add mysql --username=root --password=root --service-name=ps5.7 --query-source=perfschema --host=ps5.7 --port=3306 --server-url=http://admin:admin@pmm-server/
+  sleep 5
+
+  ## Add Percona Server for MongoDB instance for monitoring
+  docker run -e PMM_AGENT_SERVER_ADDRESS=pmm-server:443 -d --network docker-client-check --name=psmdb-3.6 percona:psmdb-3.6
   sleep 10
+  docker exec pmm-client pmm-admin add mongodb --service-name=psmdb-3.6  --host=psmbd-3.6 --port=27017 --server-url=http://admin:admin@pmm-server/
 
-  ## Add instance for monitoring.
-  docker exec pmm-client pmm-admin add mysql --username=root --password=root --service-name=ps5.7  --host=ps5.7 --port=3306 --server-url=http://admin:admin@pmm-server/
+  ## Add PostgreSQL instance for Monitoring
+  docker run  -e PMM_AGENT_SERVER_ADDRESS=pmm-server:443 -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -d --network docker-client-check --name=postgres-10 postgres:10
+  sleep 10
+  docker exec pmm-client pmm-admin add postgresql --username=postgres --password=postgres --service-name=postgres-10  --host=postgres-10 --port=5432 --server-url=http://admin:admin@pmm-server/
   sleep 5
 }