Merge branch 'PMM-2.0' into PMM-12712-shards-info

Percona-Lab · Jan 2, 2024 · 35d11aa · 35d11aa
2 parents 23e546a + 58835f9
commit 35d11aa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/pmm2-testsuite.yml b/.github/workflows/pmm2-testsuite.yml
@@ -263,7 +263,7 @@ jobs:
 
       - name: Generate and Attach the report
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: "report-${{ matrix.db-type }}"
           path: ./pmm-ui-tests/cli/test-report

diff --git a/.github/workflows/trivy_scan.yml b/.github/workflows/trivy_scan.yml
@@ -59,7 +59,7 @@ jobs:
 
       - name: Archive trivy scan results
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.REPORT }}
           path: ${{ env.REPORT }}

diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 pyaml==23.9.5
-GitPython==3.1.37
+GitPython==3.1.40
 PyGithub==1.59.1
diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
+1 −1		api/agentlocalpb/agentlocal.pb.go
+1 −1		api/agentpb/agent.pb.go
+1 −1		api/agentpb/collector.pb.go
+1 −1		api/inventorypb/agent_status.pb.go
+1 −1		api/inventorypb/agents.pb.go
+1 −1		api/inventorypb/log_level.pb.go
+1 −1		api/inventorypb/nodes.pb.go
+1 −1		api/inventorypb/services.pb.go
+1 −1		api/managementpb/actions.pb.go
+1 −1		api/managementpb/agent/agent.pb.go
+1 −1		api/managementpb/alerting/alerting.pb.go
+1 −1		api/managementpb/alerting/params.pb.go
+1 −1		api/managementpb/annotation.pb.go
+1 −1		api/managementpb/azure/azure.pb.go
+1 −1		api/managementpb/backup/artifacts.pb.go
+1 −1		api/managementpb/backup/backups.pb.go
+1 −1		api/managementpb/backup/common.pb.go
+1 −1		api/managementpb/backup/errors.pb.go
+1 −1		api/managementpb/backup/locations.pb.go
+1 −1		api/managementpb/backup/restores.pb.go
+1 −1		api/managementpb/boolean_flag.pb.go
+1 −1		api/managementpb/checks.pb.go
+1 −1		api/managementpb/dbaas/components.pb.go
+1 −1		api/managementpb/dbaas/db_clusters.pb.go
+1 −1		api/managementpb/dbaas/dbaas.pb.go
+1 −1		api/managementpb/dbaas/kubernetes.pb.go
+1 −1		api/managementpb/dbaas/logs.pb.go
+1 −1		api/managementpb/dbaas/psmdb_clusters.pb.go
+1 −1		api/managementpb/dbaas/pxc_clusters.pb.go
+1 −1		api/managementpb/dbaas/templates.pb.go
+1 −1		api/managementpb/dump/dump.pb.go
+1 −1		api/managementpb/external.pb.go
+1 −1		api/managementpb/haproxy.pb.go
+1 −1		api/managementpb/ia/alerts.pb.go
+1 −1		api/managementpb/ia/channels.pb.go
+1 −1		api/managementpb/ia/rules.pb.go
+1 −1		api/managementpb/ia/status.pb.go
+1 −1		api/managementpb/metrics.pb.go
+1 −1		api/managementpb/mongodb.pb.go
+1 −1		api/managementpb/mysql.pb.go
+1 −1		api/managementpb/node.pb.go
+1 −1		api/managementpb/node/node.pb.go
+1 −1		api/managementpb/pagination.pb.go
+1 −1		api/managementpb/postgresql.pb.go
+1 −1		api/managementpb/proxysql.pb.go
+1 −1		api/managementpb/rds.pb.go
+1 −1		api/managementpb/role/role.pb.go
+1 −1		api/managementpb/service.pb.go
+1 −1		api/managementpb/service/service.pb.go
+1 −1		api/managementpb/severity.pb.go
+1 −1		api/platformpb/platform.pb.go
+1 −1		api/qanpb/collector.pb.go
+1 −1		api/qanpb/filters.pb.go
+1 −1		api/qanpb/metrics_names.pb.go
+1 −1		api/qanpb/object_details.pb.go
+1 −1		api/qanpb/profile.pb.go
+1 −1		api/qanpb/qan.pb.go
+1 −1		api/serverpb/httperror.pb.go
+1 −1		api/serverpb/server.pb.go
+1 −1		api/uieventspb/server.pb.go
+1 −1		api/userpb/user.pb.go
+20 −21		go.mod
+47 −45		go.sum
+13 −9		tools/go.mod
+29 −29		tools/go.sum