Merge branch 'v3' into PMM-13235-grafana-11

percona · Sep 10, 2024 · d0b8fba · d0b8fba
2 parents b7c37f0 + a1642a2
commit d0b8fba
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 11 deletions.
diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml
@@ -68,6 +68,10 @@ jobs:
         working-directory: ./pmm-ui-tests
         run: npm install
 
+      - name: install playwright
+        working-directory: ./pmm-ui-tests
+        run: npx playwright install
+
       - name: Run UI tests
         working-directory: ./pmm-ui-tests
         run: npm run e2e:grafana-pr

diff --git a/Makefile b/Makefile
@@ -223,7 +223,7 @@ run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild
 
 run-local-env:               ## Start local frontend with pmm-server:dev-latest
 	yarn dev
-	docker-compose up -d
+	docker compose up -d
 
 ##@ Testing
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     container_name: pmm-server
     # Temporary till we have arm builds
     platform: linux/amd64
-    image: perconalab/pmm-server:3-dev-container
+    image: ${PMM_SERVER_IMAGE:-perconalab/pmm-server:3-dev-container}
     volumes:
       - "./:/workspace"
       - "./public:/usr/share/grafana/public"
@@ -16,8 +16,8 @@ services:
     environment:
       - PMM_DEBUG=1
       - PERCONA_PORTAL_URL=https://portal-dev.percona.com
-      - PERCONA_TEST_PLATFORM_ADDRESS=https://check-dev.percona.com:443
-      - PERCONA_TEST_PLATFORM_PUBLIC_KEY=RWTkF7Snv08FCboTne4djQfN5qbrLfAjb8SY3/wwEP+X5nUrkxCEvUDJ
+      - PMM_DEV_PERCONA_PLATFORM_ADDRESS=https://check-dev.percona.com:443
+      - PMM_DEV_PERCONA_PLATFORM_PUBLIC_KEY=RWTkF7Snv08FCboTne4djQfN5qbrLfAjb8SY3/wwEP+X5nUrkxCEvUDJ
 
   mysql:
     image: percona:5.7.30

diff --git a/...na/shared/components/PerconaBootstrapper/PerconaNavigation/PerconaNavigation.constants.ts b/...na/shared/components/PerconaBootstrapper/PerconaNavigation/PerconaNavigation.constants.ts
@@ -479,7 +479,7 @@ export const PMM_NAV_MONGO: NavModelItem = {
           id: 'mongo-cluster-summary',
           text: 'Cluster summary',
           icon: 'percona-cluster',
-          url: `${config.appSubUrl}/d/mongodb-cluster-summary/mongodb-cluster-summary`,
+          url: `${config.appSubUrl}/d/mongodb-cluster-summary/mongodb-sharded-cluster-summary`,
           hideFromTabs: true,
         },
         {
@@ -489,6 +489,13 @@ export const PMM_NAV_MONGO: NavModelItem = {
           url: `${config.appSubUrl}/d/mongodb-replicaset-summary/mongodb-replset-summary`,
           hideFromTabs: true,
         },
+        {
+          id: 'mongo-router-summary',
+          text: 'Router summary',
+          icon: 'percona-cluster',
+          url: `${config.appSubUrl}/d/mongodb-router-summary/mongodb-router-summary`,
+          hideFromTabs: true,
+        },
       ],
     },
     {
@@ -499,17 +506,24 @@ export const PMM_NAV_MONGO: NavModelItem = {
       hideFromTabs: true,
     },
     {
-      id: 'mongo-mmap-details',
-      text: 'MMAPv1',
+      id: 'mondo-wiredtiger-details',
+      text: 'WiredTiger',
+      icon: 'sitemap',
+      url: `${config.appSubUrl}/d/mongodb-wiredtiger/mongodb-wiredtiger-details`,
+      hideFromTabs: true,
+    },
+    {
+      id: 'mongo-collections-overview',
+      text: 'Collections',
       icon: 'sitemap',
-      url: `${config.appSubUrl}/d/mongodb-mmapv1/mongodb-mmapv1-details`,
+      url: `${config.appSubUrl}/d/mongodb-collections-overview/mongodb-collections-overview`,
       hideFromTabs: true,
     },
     {
-      id: 'mondo-wiredtiger-details',
-      text: 'WiredTiger',
+      id: 'mongo-oplog-details',
+      text: 'Oplog',
       icon: 'sitemap',
-      url: `${config.appSubUrl}/d/mongodb-wiredtiger/mongodb-wiredtiger-details`,
+      url: `${config.appSubUrl}/d/mongodb-oplog-details/mongodb-oplog-details`,
       hideFromTabs: true,
     },
   ],