Revert changes since v1.21 in pereparation for hotfix release.

2 files changed, 9 insertions, 4 deletions

diff --git a/collectors/apps.plugin/apps_groups.conf b/collectors/apps.plugin/apps_groups.conf
index 2ed6192b59..c0f82acfca 100644
--- a/collectors/apps.plugin/apps_groups.conf
+++ b/collectors/apps.plugin/apps_groups.conf
@@ -96,7 +96,7 @@ fail2ban: fail2ban*
 # -----------------------------------------------------------------------------
 # web/ftp servers
 
-httpd: apache* httpd nginx* lighttpd hiawatha
+httpd: apache* httpd nginx* lighttpd
 proxy: squid* c-icap squidGuard varnish*
 php: php*
 ftpd: proftpd in.tftpd vsftpd
@@ -107,7 +107,7 @@ puma: *puma*
 # -----------------------------------------------------------------------------
 # database servers
 
-sql: mysqld* mariad* postgres* postmaster* oracle_* ora_* sqlservr
+sql: mysqld* mariad* postgres* postmaster* oracle_* ora_*
 nosql: mongod redis* memcached *couchdb*
 timedb: prometheus *carbon-cache.py* *carbon-aggregator.py* *graphite/manage.py* *net.opentsdb.tools.TSDMain* influxd*
 columndb: clickhouse-server*
@@ -223,7 +223,7 @@ torrents: *deluge* transmission* *SickBeard* *CouchPotato* *rtorrent*
 # -----------------------------------------------------------------------------
 # backup servers and clients
 
-backup: rsync lsyncd bacula* borg
+backup: rsync lsyncd bacula*
 
 # -----------------------------------------------------------------------------
 # cron
@@ -239,7 +239,7 @@ ups: upsmon upsd */nut/*
 # media players, servers, clients
 
 media: mplayer vlc xine mediatomb omxplayer* kodi* xbmc* mediacenter eventlircd
-media: mpd minidlnad mt-daapd avahi* Plex* squeeze*
+media: mpd minidlnad mt-daapd avahi* Plex*
 
 # -----------------------------------------------------------------------------
 # java applications
diff --git a/collectors/apps.plugin/apps_plugin.c b/collectors/apps.plugin/apps_plugin.c
index 31a241c169..5f40270132 100644
--- a/collectors/apps.plugin/apps_plugin.c
+++ b/collectors/apps.plugin/apps_plugin.c
@@ -4110,6 +4110,8 @@ int main(int argc, char **argv) {
 
     procfile_adaptive_initial_allocation = 1;
 
+    time_t started_t = now_monotonic_sec();
+
     get_system_HZ();
 #ifdef __FreeBSD__
     time_factor = 1000000ULL / RATES_DETAIL; // FreeBSD uses usecs
@@ -4210,5 +4212,8 @@ int main(int argc, char **argv) {
         show_guest_time_old = show_guest_time;
 
         debug_log("done Loop No %zu", global_iterations_counter);
+
+        // restart check (14400 seconds)
+        if(now_monotonic_sec() - started_t > 14400) exit(0);
     }
 }