Merge branch 'dev'

Author: cuprumtan

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

@@ -7,12 +7,14 @@ on:
     paths-ignore:
       - 'README.md'
       - 'documentation/**'
+      - 'examples/**'
   pull_request:
     branches:
       - dev
     paths-ignore:
       - 'README.md'
       - 'documentation/**'
+      - 'examples/**'
 
 jobs:
   mamonsu-tests:
@@ -23,7 +25,7 @@ jobs:
     strategy:
       matrix:
         docker_os: ['centos:7']
-        zabbix_version: ['5.4.8']
+        zabbix_version: ['5.4.10']
         pg_version: ['9.6', '10', '11', '12', '13', '14']
 
     steps:
@@ -57,7 +59,7 @@ jobs:
           echo "::set-output name=zabbix_address::$(hostname -I | awk '{print $1}')"
         id: zabbix_address
       - name: Edit Zabbix address in agent.conf
-        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.3.1.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.4.0.conf
 
       - name: Copy test scripts to container
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

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

@@ -7,12 +7,14 @@ on:
     paths-ignore:
       - 'README.md'
       - 'documentation/**'
+      - 'examples/**'
   pull_request:
     branches:
       - master
     paths-ignore:
       - 'README.md'
       - 'documentation/**'
+      - 'examples/**'
 
 jobs:
   mamonsu-tests:
@@ -23,7 +25,7 @@ jobs:
     strategy:
       matrix:
         docker_os: ['ubuntu:20.04', 'centos:7']
-        zabbix_version: ['4.0.36', '4.4.10', '5.0.18', '5.4.8']
+        zabbix_version: ['4.0.38', '5.0.20', '5.4.10', '6.0.0']
         pg_version: ['9.6', '10', '11', '12', '13', '14']
         exclude:
           # excludes PG 9.6 on CentOS 8
@@ -61,7 +63,7 @@ jobs:
           echo "::set-output name=zabbix_address::$(hostname -I | awk '{print $1}')"
         id: zabbix_address
       - name: Edit Zabbix address in agent.conf
-        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.3.1.conf
+        run: sed -i "s/\(address *= *\).*/\1 ${{ steps.zabbix_address.outputs.zabbix_address }}/" ${{ env.MAMONSU_PATH }}/github-actions-tests/sources/agent_3.4.0.conf
 
       - name: Copy test scripts to container
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) mkdir -p -m 755 /mamonsu/

README.md

@@ -64,21 +64,59 @@ See details in chapter called "[Metrics](documentation/metrics.md)".
 ### Zabbix Screens
 Since Mamonsu **3.0** template contains screens:
 - Overview  
-  Contains graphs representing general important metrics: PostgreSQL connections, shared buffers size and usage, autovacuum, tuples, checkpoint, background worker, system CPU and memory.  
-![Mamonsu Overview](examples/Mamonsu%20Overview.png)
+  Contains graphs representing general important metrics: PostgreSQL connections, shared buffers size and usage, autovacuum, tuples, checkpoint, background worker, system CPU and memory.
+    <details>
+        <summary>Click to view</summary>
+        <img src="examples/Mamonsu%20Overview.png" alt="Mamonsu Overview"/>
+    </details>
+
+
 - PostgreSQL Instance  
-  Contains information about Instance availability  
-![Mamonsu PostgreSQL Instance](examples/Mamonsu%20PostgreSQL%20Instance.png)
+  Contains information about Instance availability
+    <details>
+        <summary>Click to view</summary>
+        <img src="examples/Mamonsu%20PostgreSQL%20Instance.png" alt="Mamonsu PostgreSQL Instance"/>
+    </details>
+
+
 - PostgreSQL Locks
-![Mamonsu PostgreSQL Locks](examples/Mamonsu%20PostgreSQL%20Locks.png)
-- PostgreSQL Transactions   
-![Mamonsu PostgreSQL Transactions](examples/Mamonsu%20PostgreSQL%20Transactions.png)
+    <details>
+        <summary>Click to view</summary>
+        <img src="examples/Mamonsu%20PostgreSQL%20Locks.png" alt="Mamonsu PostgreSQL Locks"/>
+    </details>
+
+
+- PostgreSQL Transactions  
+    <details>
+        <summary>Click to view</summary>
+        <img src="examples/Mamonsu%20PostgreSQL%20Transactions.png" alt="Mamonsu PostgreSQL Transactions"/>
+    </details>
+
+
 - PostgreSQL WAL  
-  Contains information about WAL size, archiving  
-![Mamonsu PostgreSQL WAL](examples/Mamonsu%20PostgreSQL%20WAL.png)
+  Contains information about WAL size, archiving
+    <details>
+        <summary>Click to view</summary>
+        <img src="examples/Mamonsu%20PostgreSQL%20WAL.png" alt="Mamonsu PostgreSQL WAL"/>
+    </details>
+
+
 - System  
   Contains information about state of the system
-![Mamonsu System](examples/Mamonsu%20System.png)
+    <details>
+        <summary>Click to view</summary>
+        <img src="examples/Mamonsu%20System.png" alt="Mamonsu System"/>
+    </details>
+
+
+- Mamonsu Dashboard (*only for Zabbix 6.0+*)  
+  Pretty dashboard containing all necessary PostgreSQL and system information.
+    <details>
+        <summary>Click to view</summary>
+        <img src="examples/Mamonsu%20Dashboard.png" alt="Mamonsu Dashboard"/>
+    </details>
+
+
 ### Tools
 Mamonsu provides the command-line interface for updating some Zabbix server settings, as well as getting an overview of the monitored system configuration and tuning PostgreSQL and system settings on the fly. Also it provides tool to generate a detailed report on the hardware, operating system, memory usage and other parameters of the monitored system. List of Mamonsu commands and options:  
 

documentation/metrics.md

@@ -494,7 +494,33 @@ Default config:
       </tr>
     </table>
 
-12. **Inactive Memory**
+12. **Available Memory**
+
+    Zabbix item:  
+    <table>
+      <tr>
+        <th>Name</th>
+        <td>Free: Available memory</td>
+      </tr>
+      <tr>
+        <th>Key</th>
+        <td>system.memory[available]</td>
+      </tr>
+      <tr>
+        <th>Type</th>
+        <td>Numeric (float)</td>
+      </tr>
+      <tr>
+        <th>Units</th>
+        <td>Bytes</td>
+      </tr>
+      <tr>
+        <th>Delta</th>
+        <td>As Is</td>
+      </tr>
+    </table>
+
+13. **Inactive Memory**
 
     Zabbix item:  
     <table>
@@ -520,7 +546,7 @@ Default config:
       </tr>
     </table>
 
-13. **Mapped Memory**
+14. **Mapped Memory**
 
     Zabbix item:  
     <table>
@@ -546,7 +572,7 @@ Default config:
       </tr>
     </table>
 
-14. **PageTables Memory**
+15. **PageTables Memory**
 
     Zabbix item:  
     <table>
@@ -572,7 +598,7 @@ Default config:
       </tr>
     </table>
 
-15. **Slab Memory**
+16. **Slab Memory**
 
     Zabbix item:  
     <table>
@@ -598,7 +624,7 @@ Default config:
       </tr>
     </table>
 
-16. **Swap Memory**
+17. **Swap Memory**
 
     Zabbix item:  
     <table>
@@ -627,7 +653,7 @@ Default config:
     *Swap Memory* calculated as `SwapTotal - SwapCached`.
 
 
-17. **SwapCached Memory**
+18. **SwapCached Memory**
 
     Zabbix item:  
     <table>
@@ -653,7 +679,7 @@ Default config:
       </tr>
     </table>
 
-18. **VMallocUsed Memory**
+19. **VMallocUsed Memory**
 
     Zabbix item:  
     <table>
@@ -2799,7 +2825,40 @@ Default config:
 ### Items
 
 
-1. **Ping**  
+1. **Server Version**  
+   
+    Zabbix item:  
+    <table>
+      <tr>
+        <th>Name</th>
+        <td>PostgreSQL: server version</td>
+      </tr>
+      <tr>
+        <th>Key</th>
+        <td>pgsql.version[]</td>
+      </tr>
+      <tr>
+        <th>Type</th>
+        <td>Text</td>
+      </tr>
+      <tr>
+        <th>Units</th>
+        <td></td>
+      </tr>
+      <tr>
+        <th>Delta</th>
+        <td>As Is</td>
+      </tr>
+      <tr>
+        <th>Supported Version</th>
+        <td>9.5+</td>
+      </tr>
+    </table>
+
+    *Server Version* shows PostgreSQL/PostgresPro server version number.
+
+
+2. **Ping**  
 
     Zabbix item:  
     <table>
@@ -2832,7 +2891,7 @@ Default config:
     *Ping* calculates as difference between *ping query* start time and time of receiving *ping query* result.
 
 
-2. **Cache Hit Ratio**  
+3. **Cache Hit Ratio**  
 
     Zabbix item:  
     <table>
@@ -2865,7 +2924,7 @@ Default config:
     *Cache Hit Ratio* calculates as ratio between last value of `Blocks hit` and summa of last values of `Blocks hit` and `Blocks read`.
 
 
-3. **Service Uptime**  
+4. **Service Uptime**  
 
     Zabbix item:  
     <table>

examples/Mamonsu Dashboard.png

@@ -45,7 +45,7 @@ if [ "${OS%:*}" = "centos" ]; then
     chmod -R 777 /var/log/mamonsu/
     sudo mkdir -p /etc/mamonsu
     sudo touch /etc/mamonsu/agent.conf
-    cat /mamonsu/github-actions-tests/sources/agent_3.3.1.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.4.0.conf > /etc/mamonsu/agent.conf
     chmod -R 777 /etc/mamonsu/
     sudo yum -y install ./mamonsu*.rpm
     systemctl daemon-reload
@@ -74,7 +74,7 @@ elif [ "${OS%:*}" = "ubuntu" ]; then
     chmod -R 777 /var/log/mamonsu/
     sudo mkdir -p /etc/mamonsu
     sudo touch /etc/mamonsu/agent.conf
-    cat /mamonsu/github-actions-tests/sources/agent_3.3.1.conf > /etc/mamonsu/agent.conf
+    cat /mamonsu/github-actions-tests/sources/agent_3.4.0.conf > /etc/mamonsu/agent.conf
     chmod -R 777 /etc/mamonsu/
     sudo apt-get -y install ./mamonsu*.deb
     service mamonsu restart

examples/Mamonsu Overview.png

@@ -1,7 +1,7 @@
 __author__ = 'Dmitry Vasilyev'
 __author_email__ = 'info@postgrespro.ru'
 __description__ = 'Monitoring agent for PostgreSQL'
-__version__ = '3.3.1'
+__version__ = '3.4.0'
 __licence__ = 'BSD'
 
 __url__ = 'https://github.com/postgrespro/mamonsu'

examples/Mamonsu PostgreSQL Instance.png

@@ -37,5 +37,5 @@ def key_and_query(self, args=None):
             args = []
         result = ""
         for one in args:
-            result += 'UserParameter={0}\n'.format(one)
+            result += 'UserParameter={0}\n'.format(' '.join(one.replace('\n', ' ').split()))
         return result

examples/Mamonsu PostgreSQL Locks.png

@@ -92,6 +92,7 @@
     {prog} zabbix item error <host name>
     {prog} zabbix item lastvalue <host name>
     {prog} zabbix item lastclock <host name>
+    {prog} zabbix dashboard upload <template name>
     {prog} zabbix version
 
 Options:

examples/Mamonsu PostgreSQL Transactions.png

@@ -47,6 +47,9 @@ class BgWriter(Plugin):
          Plugin.DELTA.simple_change)
     ]
 
+    graph_name_buffers = "PostgreSQL bgwriter buffers"
+    graph_name_ws = "PostgreSQL bgwriter write/sync"
+
     def run(self, zbx):
         columns = [x[0] for x in self.Items]
         result = Pooler.query(self.query.format(", ".join(columns)))
@@ -88,24 +91,23 @@ def graphs(self, template, dashboard=False):
                     "color": item[3][1]
                 })
         result = template.graph({
-            "name": "PostgreSQL bgwriter buffers",
+            "name": self.graph_name_buffers,
             "items": items_buffers
-        }) + \
-                 template.graph({
-                     "name": "PostgreSQL bgwriter write/sync",
-                     "items": items_write_sync
-                 })
+        }) + template.graph({
+            "name": self.graph_name_ws,
+            "items": items_write_sync
+        })
         if not dashboard:
             return result
         else:
             return [{
-                "dashboard": {"name": "PostgreSQL bgwriter buffers",
+                "dashboard": {"name": self.graph_name_buffers,
                               "page": ZbxTemplate.dashboard_page_overview["name"],
                               "size": ZbxTemplate.dashboard_widget_size_medium,
                               "position": 7}
             },
                 {
-                    "dashboard": {"name": "PostgreSQL bgwriter write/sync",
+                    "dashboard": {"name": self.graph_name_ws,
                                   "page": ZbxTemplate.dashboard_page_overview["name"],
                                   "size": ZbxTemplate.dashboard_widget_size_medium,
                                   "position": 8}