Skip to content

chore(collectd): remove unbundled collector configs (SNMP-only overlay) #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pbrane merged 2 commits into from
Jul 2, 2026
Merged

chore(collectd): remove unbundled collector configs (SNMP-only overlay) #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3829f3
chore(collectd): remove dead VMware/WMI collectors from overlay
indigo423 Jul 1, 2026
27dff02
chore(collectd): strip collectd to SNMP-only, drop unbundled collectors
indigo423 Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 8 additions & 126 deletions deploy/overlays/collectd/etc/collectd-configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,84 +28,6 @@
<parameter key="password" value="${requisition:cassandra-pass|cassandra-password}" />
</service>
</package>
<package name="vmware6" remote="false">
<filter>(IPADDR != '0.0.0.0') &amp; (categoryName == 'VMware6')</filter>
<service name="VMware-VirtualMachine" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|default-VirtualMachine6}" />
<parameter key="thresholding-enabled" value="true" />
</service>
<service name="VMware-HostSystem" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|default-HostSystem6}" />
<parameter key="thresholding-enabled" value="true" />
</service>
<service name="VMwareCim-HostSystem" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|default-ESX-HostSystem}" />
<parameter key="thresholding-enabled" value="true" />
</service>
</package>
<package name="vmware7" remote="false">
<filter>(IPADDR != '0.0.0.0') &amp; (categoryName == 'VMware7')</filter>
<service name="VMware-VirtualMachine" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|default-VirtualMachine7}" />
<parameter key="thresholding-enabled" value="true" />
</service>
<service name="VMware-HostSystem" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|default-HostSystem7}" />
<parameter key="thresholding-enabled" value="true" />
</service>
<service name="VMwareCim-HostSystem" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|default-ESX-HostSystem}" />
<parameter key="thresholding-enabled" value="true" />
</service>
</package>
<package name="opennms" remote="false">
<filter>IPADDR != '0.0.0.0'</filter>
<include-range begin="1.1.1.1" end="254.254.254.254" />
<include-range begin="::1" end="ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff" />
<service name="OpenNMS-JVM" interval="300000" user-defined="false" status="on">
<parameter key="port" value="${requisition:port|detector:port|18980}" />
<parameter key="retry" value="${requisition:collector-retry|requisition:retry|detector:retry|2}" />
<parameter key="timeout" value="${requisition:collector-timeout|requisition:timeout|detector:timeout|3000}" />
<parameter key="rrd-base-name" value="java" />
<parameter key="collection" value="${requisition:collection|detector:collection|jsr160}" />
<parameter key="thresholding-enabled" value="true" />
<parameter key="ds-name" value="opennms-jvm" />
<parameter key="friendly-name" value="${requisition:friendly-name|detector:friendly-name|opennms-jvm}" />
</service>
<service name="JMX-Minion" interval="300000" user-defined="false" status="on">
<parameter key="port" value="${requisition:port|detector:port|18980}" />
<parameter key="retry" value="${requisition:collector-retry|requisition:retry|detector:retry|2}" />
<parameter key="timeout" value="${requisition:collector-timeout|requisition:timeout|detector:timeout|3000}" />
<parameter key="rrd-base-name" value="java" />
<parameter key="collection" value="${requisition:collection|detector:collection|jmx-minion}" />
<parameter key="thresholding-enabled" value="true" />
<parameter key="ds-name" value="jmx-minion" />
<parameter key="friendly-name" value="${requisition:friendly-name|detector:friendly-name|jmx-minion}" />
<parameter key="use-foreign-id-as-system-id" value="${requisition:use-foreign-id-as-system-id|detector:use-foreign-id-as-system-id|true}" />
</service>
<service name="JMX-Kafka" interval="300000" user-defined="false" status="on">
<parameter key="port" value="${requisition:kafka-port|9999}" />
<parameter key="retry" value="${requisition:collector-retry|requisition:retry|detector:retry|2}" />
<parameter key="timeout" value="${requisition:collector-timeout|requisition:timeout|detector:timeout|3000}" />
<parameter key="rrd-base-name" value="java" />
<parameter key="collection" value="${requisition:collection|detector:collection|jmx-kafka}" />
<parameter key="thresholding-enabled" value="true" />
<parameter key="ds-name" value="jmx-kafka" />
<parameter key="friendly-name" value="${requisition:friendly-name|detector:friendly-name|jmx-kafka}" />
</service>
<service name="OpenNMS-DB" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|default}" />
<parameter key="thresholding-enabled" value="true" />
<parameter key="driver" value="${requisition:driver|detector:driver|org.postgresql.Driver}" />
<parameter key="data-source" value="${requisition:data-source|detector:data-source|opennms}" />
</service>
<service name="OpenNMS-DB-Stats" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|PostgreSQL}" />
<parameter key="thresholding-enabled" value="true" />
<parameter key="driver" value="${requisition:driver|detector:driver|org.postgresql.Driver}" />
<parameter key="data-source" value="${requisition:data-source|detector:data-source|opennms-monitor}" />
</service>
</package>
<package name="nl6-lab" remote="false">
<filter>IPADDR != '0.0.0.0'</filter>
<include-range begin="10.0.0.1" end="10.0.0.255"/>
Expand All @@ -132,56 +54,16 @@
<parameter key="collection" value="${requisition:collection|detector:collection|default}" />
<parameter key="thresholding-enabled" value="true" />
</service>
<service name="WMI" interval="300000" user-defined="false" status="off">
<parameter key="collection" value="${requisition:collection|detector:collection|default}" />
<parameter key="thresholding-enabled" value="true" />
</service>
<service name="WS-Man" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|default}" />
<parameter key="thresholding-enabled" value="true" />
</service>
<service name="PostgreSQL" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|PostgreSQL}" />
<parameter key="thresholding-enabled" value="true" />
<parameter key="driver" value="${requisition:driver|detector:driver|org.postgresql.Driver}" />
<parameter key="user" value="${requisition:pg-user|postgres}" />
<parameter key="password" value="${requisition:pg-pass|postgres}" />
<parameter key="url" value="${requisition:url|detector:url|'jdbc:postgresql://OPENNMS_JDBC_HOSTNAME:5432/deltav'}" />
</service>
<service name="Elasticsearch" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|xml-elasticsearch-cluster-stats}" />
<parameter key="handler-class" value="${requisition:handler-class|detector:handler-class|org.opennms.protocols.json.collector.DefaultJsonCollectionHandler}" />
</service>
<service name="Windows-Exporter" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|windows-exporter}" />
<parameter key="thresholding-enabled" value="true" />
<parameter key="url" value="http://${requisition:url|detector:url|INTERFACE_ADDRESS}:${requisition:port|9182}/metrics" />
<parameter key="timeout" value="${requisition:collector-timeout|requisition:timeout|detector:timeout|3000}" />
<parameter key="retry" value="${requisition:collector-retry|requisition:retry|detector:retry|2}" />
</service>
<service name="Node-Exporter" interval="300000" user-defined="false" status="on">
<parameter key="collection" value="${requisition:collection|detector:collection|node-exporter}" />
<parameter key="thresholding-enabled" value="true" />
<parameter key="url" value="http://${requisition:url|detector:url|INTERFACE_ADDRESS}:${requisition:port|9100}/metrics" />
<parameter key="timeout" value="${requisition:collector-timeout|requisition:timeout|detector:timeout|3000}" />
<parameter key="retry" value="${requisition:collector-retry|requisition:retry|detector:retry|2}" />
</service>
</package>
<collector service="Windows-Exporter" class-name="org.opennms.netmgt.collectd.prometheus.PrometheusCollector" />
<collector service="Node-Exporter" class-name="org.opennms.netmgt.collectd.prometheus.PrometheusCollector" />
<collector service="Elasticsearch" class-name="org.opennms.protocols.xml.collector.XmlCollector" />
<collector service="PostgreSQL" class-name="org.opennms.netmgt.collectd.JdbcCollector" />
<!-- delta-v collectd is SNMP-only by design: daemon-boot-collectd/pom.xml bundles
SnmpCollector and no other concrete collector. Daemon self-metrics and exporter
scrapes (JMX, JDBC, Prometheus node/windows exporters, Elasticsearch, WS-Man)
do NOT run through collectd — they flow via /actuator/prometheus -> Kafka ->
VictoriaMetrics. Only register a <collector> whose class is actually bundled in
the collectd image, or collectd will log "class ... not available" and skip it.
The JMX-Cassandra entries below are the last non-SNMP holdover and are retired
separately on the chore/collectd-rrd-amputation branch, not here. -->
<collector service="SNMP" class-name="org.opennms.netmgt.collectd.SnmpCollector" />
<collector service="WMI" class-name="org.opennms.netmgt.collectd.WmiCollector" />
<collector service="WS-Man" class-name="org.opennms.netmgt.collectd.WsManCollector" />
<collector service="VMware-VirtualMachine" class-name="org.opennms.netmgt.collectd.VmwareCollector" />
<collector service="VMware-HostSystem" class-name="org.opennms.netmgt.collectd.VmwareCollector" />
<collector service="VMwareCim-HostSystem" class-name="org.opennms.netmgt.collectd.VmwareCimCollector" />
<collector service="OpenNMS-JVM" class-name="org.opennms.netmgt.collectd.Jsr160Collector" />
<collector service="JMX-Minion" class-name="org.opennms.netmgt.collectd.Jsr160Collector" />
<collector service="JMX-Cassandra" class-name="org.opennms.netmgt.collectd.Jsr160Collector" />
<collector service="JMX-Cassandra-Newts" class-name="org.opennms.netmgt.collectd.Jsr160Collector" />
<collector service="JMX-Kafka" class-name="org.opennms.netmgt.collectd.Jsr160Collector" />
<collector service="OpenNMS-DB" class-name="org.opennms.netmgt.collectd.JdbcCollector" />
<collector service="OpenNMS-DB-Stats" class-name="org.opennms.netmgt.collectd.JdbcCollector" />
</collectd-configuration>
4 changes: 0 additions & 4 deletions deploy/overlays/collectd/etc/datacollection-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,6 @@
<include-collection dataCollectionGroup="Sonicwall"/>
<include-collection dataCollectionGroup="SUN Microsystems"/>
<include-collection dataCollectionGroup="Trango"/>
<include-collection dataCollectionGroup="VMware-Cim"/>
<include-collection dataCollectionGroup="VMware6"/>
<include-collection dataCollectionGroup="VMware7"/>
<include-collection dataCollectionGroup="WMI"/>
<include-collection dataCollectionGroup="Zertico"/>
<include-collection dataCollectionGroup="Zeus"/>
</snmp-collection>
Expand Down
66 changes: 0 additions & 66 deletions deploy/overlays/collectd/etc/datacollection/vmware-cim.xml
View file
Open in desktop

This file was deleted.

Loading
Loading