Merge branch 'dev'

Author: cuprumtan

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

@@ -29,7 +29,7 @@ jobs:
         pg_version: ['10', '11', '12', '13', '14']
 
     steps:
-      - name: Checkout Mamonsu repo
+      - name: Checkout mamonsu repo
         uses: actions/checkout@v1
 
       - name: Install docker-compose
@@ -67,7 +67,7 @@ jobs:
       - name: Install prequisites
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/tests.sh --os="${{ matrix.docker_os }}" --pg-version="${{ matrix.pg_version }}"
 
-      - name: Build and install Mamonsu
+      - name: Build and install mamonsu
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/mamonsu_build.sh --os="${{ matrix.docker_os }}" --pg-version="${{ matrix.pg_version }}"
 
       - name: Test MAMONSU BOOTSTRAP
@@ -85,5 +85,8 @@ jobs:
       - name: Test MAMONSU ZABBIX CLI
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/tools/zabbix_cli.sh --zbx-address="${{ steps.zabbix_address.outputs.zabbix_address }}" --zbx-version="${{ matrix.zabbix_version }}"
 
-      - name: Test Mamonsu metrics on master
+      - name: Test mamonsu metrics on master
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh --pg-version="${{ matrix.pg_version }}" --os="${{ matrix.docker_os }}"
+
+      - name: Test Mamonsu removal
+        run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/mamonsu_removal.sh --os="${{ matrix.docker_os }}"

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

@@ -33,7 +33,7 @@ jobs:
             pg_version: '9.6'
 
     steps:
-      - name: Checkout Mamonsu repo
+      - name: Checkout mamonsu repo
         uses: actions/checkout@v1
 
       - name: Install docker-compose
@@ -71,7 +71,7 @@ jobs:
       - name: Install prequisites
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/tests.sh --os="${{ matrix.docker_os }}" --pg-version="${{ matrix.pg_version }}"
 
-      - name: Build and install Mamonsu
+      - name: Build and install mamonsu
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/mamonsu_build.sh --os="${{ matrix.docker_os }}" --pg-version="${{ matrix.pg_version }}"
 
       - name: Test MAMONSU BOOTSTRAP
@@ -89,5 +89,8 @@ jobs:
       - name: Test MAMONSU ZABBIX CLI
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/tools/zabbix_cli.sh --zbx-address="${{ steps.zabbix_address.outputs.zabbix_address }}" --zbx-version="${{ matrix.zabbix_version }}"
 
-      - name: Test Mamonsu metrics on master
+      - name: Test mamonsu metrics on master
         run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/metrics.sh --pg-version="${{ matrix.pg_version }}" --os="${{ matrix.docker_os }}"
+
+      - name: Test Mamonsu removal
+        run: docker exec $( echo "${{ matrix.docker_os }}" | sed 's/://' | sed 's/\.//' ) bash /mamonsu/github-actions-tests/mamonsu_removal.sh --os="${{ matrix.docker_os }}"

github-actions-tests/mamonsu_build.sh

@@ -23,7 +23,7 @@ done
 
 echo && echo
 echo "================================================================================================================="
-echo "---> Install Mamonsu latest"
+echo "---> Install mamonsu latest"
 echo && echo
 
 # clean install mamonsu
@@ -45,7 +45,7 @@ if [ "${OS%:*}" = "centos" ]; then
     systemctl daemon-reload
     systemctl restart mamonsu
     sleep 5
-    echo && echo && echo "Mamonsu version:"
+    echo && echo && echo "mamonsu version:"
     mamonsu --version
     echo && echo
 
@@ -67,7 +67,7 @@ elif [ "${OS%:*}" = "ubuntu" ]; then
     cat /mamonsu/github-actions-tests/sources/agent_3.4.0.conf > /etc/mamonsu/agent.conf
     service mamonsu restart
     sleep 5
-    echo && echo && echo "Mamonsu version:"
+    echo && echo && echo "mamonsu version:"
     mamonsu --version
     echo && echo
 

github-actions-tests/mamonsu_removal.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# default parameters:
+OS="centos:7"
+
+for i in "$@"
+do
+case $i in
+    --os=*)
+    OS="${i#*=}"
+    shift
+    ;;
+    *)
+          # unknown option
+    ;;
+esac
+done
+
+echo && echo
+echo "================================================================================================================="
+echo "---> Remove mamonsu"
+echo && echo
+
+if [ "${OS%:*}" = "centos" ]; then
+  sudo yum erase mamonsu -y
+  echo "---> mamonsu directories and files after removal:"
+  sudo find / -name "mamonsu" 2>/dev/null
+elif [ "${OS%:*}" = "ubuntu" ]; then
+  sudo apt-get purge mamonsu -y
+  echo "---> mamonsu directories and files after removal:"
+  sudo find / -name "mamonsu" 2>/dev/null
+fi

mamonsu/plugins/system/linux/memory.py

@@ -84,16 +84,37 @@ def graphs(self, template, dashboard=False):
         all_items = []
         free_used_items = []
         for item in self.Items:
-            all_items.append({
-                "key": self.right_type(self.key, item[0]),
-                "color": item[3]
-            })
-            if item[0] in ["cached", "available", "used", "total"]:
-                free_used_items.append({
+            if item[0] != "total":
+                all_items.append({
                     "key": self.right_type(self.key, item[0]),
-                    "color": item[3],
-                    "drawtype": item[4]
+                    "color": item[3]
                 })
+        # manually build Free/Used graph items to manage the order of graph filled regions
+        # used - User-Space
+        free_used_items.append({
+            "key": self.right_type(self.key, self.Items[13][0]),
+            "color": self.Items[13][3],
+            "drawtype": self.Items[13][4]
+        })
+        # cached
+        free_used_items.append({
+            "key": self.right_type(self.key, self.Items[3][0]),
+            "color": self.Items[3][3],
+            "drawtype": self.Items[3][4]
+        })
+        # available
+        free_used_items.append({
+            "key": self.right_type(self.key, self.Items[1][0]),
+            "color": self.Items[1][3],
+            "drawtype": self.Items[1][4]
+        })
+        # total
+        free_used_items.append({
+            "key": self.right_type(self.key, self.Items[11][0]),
+            "color": self.Items[11][3],
+            "drawtype": self.Items[11][4]
+        })
+
         graphs = [
             {
                 "name": self.graph_name_detailed,
@@ -104,7 +125,7 @@ def graphs(self, template, dashboard=False):
             {
                 "name": self.graph_name_free_used,
                 "height": 400,
-                "type": 1,
+                "type": 0,
                 "items": free_used_items
             }
         ]

packaging/debian/init

@@ -27,7 +27,7 @@ COMMAND="/usr/bin/$NAME -d -a /etc/mamonsu/plugins -c $CONFIG -p $PIDFILE"
 RUNAS=mamonsu
 
 [ ! -d $PIDDIR ] && mkdir -p $PIDDIR
-chown $RUNAS $PIDDIR
+chown -R $RUNAS $PIDDIR
 
 start() {
   if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then

packaging/debian/postinst

@@ -14,14 +14,15 @@ if [ "$1" = "configure" ]; then
     fi
 
     mkdir -p /var/run/mamonsu
-    chown mamonsu:mamonsu /var/run/mamonsu
 
     mkdir -p /etc/mamonsu/plugins
     touch /etc/mamonsu/plugins/__init__.py
-    [ -f /etc/mamonsu/agent.conf ] || cp /usr/share/mamonsu/example_linux.conf /etc/mamonsu/agent.conf && chown mamonsu:mamonsu /etc/mamonsu/agent.conf
+    [ -f /etc/mamonsu/agent.conf ] || cp /usr/share/mamonsu/example_linux.conf /etc/mamonsu/agent.conf
 
-    chown mamonsu:mamonsu /var/log/mamonsu
-    chown mamonsu:mamonsu /var/lib/mamonsu
+    chown -R mamonsu:mamonsu /var/run/mamonsu
+    chown -R mamonsu:mamonsu /var/log/mamonsu
+    chown -R mamonsu:mamonsu /var/lib/mamonsu
+    chown -R mamonsu:mamonsu /etc/mamonsu
 
 fi
 

packaging/rpm/SOURCES/mamonsu.init

@@ -27,7 +27,7 @@ COMMAND="/usr/bin/$NAME -d -a /etc/mamonsu/plugins -c $CONFIG -p $PIDFILE"
 RUNAS=mamonsu
 
 [ ! -d $PIDDIR ] && mkdir -p $PIDDIR
-chown $RUNAS $PIDDIR
+chown -R $RUNAS $PIDDIR
 
 start() {
   if [ -f $PIDFILE ] && kill -0 $(cat $PIDFILE); then

packaging/rpm/SPECS/mamonsu.spec

@@ -57,20 +57,20 @@ getent passwd mamonsu > /dev/null || \
     -c "mamonsu monitoring user" mamonsu
 
 mkdir -p /var/run/mamonsu
-chown mamonsu.mamonsu /var/run/mamonsu
+chown -R mamonsu.mamonsu /var/run/mamonsu
 
 mkdir -p /etc/mamonsu/plugins
 touch /etc/mamonsu/plugins/__init__.py
 
 mkdir -p /var/log/mamonsu
-chown mamonsu.mamonsu /var/log/mamonsu
+chown -R mamonsu.mamonsu /var/log/mamonsu
 
 %preun
 /sbin/service mamonsu stop >/dev/null 2>&1
 /sbin/chkconfig --del mamonsu
 
 %post
-chown mamonsu.mamonsu /etc/mamonsu/agent.conf
+chown -R mamonsu.mamonsu /etc/mamonsu
 
 %changelog
 * Mon Feb 21 2022 Alexandra Kuznetsova <[email protected]>  - 3.4.0-1