Merge branch 'PMM-2.0' into PMM-12809-cve-fixes

Percona-Lab · Feb 3, 2024 · e260f49 · e260f49
2 parents 4e9f70b + 000139b
commit e260f49
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.41.1
+2.41.2
diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards
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/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
+44 −44		cli-tests/package-lock.json
+2 −2		cli-tests/package.json
+2 −2		go.mod
+4 −3		go.sum
+0 −1		managed/services/alertmanager/alertmanager.go
+0 −1		managed/services/dbaas/kubernetes/kubernetes.go
+0 −1		managed/services/grafana/client.go
+0 −1		managed/services/management/dbaas/kubernetes_server.go
+0 −2		managed/services/management/dbaas/pxc_cluster_service.go
+0 −1		managed/services/scheduler/scheduler.go
+0 −1		qan-api2/exporters/slow_log.go
+0 −2		qan-api2/models/metrics.go
+2 −2		tools/go.mod
+6 −6		tools/go.sum