New upstream version 1.5.0+dfsgupstream/1.5.0+dfsg

1 files changed, 56 insertions, 32 deletions

diff --git a/conf.d/apps_groups.conf b/conf.d/apps_groups.conf
index 57357a873..e2836877c 100644
--- a/conf.d/apps_groups.conf
+++ b/conf.d/apps_groups.conf
@@ -3,7 +3,7 @@
 #
 # The apps.plugin displays charts with information about the processes running.
 # This config allows grouping processes together, so that several processes
-# will be reported together.
+# will be reported as one.
 #
 # Only groups in this file are reported. All other processes will be reported
 # as 'other'.
@@ -13,32 +13,43 @@
 #
 # The format is:
 #
-# group_name: process1 process2 process3 ...
+#       group: process1 process2 process3 ...
 #
-# The process names are the same to the ones returned by: ps -e
-# or /proc/PID/stat
+# Each group can be given multiple times, to add more processes to it.
+#
+# The process names are the ones returned by:
+#
+#  -  ps -e or /proc/PID/stat
+#  -  in case of substring mode (see below): /proc/PID/cmdline
 #
 # To add process names with spaces, enclose them in quotes (single or double)
-# example: 'Plex Media Serv' "my other process"
+# example: 'Plex Media Serv' "my other process".
 #
 # Wildcard support:
-# You can add an asterisk (*) at the beginning and/or the end of a process name:
-#  *name    suffix mode: will search for processes ending with 'name' (/proc/PID/stat)
-#   name*   prefix mode: will search for processes beginning with 'name' (/proc/PID/stat)
-#  *name*   substring mode: will search for 'name' in the whole command line (/proc/PID/cmdline)
+# You can add an asterisk (*) at the beginning and/or the end of a process:
+#
+#  *name    suffix mode: will search for processes ending with 'name'
+#           (/proc/PID/stat)
+#
+#   name*   prefix mode: will search for processes beginning with 'name'
+#           (/proc/PID/stat)
+#
+#  *name*   substring mode: will search for 'name' in the whole command line
+#           (/proc/PID/cmdline)
 #
 # If you enter even just one *name* (substring), apps.plugin will process
 # /proc/PID/cmdline for all processes, just once (when they are first seen).
 #
-# To add process names with single quotes, enclose them in double quotes
+# To add processes with single quotes, enclose them in double quotes
 # example: "process with this ' single quote"
 #
-# To add process names with double quotes, enclose them in single quotes:
+# To add processes with double quotes, enclose them in single quotes:
 # example: 'process with this " double quote'
 #
-# If a group name starts with a -, the dimension will be hidden (cpu chart only)
+# If a group or process name starts with a -, the dimension will be hidden
+# (cpu chart only).
 #
-# If any process name starts with a +, debugging will be enabled for it
+# If a process starts with a +, debugging will be enabled for it
 # (debugging produces a lot of output - do not enable it in production systems)
 #
 # You can add any number of groups you like. Only the ones found running will
@@ -86,8 +97,8 @@ unicorn: *unicorn*
 # -----------------------------------------------------------------------------
 # database servers
 
-sql: mysqld* mariad* postgres*
-nosql: mongod redis*
+sql: mysqld* mariad* postgres* oracle_* ora_*
+nosql: mongod redis* memcached
 
 # -----------------------------------------------------------------------------
 # email servers
@@ -106,22 +117,26 @@ wifi: hostapd wpa_supplicant
 
 camo: *camo*
 balancer: ipvs_* haproxy
-ha: corosync hs_logd ha_logd stonithd
+ha: corosync hs_logd ha_logd stonithd pacemakerd lrmd crmd
 
 # -----------------------------------------------------------------------------
 # telephony
 
 pbx: asterisk safe_asterisk *vicidial*
 sip: opensips* stund
-murmur: murmurd
-xmpp: *vines* *prosody*
+
+# -----------------------------------------------------------------------------
+# chat
+
+chat: irssi *vines* *prosody* murmurd
 
 # -----------------------------------------------------------------------------
 # monitoring
 
-logs: ulogd* syslog* rsyslog* logrotate
+logs: ulogd* syslog* rsyslog* logrotate systemd-journald
 nms: snmpd vnstatd smokeping zabbix* monit munin* mon openhpid watchdog tailon nrpe
 splunk: splunkd
+azure: mdsd *waagent* *omiserver* *omiagent* hv_kvp_daemon hv_vss_daemon
 
 # -----------------------------------------------------------------------------
 # file systems and file servers
@@ -130,6 +145,7 @@ samba: smbd nmbd winbindd
 nfs: rpcbind rpc.* nfs*
 zfs: spl_* z_* txg_* zil_* arc_* l2arc*
 btrfs: btrfs*
+iscsi: iscsid iscsi_eh
 
 # -----------------------------------------------------------------------------
 # containers & virtual machines
@@ -150,7 +166,7 @@ print: cups* lpd lpq
 # -----------------------------------------------------------------------------
 # time servers and clients
 
-time: ntp*
+time: ntp* systemd-timesyncd
 
 # -----------------------------------------------------------------------------
 # dhcp servers and clients
@@ -165,7 +181,8 @@ named: named rncd dig
 # -----------------------------------------------------------------------------
 # installation / compilation / debugging
 
-build: cc1 cc1plus as gcc* ld make automake autoconf autoreconf git valgrind*
+build: cc1 cc1plus as gcc* cppcheck ld make cmake automake autoconf autoreconf 
+build: git gdb valgrind*
 
 # -----------------------------------------------------------------------------
 # antivirus
@@ -175,7 +192,7 @@ antivirus: clam* *clam
 # -----------------------------------------------------------------------------
 # torrent clients
 
-torrents: *deluge* transmission* *SickBeard*
+torrents: *deluge* transmission* *SickBeard* *CouchPotato* *rtorrent*
 
 # -----------------------------------------------------------------------------
 # backup servers and clients
@@ -185,7 +202,7 @@ backup: rsync bacula*
 # -----------------------------------------------------------------------------
 # cron
 
-cron: cron atd anacron
+cron: cron* atd anacron systemd-cron*
 
 # -----------------------------------------------------------------------------
 # UPS
@@ -193,21 +210,29 @@ cron: cron atd anacron
 ups: upsmon upsd */nut/*
 
 # -----------------------------------------------------------------------------
-# Kernel / System
+# media players, servers, clients
 
-system: systemd* udisks* udevd* *udevd connmand ipv6_addrconf dbus-* inetd xinetd mdadm
-kernel: kthreadd kauditd lockd khelper kdevtmpfs khungtaskd rpciod fsnotify_mark kthrotld iscsi_eh deferwq
-ksmd: ksmd
+media: mplayer vlc xine mediatomb omxplayer* kodi* xbmc* mediacenter eventlircd
+media: mpd minidlnad mt-daapd avahi* Plex*
 
 # -----------------------------------------------------------------------------
-# media players, servers, clients
+# X
 
-media: mplayer vlc xine mediatomb omxplayer* kodi* xbmc* mediacenter eventlircd mpd minidlnad mt-daapd avahi*
+X: X Xorg xinit lightdm xdm pulseaudio gkrellm xfwm4 xfdesktop xfce* Thunar
+X: xfsettingsd xfconfd gnome-* gdm gconf* dconf* xfconf* *gvfs gvfs* kdm slim
+X: evolution-* firefox chromium opera epiphany WebKit*
 
 # -----------------------------------------------------------------------------
-# X
+# Kernel / System
+
+ksmd: ksmd
+
+system: systemd* udisks* udevd* *udevd connmand ipv6_addrconf dbus-* rtkit*
+system: inetd xinetd mdadm polkitd acpid uuidd packagekitd upowerd colord
+system: accounts-daemon rngd haveged
 
-X: X lightdm xdm pulseaudio gkrellm xfwm4 xfdesktop xfce* Thunar xfsettingsd xfconfd gnome-* gdm gconfd-2 *gvfsd gvfsd* kdm slim
+kernel: kthreadd kauditd lockd khelper kdevtmpfs khungtaskd rpciod
+kernel: fsnotify_mark kthrotld deferwq scsi_*
 
 # -----------------------------------------------------------------------------
 # other application servers
@@ -215,5 +240,4 @@ X: X lightdm xdm pulseaudio gkrellm xfwm4 xfdesktop xfce* Thunar xfsettingsd xfc
 crsproxy: crsproxy
 sidekiq: *sidekiq*
 java: java
-chat: irssi
 ipfs: ipfs