Merge pull request #1444 from feature/custom-prometheus-exporter

Add custom metrics exporter

Author: theCalcaholic

bin/ncp-dist-upgrade

@@ -89,6 +89,9 @@ sleep 2 # avoid systemd thinking that PHP is in a crash/restart loop
 $APTINSTALL -t ${release_new} php${php_ver_new}-gmp
 #$APTINSTALL -t ${release_new} imagemagick php${php_ver_new}-imagick ghostscript
 
+# Reinstall prometheus-node-exporter, specifically WITH install-recommends to include collectors on bullseye and later
+{ dpkg -l | grep '^ii.*prometheus-node-exporter' >/dev/null && apt-get install -y prometheus-node-exporter-collectors; } || true
+
 apt-get autoremove -y
 apt-get clean
 

bin/ncp-update

@@ -2,6 +2,8 @@
 
 # update latest NextCloudPi code from github
 
+[[ -z "$DBG" ]] || set -$DBG
+
 {
   [ "$(id -u)" -ne 0 ] && { printf "Must be run as root. Try 'sudo $0'\n"; exit 1; }
 

bin/ncp/BACKUPS/nc-backup-auto.sh

@@ -7,6 +7,13 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
+tmpl_get_destination() {
+  (
+  . /usr/local/etc/library.sh
+  find_app_param nc-backup-auto DESTDIR
+  )
+}
+
 configure()
 {
   [[ $ACTIVE != "yes" ]] && {
@@ -44,6 +51,11 @@ EOF
   chmod 644 /etc/cron.d/ncp-backup-auto
   service cron restart
 
+  (
+    . "${BINDIR}/SYSTEM/metrics.sh"
+    reload_metrics_config
+  )
+
   echo "automatic backups enabled"
 }
 

bin/ncp/BACKUPS/nc-backup.sh

@@ -7,6 +7,13 @@
 # More at https://ownyourbits.com/2017/02/13/nextcloud-ready-raspberry-pi-image/
 #
 
+tmpl_get_destination() {
+  (
+  . /usr/local/etc/library.sh
+  find_app_param nc-backup DESTDIR
+  )
+}
+
 install()
 {
   apt-get update
@@ -123,6 +130,10 @@ EOF
 
 configure()
 {
+  (
+    . "${BINDIR}/SYSTEM/metrics.sh"
+    reload_metrics_config
+  )
   ncp-backup "$DESTDIR" "$INCLUDEDATA" "$COMPRESS" "$BACKUPLIMIT"
 }
 

bin/ncp/BACKUPS/nc-snapshot-sync.sh

@@ -9,6 +9,25 @@
 #
 
 
+tmpl_get_destination() {
+  (
+  . /usr/local/etc/library.sh
+  find_app_param nc-snapshot-sync DESTINATION
+  )
+}
+
+tmpl_is_destination_local() {
+  (
+  . /usr/local/etc/library.sh
+  is_active_app nc-snapshot-sync || exit 1
+  ! [[ "$(find_app_param nc-snapshot-sync DESTINATION)" =~ .*"@".*":".* ]]
+  )
+}
+
+is_active() {
+  [[ $ACTIVE == "yes" ]]
+}
+
 install()
 {
   apt-get update
@@ -46,6 +65,12 @@ configure()
   echo "30  4  */${SYNCDAYS}  *  *  root  /usr/local/bin/btrfs-sync -qd $ZIP \"$SNAPDIR\" \"$DESTINATION\"" > /etc/cron.d/ncp-snapsync-auto
   chmod 644 /etc/cron.d/ncp-snapsync-auto
   service cron restart
+
+  (
+    . "${BINDIR}/SYSTEM/metrics.sh"
+    reload_metrics_config
+  )
+
   echo "snapshot sync enabled"
 }
 

bin/ncp/CONFIG/nc-datadir.sh

@@ -113,6 +113,11 @@ configure()
   sed -i "s|logpath  =.*nextcloud.log|logpath  = ${DATADIR}/nextcloud.log|" /etc/fail2ban/jail.local
 
   restore_maintenance_mode
+
+  (
+    . "${BINDIR}/SYSTEM/metrics.sh"
+    reload_metrics_config
+  )
 }
 
 # License

bin/ncp/CONFIG/nc-nextcloud.sh

@@ -215,12 +215,14 @@ EOF
   cat > /etc/systemd/system/notify_push.service <<EOF
 [Unit]
 Description = Push daemon for Nextcloud clients
-After = mysql.service
+After=mysql.service
+After=redis.service
+Requires=redis.service
 
 [Service]
-Environment = PORT=7867
-Environment = NEXTCLOUD_URL=https://localhost
-ExecStart = /var/www/nextcloud/apps/notify_push/bin/"${arch}"/notify_push --allow-self-signed /var/www/nextcloud/config/config.php
+Environment=PORT=7867
+Environment=NEXTCLOUD_URL=https://localhost
+ExecStart=/var/www/nextcloud/apps/notify_push/bin/"${arch}"/notify_push --allow-self-signed /var/www/nextcloud/config/config.php
 User=www-data
 
 [Install]