Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 165 insertions, 356 deletions

diff --git a/src/collectors/apps.plugin/apps_groups.conf b/src/collectors/apps.plugin/apps_groups.conf
index 724616c18..8d4b1722c 100644
--- a/src/collectors/apps.plugin/apps_groups.conf
+++ b/src/collectors/apps.plugin/apps_groups.conf
@@ -1,438 +1,247 @@
-#
-# apps.plugin process grouping
-#
-# The apps.plugin displays charts with information about the processes running.
-# This config allows grouping processes together, so that several processes
-# will be reported as one.
-#
-# Only groups in this file are reported. All other processes will be reported
-# as 'other'.
-#
-# For each process given, its whole process tree will be grouped, not just
-# the process matched. The plugin will include both parents and childs.
-#
-# The format is:
-#
-#       group: process1 process2 process3 ...
-#
-# 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".
-#
-# Note that spaces are not supported for process groups. Use a dash "-" instead.
-# example-process-group: process1 process2
-#
-# Wildcard support:
-# 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 processes with single quotes, enclose them in double quotes
-# example: "process with this ' single quote"
-#
-# To add processes with double quotes, enclose them in single quotes:
-# example: 'process with this " double quote'
-#
-# If a group or process name starts with a -, the dimension will be hidden
-# (cpu chart only).
-#
-# 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
-# affect the charts generated. However, producing charts with hundreds of
-# dimensions may slow down your web browser.
-#
-# The order of the entries in this list is important: the first that matches
-# a process is used, so put important ones at the top. Processes not matched
-# by any row, will inherit it from their parents or children.
-#
-# The order also controls the order of the dimensions on the generated charts
-# (although applications started after apps.plugin is started, will be appended
-# to the existing list of dimensions the netdata daemon maintains).
-
-# -----------------------------------------------------------------------------
-# NETDATA processes accounting
-
-# netdata main process
-netdata: netdata
-
-# netdata known plugins
-# plugins not defined here will be accumulated in netdata, above
-apps.plugin: apps.plugin
-freeipmi.plugin: freeipmi.plugin
-nfacct.plugin: nfacct.plugin
-cups.plugin: cups.plugin
-xenstat.plugin: xenstat.plugin
-perf.plugin: perf.plugin
-charts.d.plugin: *charts.d.plugin*
-python.d.plugin: *python.d.plugin*
-systemd-journal.plugin: *systemd-journal.plugin*
-network-viewer.plugin: *network-viewer.plugin*
-tc-qos-helper: *tc-qos-helper.sh*
-fping: fping
-ioping: ioping
-go.d.plugin: *go.d.plugin*
-slabinfo.plugin: *slabinfo.plugin*
-ebpf.plugin: *ebpf.plugin*
-debugfs.plugin: *debugfs.plugin*
-
-# agent-service-discovery
-agent_sd: agent_sd
+##
+## apps.plugin process grouping
+##
+## Documentation at:
+## https://github.com/netdata/netdata/blob/master/src/collectors/apps.plugin/README.md
+##
+## -----------------------------------------------------------------------------
+## Subprocesses of process managers are monitored individually.
+## (uncomment to add or edit - the default is also hardcoded into the plugin)
 
-# -----------------------------------------------------------------------------
-# authentication/authorization related servers
+## Clear all the managers, to set yours, otherwise append to the internal list.
+#managers: clear
 
-auth: radius* openldap* ldap* slapd authelia sssd saslauthd polkitd gssproxy
-fail2ban: fail2ban*
+## Linux process managers
+#managers: init systemd containerd-shim-runc-v2 dumb-init gnome-shell docker-init tini
+#managers: spawn-plugins openrc-run.sh crond plasmashell xfwm4
 
-# -----------------------------------------------------------------------------
-# web/ftp servers
+## FreeBSD process managers
+#managers: init spawn-plugins
 
-httpd: apache* httpd nginx* lighttpd hiawatha caddy h2o
-proxy: squid* c-icap squidGuard varnish*
-php: php* lsphp*
-ftpd: proftpd in.tftpd vsftpd
-uwsgi: uwsgi
-unicorn: *unicorn*
-puma: *puma*
+## MacOS process managers
+#managers: launchd spawn-plugins
 
-# -----------------------------------------------------------------------------
-# database servers
+## Windows process managers
+#managers: wininit services explorer System netdata
 
-sql: mysqld* mariad* postgres* postmaster* oracle_* ora_* sqlservr
-nosql: mongod redis* valkey* memcached *couchdb*
-timedb: prometheus *carbon-cache.py* *carbon-aggregator.py* *graphite/manage.py* *net.opentsdb.tools.TSDMain* influxd*
+## -----------------------------------------------------------------------------
+## Interpreters to search for the actual command name in command line.
+## (uncomment to add or edit - the default is also hardcoded into the plugin)
 
-clickhouse: clickhouse-serv* clickhouse-cli* clckhouse-watch
+## Clear all the interpreters, to set yours, otherwise append to the internal list.
+#interpreters: clear
 
-# -----------------------------------------------------------------------------
-# email servers
+#interpreters: python python2 python3
+#interpreters: sh bash zsh
+#interpreters: node perl awk
 
-mta: amavis* zmstat-* zmdiaglog zmmailboxdmgr opendkim postfwd2 smtp* lmtp* sendmail postfix master pickup qmgr showq tlsmgr postscreen oqmgr msmtp* nullmailer*
-mda: dovecot *imapd *pop3d *popd
+## -----------------------------------------------------------------------------
+## Processes of interest
+## Grouping and/or rename individual processes.
+## (there is no internal default for this section)
 
-# -----------------------------------------------------------------------------
-# network, routing, VPN
+## NETDATA processes accounting
+netdata: netdata
 
-ppp: ppp*
-vpn: openvpn pptp* cjdroute gvpe tincd wireguard tailscaled
-wifi: hostapd wpa_supplicant
-routing: ospfd* ospf6d* bgpd bfdd fabricd isisd eigrpd sharpd staticd ripd ripngd pimd pbrd nhrpd ldpd zebra vrrpd vtysh bird*
-modem: ModemManager
-netmanager: NetworkManager nm* systemd-networkd networkctl netplan connmand wicked* avahi-autoipd networkd-dispatcher
-firewall: firewalld ufw nft
-tor: tor
-bluetooth: bluetooth bluetoothd bluez bluedevil obexd
+## NETDATA agent-service-discovery (kubernetes)
+agent_sd: agent_sd
 
-# -----------------------------------------------------------------------------
-# high availability and balancers
+## -----------------------------------------------------------------------------
 
+oracledb: ora_* oracle_* *runOracle.sh*
+unicorn: *unicorn*
+puma: *puma*
+couchdb: *couchdb*
+graphite: *carbon-cache.py* *carbon-aggregator.py* *graphite/manage.py*
+opentsdb: *net.opentsdb.tools.TSDMain*
+imapd: *imapd
+pop3d: *pop3d
+popd: *popd
 camo: *camo*
-balancer: ipvs_* haproxy
-ha: corosync hs_logd ha_logd stonithd pacemakerd lrmd crmd keepalived ucarp*
-
-# -----------------------------------------------------------------------------
-# telephony
-
-pbx: asterisk safe_asterisk *vicidial*
-sip: opensips* stund
-
-# -----------------------------------------------------------------------------
-# chat
-
-chat: irssi *vines* *prosody* murmurd
-
-# -----------------------------------------------------------------------------
-# monitoring
-
-logs: ulogd* syslog* rsyslog* logrotate *systemd-journal* rotatelogs sysklogd metalog
-nms: snmpd vnstatd smokeping zabbix* munin* mon openhpid tailon nrpe
-monit: monit
-splunk: splunkd
+vicidial: *vicidial*
+vines: *vines*
+prosody: *prosody*
 azure: mdsd *waagent* *omiserver* *omiagent* hv_kvp_daemon hv_vss_daemon *auoms* *omsagent*
 datadog: *datadog*
-edgedelta: edgedelta
 newrelic: newrelic*
 google-agent: *google_guest_agent* *google_osconfig_agent*
-nvidia-smi: nvidia-smi
-intel_gpu_top: intel_gpu_top
-htop: htop
-watchdog: watchdog
-telegraf: telegraf
-grafana: grafana*
-
-# -----------------------------------------------------------------------------
-# storage, file systems and file servers
-
-ceph: ceph-* ceph_* radosgw* rbd-* cephfs-* osdmaptool crushtool
-samba: smbd nmbd winbindd ctdbd ctdb-* ctdb_*
-nfs: rpcbind rpc.* nfs*
-zfs: spl_* z_* txg_* zil_* arc_* l2arc*
-btrfs: btrfs*
-iscsi: iscsid iscsi_eh
-afp: netatalk afpd cnid_dbd cnid_metad
-ntfs-3g: ntfs-3g
-
-# -----------------------------------------------------------------------------
-# kubernetes
-
-kubelet: kubelet
-kube-dns: kube-dns
-kube-proxy: kube-proxy
-metrics-server: metrics-server
-heapster: heapster
-
-# -----------------------------------------------------------------------------
-# AWS
-
 aws-s3: '*aws s3*' s3cmd s5cmd
-aws: aws
-
-# -----------------------------------------------------------------------------
-# virtualization platform
-
 proxmox-ve: pve* spiceproxy
-
-# -----------------------------------------------------------------------------
-# containers & virtual machines
-
-containers: lxc* docker* balena* containerd
-VMs: vbox* VBox* qemu* kvm*
 libvirt: virtlogd virtqemud virtstoraged virtnetworkd virtlockd virtinterfaced
 libvirt: virtnodedevd virtproxyd virtsecretd libvirtd
 guest-agent: qemu-ga spice-vdagent cloud-init*
-
-# -----------------------------------------------------------------------------
-# ssh servers and clients
-
-ssh: ssh* scp sftp* dropbear
-
-# -----------------------------------------------------------------------------
-# print servers and clients
-
-print: cups* lpd lpq
-
-# -----------------------------------------------------------------------------
-# time servers and clients
-
-time: ntp* systemd-timesyn* chronyd ptp*
-
-# -----------------------------------------------------------------------------
-# dhcp servers and clients
-
-dhcp: *dhcp* dhclient
-
-# -----------------------------------------------------------------------------
-# name servers and clients
-
-dns: named unbound nsd pdns_server knotd gdnsd yadifad dnsmasq *systemd-resolve* pihole* avahi-daemon avahi-dnsconfd
-dnsdist: dnsdist
-
-# -----------------------------------------------------------------------------
-# installation / compilation / debugging
+dhcp: dhcp* dhclient
 
 build: cc1 cc1plus as gcc* cppcheck ld make cmake automake autoconf autoreconf
 build: cargo rustc bazel buck git gdb valgrind* rpmbuild dpkg-buildpackage
-
-# -----------------------------------------------------------------------------
-# package management
-
-packagemanager: apt* dpkg* dselect dnf yum rpm zypp* yast* pacman xbps* swupd* emerge*
-packagemanager: packagekitd pkgin pkg apk snapd slackpkg slapt-get
-
-# -----------------------------------------------------------------------------
-# antivirus
-
-antivirus: clam* *clam imunify360*
-
-# -----------------------------------------------------------------------------
-# torrent clients
-
-torrents: *deluge* transmission* *SickBeard* *CouchPotato* *rtorrent*
-
-# -----------------------------------------------------------------------------
-# backup servers and clients
-
+packagemanager: apt* dpkg* dselect dnf yum rpm zypp* yast* pacman xbps* swupd*
+packagemanager: packagekitd pkgin pkg apk snapd slackpkg slapt-get emerge*
+clam: clam* *clam
 backup: rsync lsyncd bacula* borg rclone
-
-# -----------------------------------------------------------------------------
-# cron
-
 cron: cron* atd anacron *systemd-cron* incrond
-
-# -----------------------------------------------------------------------------
-# UPS
-
 ups: upsmon upsd */nut/* apcupsd
 
-# -----------------------------------------------------------------------------
-# media players, servers, clients
-
-media: mplayer vlc xine mediatomb omxplayer* kodi* xbmc* mediacenter eventlircd
-media: mpd minidlnad mt-daapd Plex* jellyfin squeeze* jackett Ombi
-media: strawberry* clementine*
+rabbitmq: *rabbitmq*
+sidekiq: *sidekiq*
+vernemq: *beam.smp*vernemq* *start_vernemq* *run_erl*vernemq* *vernemq*epmd*
+erlang: beam.smp
+postfix: *postfix*
 
-audio: pulse* pipewire wireplumber jack*
+dagster: *dagster*
 
-# -----------------------------------------------------------------------------
-# java applications
+## -----------------------------------------------------------------------------
+## java applications
 
 hdfsdatanode: *org.apache.hadoop.hdfs.server.datanode.DataNode*
 hdfsnamenode: *org.apache.hadoop.hdfs.server.namenode.NameNode*
 hdfsjournalnode: *org.apache.hadoop.hdfs.qjournal.server.JournalNode*
 hdfszkfc: *org.apache.hadoop.hdfs.tools.DFSZKFailoverController*
-
 yarnnode: *org.apache.hadoop.yarn.server.nodemanager.NodeManager*
 yarnmgr: *org.apache.hadoop.yarn.server.resourcemanager.ResourceManager*
 yarnproxy: *org.apache.hadoop.yarn.server.webproxy.WebAppProxyServer*
-
 sparkworker: *org.apache.spark.deploy.worker.Worker*
 sparkmaster: *org.apache.spark.deploy.master.Master*
-
 hbaseregion: *org.apache.hadoop.hbase.regionserver.HRegionServer*
 hbaserest: *org.apache.hadoop.hbase.rest.RESTServer*
 hbasethrift: *org.apache.hadoop.hbase.thrift.ThriftServer*
 hbasemaster: *org.apache.hadoop.hbase.master.HMaster*
-
 zookeeper: *org.apache.zookeeper.server.quorum.QuorumPeerMain*
-
 hive2: *org.apache.hive.service.server.HiveServer2*
 hivemetastore: *org.apache.hadoop.hive.metastore.HiveMetaStore*
-
 solr: *solr.install.dir*
-
 airflow: *airflow*
+kafka: *kafka.Kafka*
 
-# -----------------------------------------------------------------------------
-# GUI
-
-X: X Xorg xinit xdm Xwayland xsettingsd touchegg
-wayland: swaylock swayidle waypipe wayvnc
-kde: *kdeinit* kdm sddm plasmashell startplasma-* kwin* kwallet* krunner kactivitymanager*
-gnome: gnome-* gdm gconf* mutter
-mate: mate-* msd-* marco*
-cinnamon: cinnamon* muffin
-xfce: xfwm4 xfdesktop xfce* Thunar xfsettingsd xfconf*
-lxde: lxde* startlxde lxdm lxappearance* lxlauncher* lxpanel* lxsession* lxsettings*
-lxqt: lxqt* startlxqt
-enlightenment: entrance enlightenment*
-i3: i3*
-awesome: awesome awesome-client
-dwm: dwm.*
-sway: sway
-weston: weston
-cage: cage
-wayfire: wayfire
-gui: lightdm colord seatd greetd gkrellm slim qingy dconf* *gvfs gvfs*
-gui: '*systemd --user*' xdg-* at-spi-*
-
-webbrowser: *chrome-sandbox* *google-chrome* *chromium* *firefox* vivaldi* opera* epiphany chrome*
-webbrowser: lynx elinks w3m w3mmee links
-mua: evolution-* thunderbird* mutt neomutt pine mailx alpine
-
-# -----------------------------------------------------------------------------
-# Kernel / System
+## -----------------------------------------------------------------------------
+## Kernel / System
+## The following are interesting kernel threads and related processes to
+## monitor individually, mainly for their CPU utilization.
 
+## These kernel threads switch tasks all the time, so they should never be
+## categorized as anything specific.
+kernel: kworker/*
+
+## Kernel Samepage Merging (KSM) daemon that looks for identical memory pages
+## across processes and merges them to save memory.
 ksmd: ksmd
-khugepaged: khugepaged
+
+## Handles migration of processes between CPU cores to balance load.
+kmigration: migration/*
+
+## Manages memory compaction, moving memory pages around to reduce
+## fragmentation.
+kcompactd: kcompactd*
+
+## Responsible for freeing up memory by swapping pages to disk when needed.
+kswapd: kswapd*
+
+## DAMON is a mechanism designed to efficiently monitor the memory access
+## patterns of running processes or the system itself.
 kdamond: kdamond
-kswapd: kswapd
-zswap: zswap
-kcompactd: kcompactd
 
-system: systemd* udisks* udevd* *udevd ipv6_addrconf dbus-* rtkit*
-system: mdadm acpid uuidd upowerd elogind* eudev mdev lvmpolld dmeventd
-system: accounts-daemon rngd haveged rasdaemon irqbalance start-stop-daemon
-system: supervise-daemon openrc* init runit runsvdir runsv auditd lsmd
-system: abrt* nscd rtkit-daemon gpg-agent usbguard* boltd geoclue
+## Manages ballooning in virtualized environments.
+vballoon: vballoon*
 
-kernel: kworker kthreadd kauditd lockd khelper kdevtmpfs khungtaskd rpciod
-kernel: fsnotify_mark kthrotld deferwq scsi_* kdmflush oom_reaper kdevtempfs
-kernel: ksoftirqd
+## virtio - Handles or I/O (storage and network) on virtual machines.
+kvirtio: virtio-* vhost-*
 
-# -----------------------------------------------------------------------------
-# inetd
+## Layer 4 (transport layer) load balancing
+ipvs: ipvsd ipvs_* ip_vs_*
 
-inetd: inetd xinetd
+## Hugepages
+## Scans memory regions and tries to promote regular-sized pages (4KB) into
+## hugepages (2MB) where possible. Merge smaller contiguous 4KB pages into 2MB
+## pages. Hugepages also use: kswapd, kcompactd, and migration.
+khugepaged: khugepaged
 
-# -----------------------------------------------------------------------------
-# other application servers
+## Note about zswap:
+## zswap does not introduce its own dedicated kernel threads. Instead, it
+## operates within the existing memory management and swapping framework of the
+## kernel:
+## - kswapd: swaps pages in/out of memory, using compression in the process.
+## - kcompactd: compacts memory when pages are compressed or moved around.
 
-i2pd: i2pd
+## -----------------------------------------------------------------------------
+## Block Devices
 
-rethinkdb: rethinkdb
+## Handles deferred block I/O operations for block devices.
+kblockd: kblockd
 
-beanstalkd: beanstalkd
+## Device Mapper (DM)
+device-mapper: kcopyd/* kcryptd/* kdmflush/* dm_bufio_cache
+device-mapper: raid1/* raid5/* raid10/* multipathd bioset/*
 
-rspamd: rspamd
+## Software RAID (MD)
+md-raid: md*_raid* md*_resync md*_reshape md*_recovery md_thread
+md-raid: flush_md* raid*_sync
 
-consul: consul
+## iSCSI
+iscsi: iscsid iscsiadm iscsi_eh/* iscsi_xmit/* iscsi_ttx/* iscsi_rx/* iscsi_trx/*
 
-kafka: *kafka.Kafka*
+## SCSI
+scsi: scsi_eh/* scsi_tmf/* scsi_wq/*
 
-rabbitmq: *rabbitmq*
+## BCACHE
+bcache: bcache* bch_btree_io bch_journal
 
-sidekiq: *sidekiq*
-java: java
-ipfs: ipfs
-erlang: beam.smp
+## SAS
+sas: sas_task/* mpt*
 
-node: node
-factorio: factorio
+## Fibre Channel (FC)
+fc: fc_transport qla2xxx*
 
-p4: p4*
+## loop devices
+loop: loop* flush-loop*
 
-git-services: gitea gitlab-runner
+## -----------------------------------------------------------------------------
+## Filesystems
 
-freeswitch: freeswitch*
+## Ext4
+ext4: ext4-* jbd2/*
 
-# -------- web3 / blockchains ----------
+## XFS
+xfs: xfs*
 
-go-ethereum: geth*
-nethermind-ethereum: nethermind*
-besu-ethereum: besu*
-openEthereum: openethereum*
-urbit: urbit*
-bitcoin-node: *bitcoind* lnd*
-filecoin: lotus* lotus-miner* lotus-worker*
-solana: solana*
-web3: *hardhat* *ganache* *truffle* *brownie* *waffle*
-terra: terra* mantle*
+## BTRFS
+btrfs: btrfs*
 
-# -----------------------------------------------------------------------------
-# chaos engineering tools
+## NFS
+nfs: rpcbind rpc.* nfs* rpciod
 
-stress: stress stress-ng*
-gremlin: gremlin*
+## ZFS
+zfs: spl_* z_* txg_* zil_* arc_* l2arc* zfs* zed zdb zpool*
+
+## CEPH
+ceph: ceph-* ceph_* radosgw* rbd-* cephfs-*
+ceph: ceph cephadm osdmaptool crushtool rados rbd
+
+## CIFS & Samba
+cifs: smbd nmbd winbindd ctdbd ctdb-* ctdb_*
+cifs: cifsd cifscreds cifs.upcall
+
+## Apple Filling Protocol (AFP)
+afp: netatalk afpd cnid_dbd cnid_metad
 
-# -----------------------------------------------------------------------------
-# load testing tools
+## -----------------------------------------------------------------------------
+## Desktops
 
-locust: locust
+systemd-journald: *systemd-journal*
+systemd: systemd systemd-*
 
-# -----------------------------------------------------------------------------
-# data science and machine learning tools
+## GNOME
+desktop: gnome-* gsd-* gjs goa-* gcr-* gvfs-* *xdg-*-gnome* passimd gvfsd*
+desktop: at-spi-* at-spi2-* dconf-service gcr-*
 
-jupyter: jupyter*
+## KDE
+desktop: plasmashell kwin-* kde* *-kde-* klauncher kactivitymanagerd krunner
+desktop: kdeconnectd ksmserver kglobalaccel5 plasma-* *org.kde.*
+desktop: sddm* kwalletd5 knotify5 kmix kscreen kwayland-*
 
-# -----------------------------------------------------------------------------
-# File synchronization tools
+## XFCE4
+desktop: xfce4-* xfwm4 xfdesktop xfce4-panel xfsettingsd xfconfd
+desktop: lightdm lightdm-*
 
-filesync: dropbox syncthing
+## Generic tools related to desktop
+desktop: gdm gdm-* dbus-* xdg-* ibus-* evolution-* accounts-daemon colord
+desktop: geoclue pulse* pipewire* wireplumber jack* touchegg pulseaudio
+desktop: Xwayland Xorg