diff --git a/internal/signalfx-agent/pkg/core/modules_linux.go b/internal/signalfx-agent/pkg/core/modules_linux.go index f2eaa6efa0..6ba29316a4 100644 --- a/internal/signalfx-agent/pkg/core/modules_linux.go +++ b/internal/signalfx-agent/pkg/core/modules_linux.go @@ -16,7 +16,6 @@ import ( _ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/cpu" _ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/cpufreq" _ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/custom" - _ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/disk" _ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/genericjmx" _ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/hadoopjmx" _ "github.com/signalfx/signalfx-agent/pkg/monitors/collectd/kafka" diff --git a/internal/signalfx-agent/pkg/monitors/collectd/disk/disk.go b/internal/signalfx-agent/pkg/monitors/collectd/disk/disk.go deleted file mode 100644 index 3a18b2e4d1..0000000000 --- a/internal/signalfx-agent/pkg/monitors/collectd/disk/disk.go +++ /dev/null @@ -1,42 +0,0 @@ -//go:build linux -// +build linux - -package disk - -//go:generate ../../../../scripts/collectd-template-to-go disk.tmpl - -import ( - "github.com/signalfx/signalfx-agent/pkg/core/config" - "github.com/signalfx/signalfx-agent/pkg/monitors" - "github.com/signalfx/signalfx-agent/pkg/monitors/collectd" -) - -func init() { - monitors.Register(&monitorMetadata, func() interface{} { - return &Monitor{ - MonitorCore: *collectd.NewMonitorCore(CollectdTemplate), - } - }, &Config{}) -} - -// Config is the monitor-specific config with the generic config embedded -type Config struct { - config.MonitorConfig `yaml:",inline" singleInstance:"true"` - - // Which devices to include/exclude - Disks []string `yaml:"disks" default:"[\"/^loop[0-9]+$/\", \"/^dm-[0-9]+$/\"]"` - - // If true, the disks selected by `disks` will be excluded and all others - // included. - IgnoreSelected bool `yaml:"ignoreSelected" default:"true"` -} - -// Monitor is the main type that represents the monitor -type Monitor struct { - collectd.MonitorCore -} - -// Configure configures and runs the plugin in collectd -func (m *Monitor) Configure(conf *Config) error { - return m.SetConfigurationAndRun(conf, collectd.WithDeprecationWarningLog("disk-io")) -} diff --git a/internal/signalfx-agent/pkg/monitors/collectd/disk/disk.tmpl b/internal/signalfx-agent/pkg/monitors/collectd/disk/disk.tmpl deleted file mode 100644 index 054b5d0b4c..0000000000 --- a/internal/signalfx-agent/pkg/monitors/collectd/disk/disk.tmpl +++ /dev/null @@ -1,19 +0,0 @@ -LoadPlugin disk - -{{range .Disks -}} - Disk "{{.}}" -{{end}} - IgnoreSelected {{if .IgnoreSelected}}true{{else}}false{{end}} - - - - - - - Plugin "^disk$" - - - MetaData "monitorID" "{{.MonitorID}}" - - - diff --git a/internal/signalfx-agent/pkg/monitors/collectd/disk/genmetadata.go b/internal/signalfx-agent/pkg/monitors/collectd/disk/genmetadata.go deleted file mode 100644 index 4dd64b1c77..0000000000 --- a/internal/signalfx-agent/pkg/monitors/collectd/disk/genmetadata.go +++ /dev/null @@ -1,57 +0,0 @@ -// Code generated by monitor-code-gen. DO NOT EDIT. - -package disk - -import ( - "github.com/signalfx/golib/v3/datapoint" - "github.com/signalfx/signalfx-agent/pkg/monitors" -) - -const monitorType = "collectd/disk" - -var groupSet = map[string]bool{} - -const ( - diskIoTimeIoTime = "disk_io_time.io_time" - diskIoTimeWeightedIoTime = "disk_io_time.weighted_io_time" - diskMergedRead = "disk_merged.read" - diskMergedWrite = "disk_merged.write" - diskOctetsRead = "disk_octets.read" - diskOctetsWrite = "disk_octets.write" - diskOpsRead = "disk_ops.read" - diskOpsWrite = "disk_ops.write" - diskTimeRead = "disk_time.read" - diskTimeWrite = "disk_time.write" - pendingOperations = "pending_operations" -) - -var metricSet = map[string]monitors.MetricInfo{ - diskIoTimeIoTime: {Type: datapoint.Counter}, - diskIoTimeWeightedIoTime: {Type: datapoint.Counter}, - diskMergedRead: {Type: datapoint.Counter}, - diskMergedWrite: {Type: datapoint.Counter}, - diskOctetsRead: {Type: datapoint.Counter}, - diskOctetsWrite: {Type: datapoint.Counter}, - diskOpsRead: {Type: datapoint.Counter}, - diskOpsWrite: {Type: datapoint.Counter}, - diskTimeRead: {Type: datapoint.Counter}, - diskTimeWrite: {Type: datapoint.Counter}, - pendingOperations: {Type: datapoint.Gauge}, -} - -var defaultMetrics = map[string]bool{ - diskOpsRead: true, - diskOpsWrite: true, -} - -var groupMetricsMap = map[string][]string{} - -var monitorMetadata = monitors.Metadata{ - MonitorType: "collectd/disk", - DefaultMetrics: defaultMetrics, - Metrics: metricSet, - SendUnknown: false, - Groups: groupSet, - GroupMetricsMap: groupMetricsMap, - SendAll: false, -} diff --git a/internal/signalfx-agent/pkg/monitors/collectd/disk/metadata.yaml b/internal/signalfx-agent/pkg/monitors/collectd/disk/metadata.yaml deleted file mode 100644 index 4ca9cd679a..0000000000 --- a/internal/signalfx-agent/pkg/monitors/collectd/disk/metadata.yaml +++ /dev/null @@ -1,62 +0,0 @@ -monitors: -- dimensions: - doc: | - This monitor collects information about the usage of - physical disks and logical disks (partitions). - - See https://collectd.org/wiki/index.php/Plugin:Disk. - - **This monitor has been deprecated in favor of the `disk-io` monitor. - Please migrate to that monitor as this collectd-based monitor will be - removed in a future release of the agent.** Note that the `disk-io` - monitor has a different dimension (`disk` instead of `plugin_instance`) to - specify the disk. - metrics: - disk_merged.read: - description: The number of disk reads merged into single physical disk access - operations. - default: false - type: cumulative - disk_merged.write: - description: The number of disk writes merged into single physical disk access - operations. - default: false - type: cumulative - disk_octets.read: - description: The number of bytes (octets) read from a disk. - default: false - type: cumulative - disk_octets.write: - description: The number of bytes (octets) written to a disk. - default: false - type: cumulative - disk_ops.read: - description: The number of disk read operations. - default: true - type: cumulative - disk_ops.write: - description: The number of disk write operations. - default: true - type: cumulative - disk_time.read: - description: The average amount of time it took to do a read operation. - default: false - type: cumulative - disk_time.write: - description: The average amount of time it took to do a write operation. - default: false - type: cumulative - disk_io_time.weighted_io_time: - description: Amount of time spent doing IO in ms multiplied by the queue length - default: false - type: cumulative - disk_io_time.io_time: - description: Amount of time spent doing IO in ms - default: false - type: cumulative - pending_operations: - description: Number of pending operations - default: false - type: gauge - monitorType: collectd/disk - properties: diff --git a/internal/signalfx-agent/pkg/monitors/collectd/disk/template.go b/internal/signalfx-agent/pkg/monitors/collectd/disk/template.go deleted file mode 100644 index 7171790331..0000000000 --- a/internal/signalfx-agent/pkg/monitors/collectd/disk/template.go +++ /dev/null @@ -1,35 +0,0 @@ -//go:build linux -// +build linux - -package disk - -// AUTOGENERATED BY scripts/collectd-template-to-go. DO NOT EDIT!! - -import ( - "text/template" - - "github.com/signalfx/signalfx-agent/pkg/monitors/collectd" -) - -// CollectdTemplate is a template for a disk collectd config file -var CollectdTemplate = template.Must(collectd.InjectTemplateFuncs(template.New("disk")).Parse(` -LoadPlugin disk - -{{range .Disks -}} - Disk "{{.}}" -{{end}} - IgnoreSelected {{if .IgnoreSelected}}true{{else}}false{{end}} - - - - - - - Plugin "^disk$" - - - MetaData "monitorID" "{{.MonitorID}}" - - - -`)).Option("missingkey=error") diff --git a/pkg/receiver/smartagentreceiver/config.go b/pkg/receiver/smartagentreceiver/config.go index 4a9df2d35f..ff3b14d9f6 100644 --- a/pkg/receiver/smartagentreceiver/config.go +++ b/pkg/receiver/smartagentreceiver/config.go @@ -38,7 +38,7 @@ var ( errDimensionClientValue = fmt.Errorf("dimensionClients must be an array of compatible exporter names") nonWindowsMonitors = map[string]bool{ "collectd/activemq": true, "collectd/apache": true, "collectd/cassandra": true, "collectd/chrony": true, - "collectd/cpu": true, "collectd/cpufreq": true, "collectd/custom": true, "collectd/disk": true, + "collectd/cpu": true, "collectd/cpufreq": true, "collectd/custom": true, "collectd/genericjmx": true, "collectd/hadoopjmx": true, "collectd/kafka": true, "collectd/kafka_consumer": true, "collectd/kafka_producer": true, "collectd/load": true, "collectd/memcached": true, "collectd/memory": true, "collectd/mysql": true, "collectd/nginx": true, "collectd/php-fpm": true,