Skip to content

Commit 5e896b5

Browse files
cuprumtancuprumtan
committed
Merge branch 'dev'
# Conflicts: # packaging/debian/changelog # packaging/rpm/SPECS/mamonsu.spec
2 parents c1155b4 + f5a52ef commit 5e896b5

File tree

8 files changed

+7
-51
lines changed

8 files changed

+7
-51
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
echo "::set-output name=zabbix_address::$(hostname -I | awk '{print $1}')"
6060
id: zabbix_address
6161
- name: Edit Zabbix address in agent.conf
62-
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.0.conf
62+
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.4.0.conf
6363

6464
- name: Copy test scripts to container
6565
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
@@ -63,7 +63,7 @@ jobs:
6363
echo "::set-output name=zabbix_address::$(hostname -I | awk '{print $1}')"
6464
id: zabbix_address
6565
- name: Edit Zabbix address in agent.conf
66-
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.5.0.conf
66+
run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.4.0.conf
6767

6868
- name: Copy test scripts to container
6969
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.0.conf > /etc/mamonsu/agent.conf
44+
cat /mamonsu/github-actions-tests/sources/agent_3.4.0.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.0.conf > /etc/mamonsu/agent.conf
67+
cat /mamonsu/github-actions-tests/sources/agent_3.4.0.conf > /etc/mamonsu/agent.conf
6868
service mamonsu restart
6969
sleep 5
7070
echo && echo && echo "Mamonsu version:"

‎github-actions-tests/sources/agent_3.5.0.conf renamed to ‎github-actions-tests/sources/agent_3.4.0.conf

File renamed without changes.

‎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.0'
4+
__version__ = '3.4.0'
55
__licence__ = 'BSD'
66

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

‎packaging/debian/changelog

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,3 @@
1-
mamonsu (3.5.0-1) stable; urgency=low
2-
* divided Instance Rate graph into two graphs - Blocks Rate, Transactions Rate;
3-
* divided XLOG plugin into two plugins - WAL, Replication;
4-
* changed 'pg_wait_sampling' plugin name to 'Wait Sampling';
5-
* changed 'pg_stat_statements' plugin name to 'Statements';
6-
* changed default agent.conf file permissions: now it read/write only for mamonsu user;
7-
* added new Replication plugin metrics: Send Lag, Receive Lagadded pgpro_stats support to PostgresPro cluster (automatic switch from pg_stat_statements and pg_wait_sampling);
8-
* added new bootstrap features: now the '-x' option also configures pg_stat_statements, pg_wait_sampling and pgpro_stats extensions;
9-
* added custom schema check for pg_stat_statements, pg_wait_sampling and pgpro_stats extensions;
10-
* added new lock types to the Wait Sampling plugin to fit PostgreSQL 10+: Extension Locks, Client Locks, Other Locks (e.g. IPC, Timeout, IO), Autovacuum Locks, Logical Replication Locks;
11-
* added new 'System Free/Used Memory' graph;
12-
* added new active locking queries feature to the report tool;
13-
* replaced 'System Memory Overview' graph with 'System Free/Used Memory' in dashboards;
14-
* fixed Statements plugin items generation for native zabbix agent;
15-
* fixed Rollbacks item delta type;
16-
* fixed WAL metrics delta types;
17-
* fixed PostgreSQL Uptime trigger;
18-
* improved Replication metrics evaluation algorithm;
19-
* unified Zabbix objects names;
20-
* unified config file sections and parameters names;
21-
* set new color scheme;
22-
231
mamonsu (3.4.0-1) stable; urgency=low
242
* added Server Version metric;
253
* added Available Memory metric;

‎packaging/rpm/SPECS/mamonsu.spec

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: mamonsu
2-
Version: 3.5.0
2+
Version: 3.4.0
33
Release: 1%{?dist}
44
Summary: Monitoring agent for PostgreSQL
55
Group: Applications/Internet
@@ -73,28 +73,6 @@ chown mamonsu.mamonsu /var/log/mamonsu
7373
chown mamonsu.mamonsu /etc/mamonsu/agent.conf
7474

7575
%changelog
76-
* Thu Jun 16 2022 Alexandra Kuznetsova <a.kuznetsova@postgrespro.ru> - 3.5.0-1
77-
- divided Instance Rate graph into two graphs - Blocks Rate, Transactions Rate;
78-
- divided XLOG plugin into two plugins - WAL, Replication;
79-
- changed 'pg_wait_sampling' plugin name to 'Wait Sampling';
80-
- changed 'pg_stat_statements' plugin name to 'Statements';
81-
- changed default agent.conf file permissions: now it read/write only for mamonsu user;
82-
- added new Replication plugin metrics: Send Lag, Receive Lagadded pgpro_stats support to PostgresPro cluster (automatic switch from pg_stat_statements and pg_wait_sampling);
83-
- added new bootstrap features: now the '-x' option also configures pg_stat_statements, pg_wait_sampling and pgpro_stats extensions;
84-
- added custom schema check for pg_stat_statements, pg_wait_sampling and pgpro_stats extensions;
85-
- added new lock types to the Wait Sampling plugin to fit PostgreSQL 10+: Extension Locks, Client Locks, Other Locks (e.g. IPC, Timeout, IO), Autovacuum Locks, Logical Replication Locks;
86-
- added new 'System Free/Used Memory' graph;
87-
- added new active locking queries feature to the report tool;
88-
- replaced 'System Memory Overview' graph with 'System Free/Used Memory' in dashboards;
89-
- fixed Statements plugin items generation for native zabbix agent;
90-
- fixed Rollbacks item delta type;
91-
- fixed WAL metrics delta types;
92-
- fixed PostgreSQL Uptime trigger;
93-
- improved Replication metrics evaluation algorithm;
94-
- unified Zabbix objects names;
95-
- unified config file sections and parameters names;
96-
- set new color scheme;
97-
9876
* Mon Feb 21 2022 Alexandra Kuznetsova <a.kuznetsova@postgrespro.ru> - 3.4.0-1
9977
- added Server Version metric;
10078
- added Available Memory metric;

‎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 VERSION 3.5.0
2+
!define VERSION 3.4.0
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)