Skip to content

Commit a432058

Browse files
committed
Merge branch 'main' into v3
2 parents 6d45a20 + 3eff9b7 commit a432058

File tree

11 files changed

+243
-49
lines changed

11 files changed

+243
-49
lines changed

.github/workflows/managed.yml

+3
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ jobs:
6868
continue-on-error: true
6969
run: docker exec -t pmm-server supervisorctl status
7070

71+
- name: Refresh yum cache for tests
72+
run: docker exec -i pmm-server yum --verbose info updates pmm-managed || echo '1'
73+
7174
- name: Run tests
7275
run: docker exec -i pmm-server make -C managed test-cover
7376

build/scripts/build-client-rpm

+8
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ main() {
1414
set -o errexit
1515
set -o xtrace
1616
17+
if grep -q 'CentOS Linux 7' /etc/os-release; then
18+
# disable fastestmirror plugin, which mostly fails due to CentOS 7 being EOL
19+
sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf
20+
21+
sed -i -e 's/^\(mirrorlist\)/#\1/g' /etc/yum.repos.d/CentOS-Base.repo
22+
sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\$releasever/os/\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo
23+
fi
24+
1725
export pmm_version=$pmm_version
1826
export pmm_release=$pmm_release
1927
export sudo_path=\$(ls /usr/bin/sudo)

build/scripts/build-client-srpm

+8
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ main() {
1414
set -o errexit
1515
set -o xtrace
1616
17+
if grep -q 'CentOS Linux 7' /etc/os-release; then
18+
# disable fastestmirror plugin, which mostly fails due to CentOS 7 being EOL
19+
sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf
20+
21+
sed -i -e 's/^\(mirrorlist\)/#\1/g' /etc/yum.repos.d/CentOS-Base.repo
22+
sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\$releasever/os/\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo
23+
fi
24+
1725
export pmm_release=$pmm_release
1826
export sudo_path=
1927
if [ -e /usr/bin/sudo ]; then

build/scripts/build-server-rpm

+8
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,14 @@ build() {
109109
echo \"repo_name: ${repo_name}\"
110110
echo \"rpm_verison: ${rpm_version}\"
111111
112+
if grep -q 'CentOS Linux 7' /etc/os-release; then
113+
# disable fastestmirror plugin, which mostly fails due to CentOS 7 being EOL
114+
sudo sed -i 's/enabled=1/enabled=0/g' /etc/yum/pluginconf.d/fastestmirror.conf
115+
116+
sudo sed -i -e 's/^\(mirrorlist\)/#\1/g' /etc/yum.repos.d/CentOS-Base.repo
117+
sudo sed -i -e 's|^#baseurl.*|baseurl=http://vault.centos.org/centos/\$releasever/os/\$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo
118+
fi
119+
112120
sudo chown -R builder:builder /home/builder/rpm/RPMS /home/builder/rpm/SOURCES
113121
114122
# Add 'Epoch' to spec file to prevent update of rpms which are built in PR build

cli-tests/package-lock.json

+107-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli-tests/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@types/promise-retry": "^1.1.3",
2626
"@types/shelljs": "^0.8.12",
2727
"@typescript-eslint/eslint-plugin": "^7.14.1",
28-
"@typescript-eslint/parser": "^7.14.1",
28+
"@typescript-eslint/parser": "^7.15.0",
2929
"eslint": "8.56",
3030
"eslint-config-airbnb-base": "^15.0.0",
3131
"eslint-config-airbnb-typescript": "^18.0.0",

docs/release-notes/2.43.0.md

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Percona Monitoring and Management 2.43.0
2+
3+
| **Release date** | July , 2024 |
4+
| -----------------| ----------------------------------------------------------------------------------------------- |
5+
| **Installation** | [Installing Percona Monitoring and Management](../quickstart/index.md) |
6+
7+
Percona Monitoring and Management (PMM) is an open source database monitoring, management, and observability solution for MySQL, PostgreSQL, and MongoDB.
8+
9+
It enables you to observe the health of your database systems, explore new patterns in their behavior, troubleshoot them and execute database management operations regardless of whether your databases are located on-premises or in the cloud.
10+
11+
## What's new in this release
12+
13+
This release introduces this and that
14+
15+
## Release highlights
16+
17+
18+
19+
20+
21+
![!image](../_images/.png)
22+
23+
## Improvements
24+
25+
- [PMM-13133](https://perconadev.atlassian.net/browse/PMM-13133) -
26+
27+
- [PMM-13054](https://perconadev.atlassian.net/browse/PMM-13054) - The default number of log lines for each log file returned by `httsp://<pmm-server>/logs.zip` endpoint has been increased from 1,000 to 50,000.
28+
29+
Additionally, the endpoint now includes a customizable line-count parameter in the download URL, allowing you to specify a custom number of log lines or opt for unlimited log size. For more information, see the [API documentation](https://percona-pmm.readme.io/reference/logs).
30+
31+
32+
## Maintenance
33+
34+
### QAN update: Upgrade to `pg_query_go` v5 and impact on PostgreSQL 9.x
35+
36+
As part of our ongoing maintenance efforts, we have upgraded the `pg_query_go` package to version 5. This latest version helps parse PostgreSQL queries in QAN, provides improved functionality, and enables subsequent upgrades of important dependencies.
37+
38+
However, with this change, QAN will no longer be able to list PostgreSQL database tables for versions 9.4, 9.5, and 9.6. Since all PostgreSQL 9.x versions have already reached their end-of-life status, we recommend upgrading to a supported version of PostgreSQL.
39+
40+
If you're looking to upgrade, you can easily [install the latest version of Percona Distribution for PostgreSQL](https://docs.percona.com/postgresql/16/installing.html).
41+
42+
### Fixed issues
43+
44+
- [PMM-xxxxx](https://perconadev.atlassian.net/browse/PMM-xxxx) - Fixed an issue in the

go.mod

+15-11
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ require (
6969
github.com/stretchr/testify v1.9.0
7070
go.mongodb.org/mongo-driver v1.15.0
7171
go.starlark.net v0.0.0-20230717150657-8a3343210976
72-
golang.org/x/crypto v0.22.0
72+
golang.org/x/crypto v0.24.0
7373
golang.org/x/sync v0.7.0
74-
golang.org/x/sys v0.19.0
75-
golang.org/x/text v0.14.0
76-
golang.org/x/tools v0.20.0
74+
golang.org/x/sys v0.21.0
75+
golang.org/x/text v0.16.0
76+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d
7777
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237
7878
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237
7979
google.golang.org/grpc v1.64.0
@@ -92,8 +92,9 @@ require (
9292
github.com/go-logr/logr v1.4.1 // indirect
9393
github.com/go-logr/stdr v1.2.2 // indirect
9494
github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a // indirect
95-
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
9695
github.com/golang/mock v1.4.4 // indirect
96+
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
97+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
9798
github.com/golang/protobuf v1.5.4 // indirect
9899
github.com/google/btree v1.0.0 // indirect
99100
github.com/hashicorp/go-hclog v1.5.0 // indirect
@@ -114,11 +115,11 @@ require (
114115
)
115116

116117
require (
117-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect
118-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1
119-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect
118+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
119+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
120+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
120121
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcegraph/armresourcegraph v0.9.0
121-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
122+
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
122123
github.com/ClickHouse/ch-go v0.61.5 // indirect
123124
github.com/HdrHistogram/hdrhistogram-go v1.1.2
124125
github.com/Microsoft/go-winio v0.6.1 // indirect
@@ -189,7 +190,10 @@ require (
189190
go.opentelemetry.io/otel v1.24.0 // indirect
190191
go.opentelemetry.io/otel/trace v1.24.0 // indirect
191192
golang.org/x/mod v0.17.0 // indirect
192-
golang.org/x/net v0.24.0 // indirect
193-
golang.org/x/term v0.19.0 // indirect
193+
golang.org/x/net v0.26.0 // indirect
194+
golang.org/x/oauth2 v0.18.0 // indirect
195+
golang.org/x/term v0.21.0 // indirect
196+
google.golang.org/appengine v1.6.8 // indirect
197+
gopkg.in/yaml.v2 v2.4.0 // indirect
194198
gotest.tools/v3 v3.3.0 // indirect
195199
)

0 commit comments

Comments
 (0)