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.

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

Jump to bottom

containers: add support for network metrics #5334

Merged
merged 1 commit into from Nov 6, 2015
Merged

containers: add support for network metrics #5334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions app/models/manageiq/providers/kubernetes/container_manager/metrics_capture.rb
View file
Open in desktop
Expand Up @@ -25,6 +25,15 @@ class TargetValidationError < RuntimeError; end
:rollup => "average",
:unit_key => "percent",
:capture_interval_name => "realtime"
},
"net_usage_rate_average" => {
:counter_key => "net_usage_rate_average",
:instance => "",
:capture_interval => "#{INTERVAL}",
:precision => 2,
:rollup => "average",
:unit_key => "datagramspersecond",
:capture_interval_name => "realtime"
}
}

Expand Down
27 changes: 27 additions & 0 deletions ...models/manageiq/providers/kubernetes/container_manager/metrics_capture/capture_context.rb
View file
Open in desktop
Expand Up @@ -58,6 +58,12 @@ def collect_node_metrics

mem_resid = "machine/#{@target.name}/memory/usage"
process_mem_gauges_data(fetch_gauges_data(mem_resid))

net_resid = "machine/#{@target.name}/network"
net_counters = [fetch_counters_rate("#{net_resid}/tx"),
fetch_counters_rate("#{net_resid}/rx")]

process_net_counters_rate(compute_summation(net_counters))
end

def collect_container_metrics
Expand All @@ -68,6 +74,11 @@ def collect_container_metrics

mem_resid = "#{@target.name}/#{group_id}/memory/usage"
process_mem_gauges_data(fetch_gauges_data(mem_resid))

net_resid = "#{@target.name}/#{group_id}/network"
net_counters = [fetch_counters_rate("#{net_resid}/tx"),
fetch_counters_rate("#{net_resid}/rx")]
process_net_counters_rate(compute_summation(net_counters))
end

def collect_group_metrics
Expand All @@ -82,6 +93,13 @@ def collect_group_metrics
fetch_gauges_data("#{c.name}/#{group_id}/memory/usage")
end
process_mem_gauges_data(compute_summation(mem_gauges))

net_counters = @target.containers.collect do |c|
net_resid = "#{c.name}/#{group_id}/network"
compute_summation([fetch_counters_rate("#{net_resid}/tx"),
fetch_counters_rate("#{net_resid}/rx")])
end
process_net_counters_rate(compute_summation(net_counters))
end

def hawkular_client
Expand Down Expand Up @@ -150,6 +168,15 @@ def process_mem_gauges_data(gauges_data)
end
end

def process_net_counters_rate(counters_rate)
@metrics |= ['net_usage_rate_average'] if counters_rate.length > 0
counters_rate.each do |x|
timestamp = Time.at(x['start'] / 1.in_milliseconds).utc
avg_usage_kb = x['avg'] / (1.kilobyte.to_f * @interval)
@ts_values[timestamp]['net_usage_rate_average'] = avg_usage_kb
end
end

def compute_summation(data)
ts_data = Hash.new { |h, k| h[k] = [] }

Expand Down
5 changes: 5 additions & 0 deletions product/charts/layouts/daily_perf_charts/Container.yaml
View file
Open in desktop
Expand Up @@ -10,3 +10,8 @@
:columns:
- derived_memory_used
- derived_memory_available

- :title: Network I/O (KBps)
:type: Line
:columns:
- net_usage_rate_average
5 changes: 5 additions & 0 deletions product/charts/layouts/daily_perf_charts/ContainerGroup.yaml
View file
Open in desktop
Expand Up @@ -10,3 +10,8 @@
:columns:
- derived_memory_used
- derived_memory_available

- :title: Network I/O (KBps)
:type: Line
:columns:
- net_usage_rate_average
5 changes: 5 additions & 0 deletions product/charts/layouts/daily_perf_charts/ContainerNode.yaml
View file
Open in desktop
Expand Up @@ -10,3 +10,8 @@
:columns:
- derived_memory_used
- derived_memory_available

- :title: Network I/O (KBps)
:type: Line
:columns:
- net_usage_rate_average
5 changes: 5 additions & 0 deletions product/charts/layouts/hourly_perf_charts/Container.yaml
View file
Open in desktop
Expand Up @@ -10,3 +10,8 @@
:columns:
- derived_memory_used
- derived_memory_available

- :title: Network I/O (KBps)
:type: Line
:columns:
- net_usage_rate_average
5 changes: 5 additions & 0 deletions product/charts/layouts/hourly_perf_charts/ContainerGroup.yaml
View file
Open in desktop
Expand Up @@ -10,3 +10,8 @@
:columns:
- derived_memory_used
- derived_memory_available

- :title: Network I/O (KBps)
:type: Line
:columns:
- net_usage_rate_average
5 changes: 5 additions & 0 deletions product/charts/layouts/hourly_perf_charts/ContainerNode.yaml
View file
Open in desktop
Expand Up @@ -10,3 +10,8 @@
:columns:
- derived_memory_used
- derived_memory_available

- :title: Network I/O (KBps)
:type: Line
:columns:
- net_usage_rate_average
5 changes: 5 additions & 0 deletions product/charts/layouts/realtime_perf_charts/Container.yaml
View file
Open in desktop
Expand Up @@ -10,3 +10,8 @@
:columns:
- derived_memory_used
- derived_memory_available

- :title: Network I/O (KBps)
:type: Line
:columns:
- net_usage_rate_average
5 changes: 5 additions & 0 deletions product/charts/layouts/realtime_perf_charts/ContainerGroup.yaml
View file
Open in desktop
Expand Up @@ -10,3 +10,8 @@
:columns:
- derived_memory_used
- derived_memory_available

- :title: Network I/O (KBps)
:type: Line
:columns:
- net_usage_rate_average
5 changes: 5 additions & 0 deletions product/charts/layouts/realtime_perf_charts/ContainerNode.yaml
View file
Open in desktop
Expand Up @@ -10,3 +10,8 @@
:columns:
- derived_memory_used
- derived_memory_available

- :title: Network I/O (KBps)
:type: Line
:columns:
- net_usage_rate_average
31 changes: 30 additions & 1 deletion spec/models/manageiq/providers/kubernetes/container_manager/metrics_capture_spec.rb
View file
Open in desktop
Expand Up @@ -54,6 +54,20 @@
{'start' => 1446500000000, 'end' => 1446500020000, 'avg' => 0},
{'start' => 1446500020000, 'end' => 1446500040000, 'avg' => 4000000000}
]
},
{
:args => 'network/tx',
:data => [
{'start' => 1446500000000, 'end' => 1446500020000, 'avg' => 0},
{'start' => 1446500020000, 'end' => 1446500040000, 'avg' => 153600}
]
},
{
:args => 'network/rx',
:data => [
{'start' => 1446500000000, 'end' => 1446500020000, 'avg' => 0},
{'start' => 1446500020000, 'end' => 1446500040000, 'avg' => 51200}
]
}
],
:gauges => [
Expand All @@ -74,6 +88,20 @@
{'start' => 1446499980000, 'end' => 1446500000000, 'avg' => 0},
{'start' => 1446500000000, 'end' => 1446500020000, 'avg' => 4000000000}
]
},
{
:args => 'network/tx',
:data => [
{'start' => 1446499980000, 'end' => 1446500000000, 'avg' => 0},
{'start' => 1446500000000, 'end' => 1446500020000, 'avg' => 153600}
]
},
{
:args => 'network/rx',
:data => [
{'start' => 1446499980000, 'end' => 1446500000000, 'avg' => 0},
{'start' => 1446500000000, 'end' => 1446500020000, 'avg' => 51200}
]
}
],
:gauges => [
Expand All @@ -87,7 +115,8 @@
:expected => {
Time.at(1446500000).utc => {
"cpu_usage_rate_average" => 10.0,
"mem_usage_absolute_average" => 50.0
"mem_usage_absolute_average" => 50.0,
"net_usage_rate_average" => 10.0
}
}
}
Expand Down