Skip to content
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

exporter/signalfx: Reinstate network/filesystem translation rules #2171

Merged
merged 2 commits into from
Jan 27, 2021
Merged

exporter/signalfx: Reinstate network/filesystem translation rules #2171

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
7a780ca
exporter/signalfx: Reinstate network/filesystem translation rules
asuresh4 Jan 22, 2021
2ebd904
Update system.disk.ops to system.disk.operations
asuresh4 Jan 22, 2021
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
10 changes: 5 additions & 5 deletions exporter/signalfxexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func TestCreateMetricsExporterWithDefaultTranslaitonRules(t *testing.T) {

// Validate that default translation rules are loaded
// Expected values has to be updated once default config changed
assert.Equal(t, 55, len(config.TranslationRules))
assert.Equal(t, 60, len(config.TranslationRules))
assert.Equal(t, translation.ActionRenameDimensionKeys, config.TranslationRules[0].Action)
assert.Equal(t, 33, len(config.TranslationRules[0].Mapping))
}
Expand Down Expand Up @@ -264,7 +264,7 @@ func TestDefaultTranslationRules(t *testing.T) {
require.Equal(t, 1, len(dps))
require.Equal(t, 40.0, *dps[0].Value.DoubleValue)

// system.disk.ops metric split and dimension rename
// system.disk.operations metric split and dimension rename
dps, ok = metrics["disk_ops.read"]
require.True(t, ok, "disk_ops.read metrics not found")
require.Equal(t, 4, len(dps))
Expand All @@ -285,7 +285,7 @@ func TestDefaultTranslationRules(t *testing.T) {
require.Equal(t, "disk", dps[1].Dimensions[1].Key)
require.Equal(t, "sda2", dps[1].Dimensions[1].Value)

// disk_ops.total gauge from system.disk.ops cumulative, where is disk_ops.total
// disk_ops.total gauge from system.disk.operations cumulative, where is disk_ops.total
// is the cumulative across devices and directions.
dps, ok = metrics["disk_ops.total"]
require.True(t, ok, "disk_ops.total metrics not found")
Expand Down Expand Up @@ -421,7 +421,7 @@ func testMetricsData() pdata.ResourceMetrics {
},
{
MetricDescriptor: &metricspb.MetricDescriptor{
Name: "system.disk.ops",
Name: "system.disk.operations",
Description: "Disk operations count.",
Unit: "bytes",
Type: metricspb.MetricDescriptor_CUMULATIVE_INT64,
Expand Down Expand Up @@ -520,7 +520,7 @@ func testMetricsData() pdata.ResourceMetrics {
},
{
MetricDescriptor: &metricspb.MetricDescriptor{
Name: "system.disk.ops",
Name: "system.disk.operations",
Description: "Disk operations count.",
Unit: "bytes",
Type: metricspb.MetricDescriptor_CUMULATIVE_INT64,
Expand Down
118 changes: 82 additions & 36 deletions exporter/signalfxexporter/translation/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,18 +404,8 @@ translation_rules:
used: memory.used


# Translations to derive disk.utilization.
- action: copy_metrics
mapping:
system.filesystem.usage: df_complex.used
dimension_key: state
dimension_values:
used: true
- action: split_metric
metric_name: df_complex.used
dimension_key: state
mapping:
used: df_complex.used
# Translations to derive filesystem metrics
## disk.total, required to compute disk.utilization
- action: copy_metrics
mapping:
system.filesystem.usage: disk.total
Expand All @@ -425,6 +415,42 @@ translation_rules:
without_dimensions:
- state


## disk.summary_total, required to compute disk.summary_utilization
- action: copy_metrics
mapping:
system.filesystem.usage: disk.summary_total
- action: aggregate_metric
metric_name: disk.summary_total
aggregation_method: avg
without_dimensions:
- mode
- mountpoint
- action: aggregate_metric
metric_name: disk.summary_total
aggregation_method: sum
without_dimensions:
- state
- device
- type


## other filesystem metrics
- action: split_metric
metric_name: system.filesystem.usage
dimension_key: state
mapping:
free: df_complex.free
reserved: df_complex.reserved
used: df_complex.used
- action: split_metric
metric_name: system.filesystem.inodes.usage
dimension_key: state
mapping:
free: df_inodes.free
used: df_inodes.used


## disk.utilization
- action: calculate_new_metric
metric_name: disk.utilization
Expand All @@ -436,7 +462,7 @@ translation_rules:
disk.utilization: 100


# Translations to derive disk.summary_utilization.
## disk.summary_utilization
- action: copy_metrics
mapping:
df_complex.used: df_complex.used_total
Expand All @@ -452,24 +478,6 @@ translation_rules:
without_dimensions:
- device
- type
- action: copy_metrics
mapping:
system.filesystem.usage: disk.summary_total
- action: aggregate_metric
metric_name: disk.summary_total
aggregation_method: avg
without_dimensions:
- mode
- mountpoint
- action: aggregate_metric
metric_name: disk.summary_total
aggregation_method: sum
without_dimensions:
- state
- device
- type

## disk.summary_utilization
- action: calculate_new_metric
metric_name: disk.summary_utilization
operand1_metric: df_complex.used_total
Expand All @@ -479,10 +487,11 @@ translation_rules:
scale_factors_float:
disk.summary_utilization: 100


# convert disk I/O metrics
- action: copy_metrics
mapping:
system.disk.ops: disk.ops
system.disk.operations: disk.ops
- action: aggregate_metric
metric_name: disk.ops
aggregation_method: sum
Expand All @@ -496,7 +505,7 @@ translation_rules:
metric_names:
system.disk.merged: true
system.disk.io: true
system.disk.ops: true
system.disk.operations: true
system.disk.time: true
mapping:
device: disk
Expand All @@ -513,7 +522,7 @@ translation_rules:
read: disk_octets.read
write: disk_octets.write
- action: split_metric
metric_name: system.disk.ops
metric_name: system.disk.operations
dimension_key: direction
mapping:
read: disk_ops.read
Expand All @@ -528,7 +537,9 @@ translation_rules:
mapping:
system.disk.pending_operations: disk_ops.pending

# convert network I/O metrics

# Translations to derive Network I/O metrics.
## network.total.
- action: copy_metrics
mapping:
system.network.io: network.total
Expand All @@ -543,6 +554,42 @@ translation_rules:
- direction
- interface


## other Network I/O metrics. Note that these translations depend on renaming dimension device to interface.
- action: rename_dimension_keys
metric_names:
system.network.dropped: true
system.network.errors: true
system.network.io: true
system.network.packets: true
mapping:
device: interface
- action: split_metric
metric_name: system.network.dropped
dimension_key: direction
mapping:
receive: if_dropped.rx
transmit: if_dropped.tx
- action: split_metric
metric_name: system.network.errors
dimension_key: direction
mapping:
receive: if_errors.rx
transmit: if_errors.tx
- action: split_metric
metric_name: system.network.io
dimension_key: direction
mapping:
receive: if_octets.rx
transmit: if_octets.tx
- action: split_metric
metric_name: system.network.packets
dimension_key: direction
mapping:
receive: if_packets.rx
transmit: if_packets.tx


# memory utilization
- action: calculate_new_metric
metric_name: memory.utilization
Expand All @@ -558,7 +605,6 @@ translation_rules:
# remove redundant metrics
- action: drop_metrics
metric_names:
df_complex.used: true
df_complex.used_total: true
disk.ops: true
disk.summary_total: true
Expand Down