Merge branch 'edge' into next

2 files changed, 13 insertions, 2 deletions

diff --git a/profiles/desc/collectd_plugins.desc b/profiles/desc/collectd_plugins.desc
index e5c732bdcf4a..1a323e273a58 100644
--- a/profiles/desc/collectd_plugins.desc
+++ b/profiles/desc/collectd_plugins.desc
@@ -11,9 +11,13 @@ apcups - Build the apcups input plugin (reads various statistics about a connect
 ascent - Build the ascent input plugin (reads and parses the statistics page of Ascent)
 battery - Build the battery input plugin (collects the battery's charge, the drawn current and the battery's voltage)
 bind - Build the bind input plugin (collects statistics from bind instances)
+buddyinfo - Build the buddyinfo input plugin (collects statistics from /proc/buddyinfo)
+capabilities - Build the capabilities input plugin (collects platform capabilities decoded from the hardware subsystems)
 ceph - Build the Ceph input plugin (collects statistics from the Ceph distributed storage system)
 cgroups - Build the cgroups input plugin (collects CPU accounting information for processes in a cgroup)
+check_uptime - Build a plugin to notify about uptime reset
 chrony - Build the chrony input plugin (collects statistics from a chrony NTP server)
+connectivity - Build the connectivity input plugin (monitors interface up/down status via netlink library)
 conntrack - Build the conntrack input plugin (tracks the number of entries in Linux's connection tracking table)
 contextswitch - Build the contextswitch input plugin (collects the number of context switches done by the operating system)
 cpu - Build the cpu input plugin (collects the amount of time spent by the CPU in various states)
@@ -48,6 +52,7 @@ irq - Build the irq input plugin (collects the number of times each interrupt ha
 java - Build the java input plugin (embeds a JVM into collectd for writing plugins)
 load - Build the load input plugin (collects the system load)
 logfile - Build the logfile output plugin (receives log messages from collectd and writes them to a text file)
+logparser - Build the logparser plugin (allows for filtering and parsing log messages)
 log_logstash - Build the Logstash output plugin (writes collectd logs and events as Logstash JSON formatted events)
 lua - Build the LUA language binding plugin (uses dev-lang/lua) for writing plugins
 lvm - Build the LVM input plugin (collects the size of logical volumes (LV) and free space inside a volume group (VG) from Linux' Logical Volume Manager (LVM))
@@ -84,10 +89,12 @@ openvpn - Build the openvpn input plugin (reads the status file printed by OpenV
 oracle - Build the oracle input plugin (executes SQL statements against Oracle database systems)
 ovs_events - Build an input plugin which reports link state changes from Open vSwitch (OVS)
 ovs_stats - Build an input plugin which reports bridge and interface statistics from Open vSwitch (OVS)
+pcie_errors - Build an input plugin which reports the PCIe errors
 perl - Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)
 ping - Build the ping input plugin (measures network latency)
 postgresql - Build the postgresql input plugin (executes SQL statements against a PostgreSQL database)
 powerdns - Build the powerdns input plugin (collects statistics from the PowerDNS name server or recursor via control socket)
+procevent - Build the procevent input plugin (monitors process starts/stops via netlink library)
 processes - Build the processes input plugin (collects the number of processes, grouped by their state or detailed statistics about selected processes)
 protocols - Build the protocols input plugin (collects information about the network protocols supported by the system)
 python - Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)
@@ -98,11 +105,13 @@ rrdtool - Build the rrdtool output plugin (writes values to RRD-files)
 sensors - Build the sensors input plugin (reads hardware sensors from lm-sensors)
 serial - Build the serial input plugin (collects the traffic on serial interfaces)
 sigrok - Build the sigrok input plugin (reads measurements from any supported hardware from sigrok project)
+slurm - Build the slurm input plugin (collects metrics from the SLURM workload manager)
 smart - Build the S.M.A.R.T input plugin (collects S.M.A.R.T statistics from disk drives)
 snmp - Build the snmp input plugin (reads values from network devices using SNMP)
 snmp_agent - Build an input plugin which implements an SNMP AgentX subagent that receives and handles queries from SNMP master agent and returns configured metrics
 statsd - Build the statsd input plugin (accepts statsd-type metrics from a UDP socket)
 swap - Build the swap input plugin (collects amount of memory currently written to swap)
+synproxy - Build the Linux SYNPROXY input plugin (collects metrics from /proc/net/stat/synproxy)
 sysevent - Build the rsyslog input plugin (collects system events from rsyslog)
 syslog - Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)
 table - Build the table input plugin (parses table-like structured plain text)
@@ -122,6 +131,7 @@ turbostat - Build the turbostat input plugin (reads CPU frequency and C-state re
 unixsock - Build the unixsock input/output plugin (opens a UNIX domain socket and accepts connections)
 uptime - Build the uptime input plugin (keeps track of the system uptime)
 users - Build the users input plugin (counts the number of users currently logged into the system)
+ubi - Build the ubi input plugin (collects block state for flash memory devices with UBIFS)
 uuid - Build the uuid plugin (tries hard to determine the UUID of the system it is running on)
 varnish - Build the varnish input plugin (collects information about Varnish)
 virt - Build the (lib)virt input plugin (collects statistics about virtualized guests on a system)
@@ -130,12 +140,15 @@ vserver - Build the vserver input plugin (collects information about the virtual
 wireless - Build the wireless input plugin (collects signal quality, signal power and signal-to-noise ratio for wireless LAN cards)
 write_graphite - Build the write_graphite output plugin (stores values in Carbon, the storage layer of Graphite)
 write_http - Build the write_http output plugin (sends metrics to a web-server using HTTP POST requests)
+write_influxdb_udp - Build the InfluxDB UDP output plugin (sends metrics to InfluxDB using UDP)
 write_kafka - Build the Kafka output plugin (sends metrics to Apache Kafka)
 write_log - Build the write_log output plugin (writes metrics to a file)
 write_mongodb - Build the MongoDB output plugin (stores values in MongoDB)
 write_prometheus - Builds the Prometheus output plugin (starts an internal webserver on port 9103 (configurable) and accepts scrape requests from Prometheus)
 write_redis - Build the Redis output plugin (stores values in Redis)
 write_sensu - Build the Sensu output plugin (sends metrics to Sensu Core, an open-source monitoring project)
+write_stackdriver - Build the Stackdriver output plugin (stores metrics in Google Stackdriver)
+write_syslog - Build the Syslog output plugin (sends metrics in CEE-enhanced syslog message format)
 write_tsdb - Build the TSDB output plugin (writes metrics to OpenTSDB, an open-source distributed time-series database based on Apache HBase)
 xencpu - Build the XEN CPU input plugin (collects XEN Hypervisor CPU stats using app-emulation/xen-tools)
 zfs_arc - Build the ZFS ARC input plugin (reports information such as the cache size, the various hits and misses (also as a ratio) and the transferred data)
diff --git a/profiles/desc/input_devices.desc b/profiles/desc/input_devices.desc
index 1077d4bbdb1b..b41f5c66a7ac 100644
--- a/profiles/desc/input_devices.desc
+++ b/profiles/desc/input_devices.desc
@@ -8,9 +8,7 @@
 elographics - INPUT_DEVICES setting to build driver for elographics input devices
 evdev - INPUT_DEVICES setting to build driver for evdev input devices
 joystick - INPUT_DEVICES setting to build driver for joystick input devices
-keyboard - INPUT_DEVICES setting to build driver for keyboard input devices
 libinput - INPUT_DEVICES setting to build driver for libinput input devices
-mouse - INPUT_DEVICES setting to build driver for mouse input devices
 roccat_arvo - INPUT_DEVICES setting to build driver for Roccat Arvo input devices
 roccat_isku - INPUT_DEVICES setting to build driver for Roccat Isku input devices
 roccat_iskufx - INPUT_DEVICES setting to build driver for Roccat Isku Fx input devices