Telegraf Charm

Merge ~xavpaice/charm-telegraf/+git/telegraf-charm:new_metrics into ~telegraf-charmers/charm-telegraf:master

  1. Git
  2. lp:~xavpaice/charm-telegraf/+git/telegraf-charm
  3. new_metrics
  4. Merge into master
Proposed by Xav Paice
Status: Merged
Approved by: Junien F
Approved revision: 28d5e58352d2a5fc743536f8ff6890379f890d86
Merged at revision: 9db62aa4f81e7ec8414915229ccee791f18ffebd
Proposed branch: ~xavpaice/charm-telegraf/+git/telegraf-charm:new_metrics
Merge into: ~telegraf-charmers/charm-telegraf:master
Diff against target: 24 lines (+16/-0)
1 file modified
templates/base_inputs.conf (+16/-0)
Reviewer Review Type Date Requested Status
Junien F Approve
Review via email: mp+353830@code.launchpad.net

Commit message

add metrics for bcache, conntrack, bond, cgroup, nr_file

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Junien F (axino) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 9db62aa4f81e7ec8414915229ccee791f18ffebd

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/base_inputs.conf b/templates/base_inputs.conf
2index 19413f2..7b18cb3 100644
3--- a/templates/base_inputs.conf
4+++ b/templates/base_inputs.conf
5@@ -70,3 +70,19 @@
6 # Read metrics about system load & uptime
7 [[inputs.system]]
8 # no configuration
9+
10+[[inputs.bcache]]
11+
12+[[inputs.bond]]
13+
14+[[inputs.conntrack]]
15+files = ["ip_conntrack_count","ip_conntrack_max", "nf_conntrack_count","nf_conntrack_max"]
16+
17+[[inputs.cgroup]]
18+
19+[[inputs.exec]]
20+commands = [
21+ "/usr/bin/awk '{ print $1 }' /proc/sys/fs/file-nr"
22+]
23+data_format = "value"
24+

Subscribers

People subscribed via source and target branches

to all changes: