Merge branch 'dev'

Author: cuprumtan

github-actions-tests/sources/metrics-linux-10.txt

@@ -95,7 +95,6 @@ system.disk.all_read_b[]
 system.disk.all_write_b[]
 system.la[1]
 system.memory[active]
-system.memory[apps]
 system.memory[available]
 system.memory[buffers]
 system.memory[cached]
@@ -106,8 +105,10 @@ system.memory[page_tables]
 system.memory[slab]
 system.memory[swap]
 system.memory[swap_cache]
+system.memory[total]
 system.memory[vmalloc_used]
 system.memory[unused]
+system.memory[used]
 system.net.discovery[]
 system.open_files[]
 system.processes[blocked]

github-actions-tests/sources/metrics-linux-11.txt

@@ -95,7 +95,6 @@ system.disk.all_read_b[]
 system.disk.all_write_b[]
 system.la[1]
 system.memory[active]
-system.memory[apps]
 system.memory[available]
 system.memory[buffers]
 system.memory[cached]
@@ -106,8 +105,10 @@ system.memory[page_tables]
 system.memory[slab]
 system.memory[swap]
 system.memory[swap_cache]
+system.memory[total]
 system.memory[vmalloc_used]
 system.memory[unused]
+system.memory[used]
 system.net.discovery[]
 system.open_files[]
 system.processes[blocked]

github-actions-tests/sources/metrics-linux-12.txt

@@ -96,7 +96,6 @@ system.disk.all_read_b[]
 system.disk.all_write_b[]
 system.la[1]
 system.memory[active]
-system.memory[apps]
 system.memory[available]
 system.memory[buffers]
 system.memory[cached]
@@ -107,8 +106,10 @@ system.memory[page_tables]
 system.memory[slab]
 system.memory[swap]
 system.memory[swap_cache]
+system.memory[total]
 system.memory[vmalloc_used]
 system.memory[unused]
+system.memory[used]
 system.net.discovery[]
 system.open_files[]
 system.processes[blocked]

github-actions-tests/sources/metrics-linux-13.txt

@@ -100,7 +100,6 @@ system.disk.all_read_b[]
 system.disk.all_write_b[]
 system.la[1]
 system.memory[active]
-system.memory[apps]
 system.memory[available]
 system.memory[buffers]
 system.memory[cached]
@@ -111,8 +110,10 @@ system.memory[page_tables]
 system.memory[slab]
 system.memory[swap]
 system.memory[swap_cache]
+system.memory[total]
 system.memory[vmalloc_used]
 system.memory[unused]
+system.memory[used]
 system.net.discovery[]
 system.open_files[]
 system.processes[blocked]

github-actions-tests/sources/metrics-linux-14.txt

@@ -107,7 +107,6 @@ system.disk.all_read_b[]
 system.disk.all_write_b[]
 system.la[1]
 system.memory[active]
-system.memory[apps]
 system.memory[available]
 system.memory[buffers]
 system.memory[cached]
@@ -118,8 +117,10 @@ system.memory[page_tables]
 system.memory[slab]
 system.memory[swap]
 system.memory[swap_cache]
+system.memory[total]
 system.memory[vmalloc_used]
 system.memory[unused]
+system.memory[used]
 system.net.discovery[]
 system.open_files[]
 system.processes[blocked]

github-actions-tests/sources/metrics-linux-9.6.txt

@@ -94,7 +94,6 @@ system.disk.all_read_b[]
 system.disk.all_write_b[]
 system.la[1]
 system.memory[active]
-system.memory[apps]
 system.memory[available]
 system.memory[buffers]
 system.memory[cached]
@@ -105,8 +104,10 @@ system.memory[page_tables]
 system.memory[slab]
 system.memory[swap]
 system.memory[swap_cache]
+system.memory[total]
 system.memory[vmalloc_used]
 system.memory[unused]
+system.memory[used]
 system.net.discovery[]
 system.open_files[]
 system.processes[blocked]

github-actions-tests/sources/metrics-linux-full-list.txt

@@ -108,7 +108,6 @@ system.disk.all_read_b[]
 system.disk.all_write_b[]
 system.la[1]
 system.memory[active]
-system.memory[apps]
 system.memory[available]
 system.memory[buffers]
 system.memory[cached]
@@ -119,8 +118,10 @@ system.memory[page_tables]
 system.memory[slab]
 system.memory[swap]
 system.memory[swap_cache]
+system.memory[total]
 system.memory[vmalloc_used]
 system.memory[unused]
+system.memory[used]
 system.net.discovery[]
 system.open_files[]
 system.processes[blocked]

mamonsu/lib/zbx_template.py

@@ -91,7 +91,7 @@ class ZbxTemplate(object):
 
     graph_items_defaults = [
         ('sortorder', None), ('drawtype', 0),
-        ('color', '00CC00'), ('yaxisside', 0),
+        ('color', '578159'), ('yaxisside', 0),
         ('calc_fnc', 2), ('type', Template.GRAPH_TYPE.normal)
     ]
 

mamonsu/plugins/__init__.py

@@ -1,3 +1,3 @@
-__import__('mamonsu.plugins.common')
-__import__('mamonsu.plugins.pgsql')
-__import__('mamonsu.plugins.system')
+__import__("mamonsu.plugins.common")
+__import__("mamonsu.plugins.pgsql")
+__import__("mamonsu.plugins.system")

mamonsu/plugins/common/__init__.py

@@ -1,2 +1,3 @@
-__all__ = ['health']
+__all__ = ["health"]
+
 from . import *