Lars Kruse
3f8ef105ff
Plugin lxc: enable "set -eu" for better error handling
...
The code should be suitable for "exit-on-error" and "error-on-unset".
2019-08-12 02:36:01 +02:00
Lars Kruse
856572ad9b
Plugin lxc: verify the availability of "lxc-ls"
...
Previously "autoconf" only verified, that /var/lib/lxc exists. But this
could be just a remainder of a formerly installed lxc package.
2019-08-12 02:36:01 +02:00
Lars Kruse
59cb851cf5
Plugin lxc: add support for MUNIN_CAP_DIRTYCONFIG
2019-08-12 02:36:01 +02:00
Lars Kruse
f00f28cf6f
Plugin lxc: use functions for top-level activities
...
This clarifies the flow of control and allows to use
MUNIN_CAP_DIRTYCONFIG later.
2019-08-12 02:36:01 +02:00
Lars Kruse
4356a024a7
Plugin lxc: clarify name for function "active_guests"
...
Previously a variable and a function used the same name.
This was no problem, but it can cause confusion.
2019-08-12 02:36:01 +02:00
Lars Kruse
55b881878c
Plugin lxc: change the plugin from "bash" to "sh"
...
No more bashisms were left.
2019-08-12 02:36:01 +02:00
Lars Kruse
6bb4719881
Plugin lxc: separate function for title beautification
...
This avoids a bashism.
2019-08-12 02:36:01 +02:00
Lars Kruse
8b1d537602
Plugin lxc: simplify interface of "lxc_cgroup" and rename function
2019-08-12 02:36:01 +02:00
Lars Kruse
33b2f3ed8b
Plugin lxc: use comprehensible names for variables
2019-08-12 02:36:01 +02:00
Lars Kruse
8b955667c5
Plugin lxc: fix handling of "excludes" parameter
...
Previously only the first item in the "excludes" environment variable
was really excluded.
2019-08-12 02:36:01 +02:00
Lars Kruse
199b4517cb
Plugin lxc: use "grep -E" instead of "egrep"
2019-08-12 02:36:01 +02:00
Lars Kruse
46626b9953
Plugin lxc: simplify implementation of function "active_guests"
2019-08-12 02:36:01 +02:00
Lars Kruse
276e96c0dd
Plugin lxc: remove ineffective "sort -u" from function "active_guests"
...
The output of "lxc-ls" is not line-splitted. Thus all active guests
are printed in a single line and "sort -u" (removal of non-unique
entries) had no effect.
2019-08-12 02:36:01 +02:00
Lars Kruse
6413375cdc
Plugin lxc: simplify processing in function "active_guests"
2019-08-12 02:36:01 +02:00
Lars Kruse
9cdea3c305
Plugin lxc: clarify variable names used in functions
2019-08-12 02:36:01 +02:00
Lars Kruse
da8a74fdcb
Plugin lxc: omit output of "max" if the network interface speed is unknown
...
The "U" value is not defined for the "max" field.
2019-08-12 02:36:01 +02:00
Lars Kruse
914d1c5f25
Plugin lxc: clarify network bandwidth calculation
2019-08-12 02:36:01 +02:00
Lars Kruse
313d195f3b
Plugin lxc: simplify interface of "lxc_netdev"
2019-08-12 02:36:01 +02:00
Lars Kruse
89003f0188
Plugin lxc: fix quoting issues
2019-08-12 02:36:01 +02:00
Lars Kruse
0d593014b4
Plugin lxc: fix printing of "${graph_period}"
...
This specific text token ("${graph_period}") is interpreted by munin and
should not be interpreted by the shell. Thus it needs to be escaped.
2019-08-12 02:36:01 +02:00
Lars Kruse
e91f7ecba7
Plugin lxc: remove ineffective usage of "bc"
...
The command "wc -w" already outputs the final result.
Thus we do not need this command (and do not have to depend on it).
2019-08-12 02:36:01 +02:00
Lars Kruse
d415877cdc
Plugin lxc: explicitly assign all accepted environment variables
2019-08-12 02:36:01 +02:00
Lars Kruse
ec3a7f4045
Plugin lxc: function "lxc_count_processes" now outputs its result
...
Previously the result was returned as the exit code of the function
(which would prevent the usage of "set -e").
Additionally the fallback value that was previously calculated outside
of the function is now part of it.
2019-08-12 02:36:01 +02:00
Lars Kruse
9af96d2c60
Plugin lxc: draw stacked RAM graphs by default
...
Previously "ram_display_stacked" defaulted to "false" (non-stacked
graphs). The new default should be suitable for most situations.
2019-08-12 02:36:01 +02:00
Lars Kruse
ab6f4e3c6e
Plugin lxc: fix configurable RAM graphing
...
Previously (before the multigraph conversion) the configuration setting
for "lxc_ram" was called "areastack". The multigraph conversion
documented a new configuration setting "ram_areastack", but it was not
used, yet.
Thus we can switch to a more descriptive name: "ram_display_stacked".
2019-08-12 02:36:01 +02:00
Lars Kruse
d004990b21
Plugin lxc: exit after autoconf
...
Previously processing continued after a successful autoconf operation.
2019-08-12 02:36:01 +02:00
Lars Kruse
6696a4d894
Plugin lxc: unify whitespace
2019-08-12 02:35:57 +02:00
Marc SCHAEFER
c0fe6dc3c7
Compatibility with older field names
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
784b06fe75
Sections and small fix
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
4e321bbc07
First multigraph version
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
ddcc19cd81
Initial version of multigraph version
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
154ffc100b
Fix
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
5a3e66beef
version
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
50a998b460
areastack option
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
5105020fcf
- added systemd possibility for stats - cleanup
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
241b0c6067
Fix for lxc < 3
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
89e0f1c729
Update
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
9ef366c71a
- autoconf cleanup - better lxc_clean_fieldname workaround supporting non numeric compatibility - lxc_netdev now compatible with lxc3 and lxc2 at a small CPU cost - lxc_cgroup now compatible with lxc3 and lxc2; may however fail with lxc2 if your config file contains cruft
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
ab67ad805d
Comment
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
2cfba9f840
Comment
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
3e865223c2
lxc < 3 support
2019-08-11 23:09:15 +02:00
Marc SCHAEFER
ce6e67fffc
lxc: working on buster (gandalf), and almost working on virtual (jessie), except lxc_net
2019-08-11 22:49:48 +02:00
Gabriel Filion
0e0de01136
asterisk: the confbridge graph is in the wrong category
...
This was a copy/paste error that slipped by unnoticed :\
2019-08-11 18:41:57 +02:00
Lars Kruse
550ba544a6
Merge pull request #1007 from lelutin/replace_meetme_with_confbridge
...
* replace meetme with confbridge
* unify whitespace
2019-08-11 04:47:59 +02:00
Gabriel Filion
e14659d02c
asterisk: use eq instead of == for comparing a variable to a string
...
sumpfralle suggested this change on github, since the comparisons are
meant to be string comparisons.
2019-08-10 21:58:24 -04:00
Gabriel Filion
b8eba4d75c
asterisk: rename options for enabling/disabling graphs
...
With this "enable_" prefix, it will be clearer to users that those
options are boolean flags.
2019-08-10 21:58:24 -04:00
Gabriel Filion
5fff12db96
asterisk: change tabs for spaces for indentation
...
the plugin currently has inconsistencies with how lines are indented:
some lines only use tab characters while all other lines use spaces.
Let's make the coding style more uniform by using spaces everywhere.
2019-08-10 21:58:24 -04:00
Gabriel Filion
f7ebe6833d
asterisk: turn output into debug-only lines
...
I apparently forgot to clear out two lines of debugging output from the
script before submitting a pull request.
Those lines of output are super useful for debugging whenever things are
not working as expected (e.g. asterisk has changed its output). So it'll
be more productive to keep them around but only output them if
MUNIN_DEBUG is set.
2019-08-10 21:38:36 +02:00
Gabriel Filion
7492865044
asterisk: Add configuration options to disable conference graphs
...
Since the MeetMe application is not available anymore on Debian, it
makes no sense to keep the graph around. We do however want to keep code
around for parsing stats from MeetMe. So we'll add two "binary" flags
that'll let users which of these two graphs they want.
The default values will favor getting information from ConfBridge which
is the suggested replacement for MeetMe.
An added bonus of this is that some users might decide to disable both
graphs if they use neither applications, which was impossible before.
2019-08-10 14:16:34 -04:00
Gabriel Filion
46b5f4bd13
asterisk: add graph for confbridge
...
The MeetMe Asterisk application has been deprecated since Asterisk 1.8.
Debian has also stopped distributing the module with version 11.5.1.
Users now need to migrate to using the ConfBridge application.
Since the application still exists, and some ppl in other Linux distros
probably still use it, we'll keep the code for parsing meetme info for
some time.
2019-08-10 14:16:33 -04:00