diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-04-13 10:32:33 -0400 |
|---|---|---|
| committer | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-04-13 10:32:33 -0400 |
| commit | 983a26d1a2c110b35db252b4b79c3f03eb4eeb4b (patch) | |
| tree | 85d42c30bc81514bd5c18aa564497e439290523b /collectors/apps.plugin | |
| parent | 5a12b4a7e42587058b9b42871a1316545d527a57 (diff) | |
Revert "Revert changes since v1.21 in pereparation for hotfix release."
This reverts commit e2874320fc027f7ab51ab3e115d5b1889b8fd747.
Diffstat (limited to 'collectors/apps.plugin')
| -rw-r--r-- | collectors/apps.plugin/apps_groups.conf | 8 | ||||
| -rw-r--r-- | collectors/apps.plugin/apps_plugin.c | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/collectors/apps.plugin/apps_groups.conf b/collectors/apps.plugin/apps_groups.conf index c0f82acfca..2ed6192b59 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 +httpd: apache* httpd nginx* lighttpd hiawatha 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_* +sql: mysqld* mariad* postgres* postmaster* oracle_* ora_* sqlservr 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* +backup: rsync lsyncd bacula* borg # ----------------------------------------------------------------------------- # 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* +media: mpd minidlnad mt-daapd avahi* Plex* squeeze* # ----------------------------------------------------------------------------- # java applications diff --git a/collectors/apps.plugin/apps_plugin.c b/collectors/apps.plugin/apps_plugin.c index 5f40270132..31a241c169 100644 --- a/collectors/apps.plugin/apps_plugin.c +++ b/collectors/apps.plugin/apps_plugin.c @@ -4110,8 +4110,6 @@ 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 @@ -4212,8 +4210,5 @@ 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); } } |