Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfd75eb0

Browse files
committed
Merge branch 'dev'
2 parents97d9bea +29961c2 commitfd75eb0

File tree

13 files changed

+37
-15
lines changed

13 files changed

+37
-15
lines changed

‎.github/workflows/mamonsu-tests-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
echo "zabbix_address=$(hostname -I | awk '{print $1}')" >> $GITHUB_OUTPUT
8181
id:zabbix_address
8282
-name:Edit Zabbix address in agent.conf
83-
run:sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.8.conf
83+
run:sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.9.conf
8484

8585
-name:Copy test scripts to container
8686
run:docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

‎.github/workflows/mamonsu-tests-master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
echo "zabbix_address=$(hostname -I | awk '{print $1}')" >> $GITHUB_OUTPUT
9292
id:zabbix_address
9393
-name:Edit Zabbix address in agent.conf
94-
run:sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.8.conf
94+
run:sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.9.conf
9595

9696
-name:Copy test scripts to container
9797
run:docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

‎github-actions-tests/mamonsu_build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if [ "${OS%:*}" = "centos" ]; then
4141
python3 setup.py build&& python3 setup.py install
4242
make rpm
4343
sudo rpm -i ./mamonsu*.rpm
44-
cat /mamonsu/github-actions-tests/sources/agent_3.5.8.conf> /etc/mamonsu/agent.conf
44+
cat /mamonsu/github-actions-tests/sources/agent_3.5.9.conf> /etc/mamonsu/agent.conf
4545
systemctl daemon-reload
4646
systemctl restart mamonsu
4747
sleep 5
@@ -64,7 +64,7 @@ elif [ "${OS%:*}" = "ubuntu" ]; then
6464
python3 setup.py build&& python3 setup.py install
6565
make deb
6666
sudo dpkg -i ./mamonsu*.deb
67-
cat /mamonsu/github-actions-tests/sources/agent_3.5.8.conf> /etc/mamonsu/agent.conf
67+
cat /mamonsu/github-actions-tests/sources/agent_3.5.9.conf> /etc/mamonsu/agent.conf
6868
service mamonsu restart
6969
sleep 5
7070
echo&&echo&&echo"mamonsu version:"

‎github-actions-tests/tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ REPO
6969
eval"${PACKAGE_MANAGER_INSTALL} wget"
7070
eval"${PACKAGE_MANAGER_INSTALL} bc"
7171
eval"${PACKAGE_MANAGER_INSTALL} unzip"
72-
eval"${PACKAGE_MANAGER_INSTALL} https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
72+
eval"${PACKAGE_MANAGER_INSTALL} https://archives.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm"
7373
REPO=${PACKAGE_MANAGER_INSTALL}" https://download.postgresql.org/pub/repos/yum/reporpms/EL-"$(echo${OS}| sed -r's/^[^0-9]*([0-9]+).*/\1/')"-x86_64/pgdg-redhat-repo-latest.noarch.rpm"\
7474

7575
# run tests

‎mamonsu/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
__author__='Dmitry Vasilyev'
22
__author_email__='info@postgrespro.ru'
33
__description__='Monitoring agent for PostgreSQL'
4-
__version__='3.5.8'
4+
__version__='3.5.9'
55
__licence__='BSD'
66

77
__url__='https://github.com/postgrespro/mamonsu'

‎mamonsu/plugins/pgsql/driver/pg8000/core.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
fromcollectionsimportdefaultdict,deque
33
fromdatetimeimportdatetimeasDatetime
44
fromdecimalimportDecimal
5-
frompkg_resourcesimportpackaging
65
fromhashlibimportmd5
76
fromitertoolsimportcount,islice
87
fromstructimportStruct
98
fromwarningsimportwarn
109

10+
try:
11+
frompkg_resourcesimportpackaging
12+
exceptImportError:
13+
importpackaging.version
14+
1115
frommamonsu.plugins.pgsql.driver.pg8000importconverters
1216
from .exceptionsimport (
1317
ArrayContentNotSupportedError,DatabaseError,Error,IntegrityError,

‎mamonsu/plugins/pgsql/driver/pool.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
frompkg_resourcesimportpackaging
21
from .connectionimportConnection,ConnectionInfo
32

3+
try:
4+
frompkg_resourcesimportpackaging
5+
exceptImportError:
6+
importpackaging.version
47

58
classPool(object):
69
ExcludeDBs= ["template0","template1"]

‎mamonsu/plugins/pgsql/memory_leak_diagnostic.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
importos
55
from .poolimportPooler
66
importre
7-
frompkg_resourcesimportpackaging
87
importmamonsu.lib.platformasplatform
98
importposix
109

10+
try:
11+
frompkg_resourcesimportpackaging
12+
exceptImportError:
13+
importpackaging.version
1114

1215
classMemoryLeakDiagnostic(Plugin):
1316
DEFAULT_CONFIG= {

‎mamonsu/plugins/pgsql/replication.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# -*- coding: utf-8 -*-
22

33
frommamonsu.plugins.pgsql.pluginimportPgsqlPluginasPlugin
4-
frompkg_resourcesimportpackaging
54
from .poolimportPooler
65
frommamonsu.lib.zbx_templateimportZbxTemplate
76

7+
try:
8+
frompkg_resourcesimportpackaging
9+
exceptImportError:
10+
importpackaging.version
11+
812
NUMBER_NON_ACTIVE_SLOTS=0
913

1014

‎packaging/debian/changelog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
mamonsu (3.5.9-1) stable; urgency=low
2+
* Run on systems with latest setuptools installed (>67.7.2);
3+
* Drop using dotted user:group specification in RPM pre-install stage;
4+
15
mamonsu (3.5.8-1) stable; urgency=low
26
* Prepare for python 3.12: remove deprecated distutils imports;
37

‎packaging/rpm/SPECS/mamonsu.spec

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: mamonsu
2-
Version: 3.5.8
2+
Version: 3.5.9
33
Release: 1%{?dist}
44
Summary: Monitoring agent for PostgreSQL
55
Group: Applications/Internet
@@ -57,22 +57,26 @@ getent passwd mamonsu > /dev/null || \
5757
-c"mamonsu monitoring user" mamonsu
5858

5959
mkdir -p /var/run/mamonsu
60-
chown -R mamonsu.mamonsu /var/run/mamonsu
60+
chown -R mamonsu:mamonsu /var/run/mamonsu
6161

6262
mkdir -p /etc/mamonsu/plugins
6363
touch /etc/mamonsu/plugins/__init__.py
6464

6565
mkdir -p /var/log/mamonsu
66-
chown -R mamonsu.mamonsu /var/log/mamonsu
66+
chown -R mamonsu:mamonsu /var/log/mamonsu
6767

6868
%preun
6969
/sbin/service mamonsu stop>/dev/null 2>&1
7070
/sbin/chkconfig --del mamonsu
7171

7272
%post
73-
chown -R mamonsu.mamonsu /etc/mamonsu
73+
chown -R mamonsu:mamonsu /etc/mamonsu
7474

7575
%changelog
76+
*Mon Aug 19 2024Maxim Styushin <m.styushin@postgrespro.ru> - 3.5.9-1
77+
-Run on systems with latest setuptools installed (>67.7.2);
78+
-Drop using dotted user:group specification in RPM pre-install stage;
79+
7680
*Thu Apr 18 2024Maxim Styushin <m.styushin@postgrespro.ru> - 3.5.8-1
7781
-Prepare for python 3.12: remove deprecated distutils imports;
7882

‎packaging/win/mamonsu.def.nsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
!define NAME Mamonsu
2-
!define VERSION3.5.8
2+
!define VERSION3.5.9
33
!define MAMONSU_REG_PATH"Software\PostgresPro\Mamonsu"
44
!define MAMONSU_REG_UNINSTALLER_PATH"Software\Microsoft\Windows\CurrentVersion\Uninstall"
55
!define EDB_REG"SOFTWARE\Postgresql"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp