8000 v2.2.5: memory and cfs plugin fixes · postgrespro/mamonsu@91c9c3d · GitHub
[go: up one dir, main page]
Skip to content

Commit 91c9c3d

Browse files
vadvvadv
committed
v2.2.5: memory and cfs plugin fixes
1 parent 1600afa commit 91c9c3d

File tree

6 files changed

+27
-16
lines changed

6 files changed

+27
-16
lines changed

‎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__ = '2.2.4'
4+
__version__ = '2.2.5'
55
__licence__ = 'BSD'
66

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

‎mamonsu/plugins/pgsql/plugin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ def disable_and_exit_if_extension_is_not_installed(self, ext, db=None):
4343

4444
def disable_and_exit_if_not_pgpro_ee(self, db=None):
4545
if not Pooler.is_pgpro_ee(db):
46+
self.disable()
4647
raise PluginDisableException("""Disable plugin and exit, because \
4748
PostgresPro Enterprise Edition is not detected [instance: '{0}']
4849
""".format(Pooler.connection_string(db)))

‎mamonsu/plugins/system/linux/memory.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ def items(self, template):
8181
result += template.item({
8282
'name': '{0}'.format(item[2]),
8383
'key': 'system.memory[{0}]'.format(item[0]),
84-
'units': 'b'
84+
'units': Plugin.UNITS.bytes,
85+
'value_type': Plugin.VALUE_TYPE.numeric_unsigned
8586
})
8687
return result
8788

‎packaging/conf/template.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,7 +1755,7 @@
17551755
<trends>365</trends>
17561756
<status>0</status>
17571757
<delay>60</delay>
1758-
<value_type>0</value_type>
1758+
<value_type>3</value_type>
17591759
<allowed_hosts/>
17601760
<valuemap/>
17611761
<units>b</units>
@@ -1797,7 +1797,7 @@
17971797
<trends>365</trends>
17981798
<status>0</status>
17991799
<delay>60</delay>
1800-
<value_type>0</value_type>
1800+
<value_type>3</value_type>
18011801
<allowed_hosts/>
18021802
<valuemap/>
18031803
<units>b</units>
@@ -1839,7 +1839,7 @@
18391839
<trends>365</trends>
18401840
<status>0</status>
18411841
<delay>60</delay>
1842-
<value_type>0</value_type>
1842+
<value_type>3</value_type>
18431843
<allowed_hosts/>
18441844
<valuemap/>
18451845
<units>b</units>
@@ -1881,7 +1881,7 @@
18811881
<trends>365</trends>
18821882
<status>0</status>
18831883
<delay>60</delay>
1884-
<value_type>0</value_type>
1884+
<value_type>3</value_type>
18851885
<allowed_hosts/>
18861886
<valuemap/>
18871887
<units>b</units>
@@ -1923,7 +1923,7 @@
19231923
<trends>365</trends>
19241924
<status>0</status>
19251925
<delay>60</delay>
1926-
<value_type>0</value_type>
1926+
<value_type>3</value_type>
19271927
<allowed_hosts/>
19281928
<valuemap/>
19291929
<units>b</units>
@@ -1965,7 +1965,7 @@
19651965
<trends>365</trends>
19661966
<status>0</status>
19671967
<delay>60</delay>
1968-
<value_type>0</value_type>
1968+
<value_type>3</value_type>
19691969
<allowed_hosts/>
19701970
<valuemap/>
19711971
<units>b</units>
@@ -2007,7 +2007,7 @@
20072007
<trends>365</trends>
20082008
<status>0</status>
20092009
<delay>60</delay>
2010-
<value_type>0</value_type>
2010+
<value_type>3</value_type>
20112011
<allowed_hosts/>
20122012
<valuemap/>
20132013
<units>b</units>
@@ -2049,7 +2049,7 @@
20492049
<trends>365</trends>
20502050
<status>0</status>
20512051
<delay>60</delay>
2052-
<value_type>0</value_type>
2052+
<value_type>3</value_type>
20532053
<allowed_hosts/>
20542054
<valuemap/>
20552055
<units>b</units>
@@ -2091,7 +2091,7 @@
20912091
<trends>365</trends>
20922092
<status>0</status>
20932093
<delay>60</delay>
2094-
<value_type>0</value_type>
2094+
<value_type>3</value_type>
20952095
<allowed_hosts/>
20962096
<valuemap/>
20972097
<units>b</units>
@@ -2133,7 +2133,7 @@
21332133
<trends>365</trends>
21342134
<status>0</status>
21352135
<delay>60</delay>
2136-
<value_type>0</value_type>
2136+
<value_type>3</value_type>
21372137
<allowed_hosts/>
21382138
<valuemap/>
21392139
<units>b</units>
@@ -2175,7 +2175,7 @@
21752175
<trends>365</trends>
21762176
<status>0</status>
21772177
<delay>60</delay>
2178-
<value_type>0</value_type>
2178+
<value_type>3</value_type>
21792179
<allowed_hosts/>
21802180
<valuemap/>
21812181
<units>b</units>
@@ -2217,7 +2217,7 @@
22172217
<trends>365</trends>
22182218
<status>0</status>
22192219
<delay>60</delay>
2220-
<value_type>0</value_type>
2220+
<value_type>3</value_type>
22212221
<allowed_hosts/>
22222222
<valuemap/>
22232223
<units>b</units>
@@ -2259,7 +2259,7 @@
22592259
<trends>365</trends>
22602260
<status>0</status>
22612261
<delay>60</delay>
2262-
<value_type>0</value_type>
2262+
<value_type>3</value_type>
22632263
<allowed_hosts/>
22642264
<valuemap/>
22652265
<units>b</units>

‎packaging/debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
mamonsu (2.2.5-1) stable; urgency=low
2+
3+
* memory and cfs plugin fixes
4+
5+
-- PostgresPro DBA <dba@postgrespro.ru> Fri, 18 Nov 2016 21:00:00 +0300
6+
17
mamonsu (2.2.4-1) stable; urgency=low
28

39
* add cfs compression plugin

‎packaging/rpm/SPECS/mamonsu.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: mamonsu
2-
Version: 2.2.4
2+
Version: 2.2.5
33
Release: 1%{?dist}
44
Summary: Monitoring agent for PostgreSQL
55
Group: Applications/Internet
@@ -70,6 +70,9 @@ chown mamonsu.mamonsu /var/log/mamonsu
7070
/sbin/chkconfig --del mamonsu
7171

7272
%changelog
73+
* Fri Nov 18 2016 Dmitry Vasilyev <d.vasilyev@postgrespro.ru> - 2.2.5-1
74+
- memory and cfs plugin fixes
75+
7376
* Thu Nov 17 2016 Dmitry Vasilyev <d.vasilyev@postgrespro.ru> - 2.2.4-1
7477
- add cfs compression plugin
7578

0 commit comments

Comments
 (0)
0