Merge branch 'dev'

Author: cuprumtan

README.md

@@ -29,7 +29,6 @@ Supported PostgreSQL versions: 9.5 - 14
 - [Build](#build)
 - [Installation](#installation)
 - [Usage](#usage)
-  - [Screenshots](#screenshots)
   - [Configuration](#configuration)
   - [Template creation and upload](#template-creation-and-upload)
   - [Run](#run)
@@ -208,22 +207,6 @@ git clone ... && cd mamonsu && python3 setup.py build && python3 setup.py instal
 ```  
 
 ## Usage
-### Screenshots
-
-<div style="text-align: center">
-  <p style="display: inline;">
-    <a href="examples/statistics-1.png">
-      <img alt="Example 1" src="examples/statistics-1-small.png" />
-    </a>
-    <a href="examples/statistics-2.png">
-      <img alt="Example 2" src="examples/statistics-2-small.png" />
-    </a>
-    <a href="examples/statistics-3.png">
-      <img alt="Example 3" src="examples/statistics-3-small.png" />
-    </a>
-  </p>
-</div>
-
 ### Configuration
 1. **Optionally, bootstrap Mamonsu**  
 If you omit this step, metrics can only be collected on behalf of a superuser, which is not recommended.

documentation/metrics.md

@@ -3689,37 +3689,47 @@ Default config:
       <tr>
         <th>Name</th>
         <td>Delta of total lag for {#APPLICATION_NAME}</td>
-        <td>Time elapsed between flushing recent WAL locally and receiving notification that this standby server {#APPLICATION_NAME} has written, flushed and applied</td>
-        <td>Time elapsed between flushing recent WAL locally and receiving notification that this standby server {#APPLICATION_NAME} has written and flushed it</td>
-        <td>Time elapsed between flushing recent WAL locally and receiving notification that this standby server {#APPLICATION_NAME} has written it</td>
+        <td>PostgreSQL WAL Send Lag: Time elapsed sending recent WAL locally on {#APPLICATION_NAME}</td>
+        <td>PostgreSQL WAL Receive Lag: Time elapsed between receiving recent WAL locally and receiving notification that this standby server {#APPLICATION_NAME} has flushed it</td>
+        <td>PostgreSQL WAL Write Lag: Time elapsed between flushing recent WAL locally and receiving notification that this standby server {#APPLICATION_NAME} has written it</td>
+        <td>PostgreSQL WAL Flush Lag: Time elapsed between flushing recent WAL locally and receiving notification that this standby server {#APPLICATION_NAME} has written and flushed it</td>
+        <td>PostgreSQL WAL Replay Lag: Time elapsed between flushing recent WAL locally and receiving notification that this standby server {#APPLICATION_NAME} has written, flushed and applied</td>
       </tr>
       <tr>
         <th>Key</th>
         <td>pgsql.replication.total_lag[{#APPLICATION_NAME}]</td>
-        <td>pgsql.replication.replay_lag[{#APPLICATION_NAME}]</td>
-        <td>pgsql.replication.flush_lag[{#APPLICATION_NAME}]</td>
+        <td>pgsql.replication.send_lag[{#APPLICATION_NAME}]</td>
+        <td>pgsql.replication.receive_lag[{#APPLICATION_NAME}]</td>
         <td>pgsql.replication.write_lag[{#APPLICATION_NAME}]</td>
+        <td>pgsql.replication.flush_lag[{#APPLICATION_NAME}]</td>
+        <td>pgsql.replication.replay_lag[{#APPLICATION_NAME}]</td>
       </tr>
       <tr>
         <th>Type</th>
         <td>Numeric (float)</td>
         <td>Numeric (float)</td>
         <td>Numeric (float)</td>
         <td>Numeric (float)</td>
+        <td>Numeric (float)</td>
+        <td>Numeric (float)</td>
       </tr>
       <tr>
         <th>Units</th>
-        <td></td>
-        <td>Text</td>
-        <td>Text</td>
-        <td>Text</td>
+        <td>Bytes</td>
+        <td>Bytes</td>
+        <td>Bytes</td>
+        <td>Bytes</td>
+        <td>Bytes</td>
+        <td>Bytes</td>
       </tr>
       <tr>
         <th>Delta</th>
         <td>As Is</td>
         <td>As Is</td>
         <td>As Is</td>
         <td>As Is</td>
+        <td>As Is</td>
+        <td>As Is</td>
       </tr>
     </table>