Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
telegraf-nftables
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Due to inactivity, this project is scheduled to be deleted on 2035-04-24.
Why is this scheduled?
Show more breadcrumbs
vqgroup
telegraf-nftables
Commits
19411043
Commit
19411043
authored
9 years ago
by
Rene Zbinden
Committed by
Cameron Sparr
9 years ago
Browse files
Options
Downloads
Patches
Plain Diff
change sadf options so that it also works on older linux distributions
parent
7926396d
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
plugins/inputs/sysstat/README.md
+11
-5
11 additions, 5 deletions
plugins/inputs/sysstat/README.md
plugins/inputs/sysstat/sysstat.go
+5
-3
5 additions, 3 deletions
plugins/inputs/sysstat/sysstat.go
with
16 additions
and
8 deletions
plugins/inputs/sysstat/README.md
+
11
−
5
View file @
19411043
...
@@ -12,6 +12,9 @@ the created binary data file with the `sadf` utility.
...
@@ -12,6 +12,9 @@ the created binary data file with the `sadf` utility.
# Sysstat metrics collector
# Sysstat metrics collector
[[inputs.sysstat]]
[[inputs.sysstat]]
## Path to the sadc command.
## Path to the sadc command.
#
## On Debian and Arch Linux the default path is /usr/lib/sa/sadc whereas
## on RHEL and CentOS the default path is /usr/lib64/sa/sadc
sadc_path
=
"/usr/lib/sa/sadc"
# required
sadc_path
=
"/usr/lib/sa/sadc"
# required
#
#
#
#
...
@@ -31,31 +34,34 @@ the created binary data file with the `sadf` utility.
...
@@ -31,31 +34,34 @@ the created binary data file with the `sadf` utility.
## and represents itself a measurement.
## and represents itself a measurement.
##
##
## If Group is true, corresponding metrics are grouped to a single measurement.
## If Group is true, corresponding metrics are grouped to a single measurement.
# group =
fals
e
# group =
tru
e
#
#
#
#
## Options for the sadf command. The values on the left represent the sadf options and
## Options for the sadf command. The values on the left represent the sadf options and
## the values on the right their description (wich are used for grouping and prefixing metrics).
## the values on the right their description (wich are used for grouping and prefixing metrics).
##
## Run 'sar -h' or 'man sar' to find out the supported options for your sysstat version.
[inputs.sysstat.options]
[inputs.sysstat.options]
-C
=
"cpu"
-C
=
"cpu"
-B
=
"paging"
-B
=
"paging"
-b
=
"io"
-b
=
"io"
-d
=
"disk"
# requires DISK activity
-d
=
"disk"
# requires DISK activity
-H
=
"hugepages"
"-I ALL"
=
"interrupts"
# requires INT activity
"-n ALL"
=
"network"
"-n ALL"
=
"network"
"-P ALL"
=
"per_cpu"
"-P ALL"
=
"per_cpu"
-q
=
"queue"
-q
=
"queue"
-R
=
"mem"
-R
=
"mem"
"
-r
ALL"
=
"mem_util"
-r
=
"mem_util"
-S
=
"swap_util"
-S
=
"swap_util"
-u
=
"cpu_util"
-u
=
"cpu_util"
-v
=
"inode"
-v
=
"inode"
-W
=
"swap"
-W
=
"swap"
-w
=
"task"
-w
=
"task"
# -H = "hugepages" # only available for newer linux distributions
# "-I ALL" = "interrupts" # requires INT activity
#
#
#
## Device tags can be used to add additional tags for devices. For example the configuration below
## Device tags can be used to add additional tags for devices. For example the configuration below
## adds a tag vg
=
rootvg for all metrics with sda devices.
## adds a tag vg
with value
rootvg for all metrics with sda devices.
# [[inputs.sysstat.device_tags.sda]]
# [[inputs.sysstat.device_tags.sda]]
# vg = "rootvg"
# vg = "rootvg"
```
```
...
...
This diff is collapsed.
Click to expand it.
plugins/inputs/sysstat/sysstat.go
+
5
−
3
View file @
19411043
...
@@ -93,27 +93,29 @@ var sampleConfig = `
...
@@ -93,27 +93,29 @@ var sampleConfig = `
## and represents itself a measurement.
## and represents itself a measurement.
##
##
## If Group is true, corresponding metrics are grouped to a single measurement.
## If Group is true, corresponding metrics are grouped to a single measurement.
# group =
fals
e
# group =
tru
e
#
#
#
#
## Options for the sadf command. The values on the left represent the sadf options and
## Options for the sadf command. The values on the left represent the sadf options and
## the values on the right their description (wich are used for grouping and prefixing metrics).
## the values on the right their description (wich are used for grouping and prefixing metrics).
##
## Run 'sar -h' or 'man sar' to find out the supported options for your sysstat version.
[inputs.sysstat.options]
[inputs.sysstat.options]
-C = "cpu"
-C = "cpu"
-B = "paging"
-B = "paging"
-b = "io"
-b = "io"
-d = "disk" # requires DISK activity
-d = "disk" # requires DISK activity
-H = "hugepages"
"-n ALL" = "network"
"-n ALL" = "network"
"-P ALL" = "per_cpu"
"-P ALL" = "per_cpu"
-q = "queue"
-q = "queue"
-R = "mem"
-R = "mem"
"
-r
ALL"
= "mem_util"
-r = "mem_util"
-S = "swap_util"
-S = "swap_util"
-u = "cpu_util"
-u = "cpu_util"
-v = "inode"
-v = "inode"
-W = "swap"
-W = "swap"
-w = "task"
-w = "task"
# -H = "hugepages" # only available for newer linux distributions
# "-I ALL" = "interrupts" # requires INT activity
# "-I ALL" = "interrupts" # requires INT activity
#
#
#
#
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment