Moved Munin setup.

1.Utilities/0_setup.py

@@ -9,7 +9,7 @@ def setup(interactive=True):
     cmds = [
         'apt-get clean',
         'apt-get update',
-        'apt-get install --yes make ipython ipython3 vim netcat git htop iotop bmon host lm-sensors munin munin-node pciutils ntp nfs-client smartmontools pwgen ntpdate dialog',
+        'apt-get install --yes make ipython ipython3 vim netcat git htop iotop bmon host lm-sensors pciutils ntp nfs-client smartmontools pwgen ntpdate dialog',
         '[ -f ~/.vimrc ] || echo "color ron" > ~/.vimrc',
     ]
     utils.run_commands(cmds)

31.Install_munin/0_setup.sh → 7.Munin/0_setup.sh

@@ -6,35 +6,38 @@ source /root/envsetup/conf.sh
 # munin
 DEBIAN_FRONTEND=noninteractive apt-get install -y ubicast-config
 
+# modify df function https://redmine.ubicast.net/issues/17912
+sed -i "s@-P -l @-P@" /usr/share/munin/plugins/df
+
+
 # configure alerts
 # detect where to insert
-LIG=$(grep -n contact.nagios.command /etc/munin/munin.conf | awk -F ":" '{print$1}')
-LIG=$(( $LIG + 1 ))
+#LIG=$(grep -n contact.nagios.command /etc/munin/munin.conf | awk -F ":" '{print$1}')
+#LIG=$(( $LIG + 1 ))
+#head -n ${LIG} /etc/munin/munin.conf > /etc/munin/munin.conf.tmp
 
-head -n ${LIG} /etc/munin/munin.conf > /etc/munin/munin.conf.tmp
+#cat << EOF >> /etc/munin/munin.conf.tmp
+#contacts alert
+#contact.alert.command mail -a "From:sysadmin <sysadmin@ubicast.eu>" -s "[munin] Alert on ${var:host}" sysadmin@ubicast.eu
+#contact.alert.always_send warning critical
 
-cat << EOF >> /etc/munin/munin.conf.tmp
-contacts alert
-contact.alert.command mail -a "From:sysadmin <sysadmin@ubicast.eu>" -s "[munin] Alert on ${var:host}" sysadmin@ubicast.eu
-contact.alert.always_send warning critical
+#[${MS_SERVER_NAME}]
+#    address 127.0.0.1
+#    use_node_name yes
+#    memory.free.warning 512000000:
+#EOF
 
-[${MS_SERVER_NAME}]
-    address 127.0.0.1
-    use_node_name yes
-    memory.free.warning 512000000:
-EOF
+#mv /etc/munin/munin.conf.tmp /etc/munin/munin.conf
 
-mv /etc/munin/munin.conf.tmp /etc/munin/munin.conf
-# modify df function https://redmine.ubicast.net/issues/17912
-sed -i "s@-P -l @-P@" /usr/share/munin/plugins/df
 
 # new skin templates
-cd /etc/munin
-git clone https://git.ubicast.net/mediaserver/munin-monitoring-theme.git
-mv /etc/munin/static /etc/munin/static.orig
-mv /etc/munin/templates /etc/munin/templates.orig
-cp -pr munin-monitoring-theme/templates/munstrap/static /etc/munin/
-cp -pr munin-monitoring-theme/templates/munstrap/templates /etc/munin/
+#cd /etc/munin
+#git clone https://git.ubicast.net/mediaserver/munin-monitoring-theme.git
+#mv /etc/munin/static /etc/munin/static.orig
+#mv /etc/munin/templates /etc/munin/templates.orig
+#cp -pr munin-monitoring-theme/templates/munstrap/static /etc/munin/
+#cp -pr munin-monitoring-theme/templates/munstrap/templates /etc/munin/
+
 # service restart
 service munin restart || true
 service munin-node restart

launcher.sh

@@ -28,9 +28,9 @@ init() {
 
 monitor() {
     python3 /root/envsetup/envsetup.py 3
+    python3 /root/envsetup/envsetup.py 6
     python3 /root/envsetup/envsetup.py 7
     python3 /root/envsetup/envsetup.py 31
-    python3 /root/envsetup/envsetup.py 32
 }
 
 mediaserver() {
@@ -38,10 +38,10 @@ mediaserver() {
     python3 /root/envsetup/envsetup.py 5
     python3 /root/envsetup/envsetup.py 8
     python3 /root/envsetup/envsetup.py 61
-    python3 /root/envsetup/envsetup.py 7
+    python3 /root/envsetup/envsetup.py 6
     python3 /root/envsetup/envsetup.py 41
     python3 /root/envsetup/envsetup.py 42
-    python3 /root/envsetup/envsetup.py 7
+    python3 /root/envsetup/envsetup.py 6
 }
 
 worker() {
@@ -50,9 +50,9 @@ worker() {
 
 campusmanager() {
     python3 /root/envsetup/envsetup.py 3
-    python3 /root/envsetup/envsetup.py 7
+    python3 /root/envsetup/envsetup.py 6
     python3 /root/envsetup/envsetup.py 51
-    python3 /root/envsetup/envsetup.py 7
+    python3 /root/envsetup/envsetup.py 6
 }
 
 cache() {