summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2020-02-28Fix build in FreeBSD/DragonflyBSDHEADmasterBabak Farrokhi
2020-02-28Add package installation instructions for Fedora/CentOSCarl George
2018-01-03curses: Add CTRL-N/CTRL-P for next/previous elementAlexis Hildebrandt
2018-01-03curses: Fix seperator linesAlexis Hildebrandt
when section above or below is collapsed
2018-01-03Fix typographical errorsAlexis Hildebrandt
2017-10-03Allow numeric colors in bmonrcAlexis Hildebrandt
2017-02-10Fix configuration syntax in examples/bmon.confThomas Graf
Fixes: #53 Signed-off-by: Thomas Graf <tgraf@suug.ch>
2017-02-10OSX: Add brew usage instructionsThomas Graf
Signed-off-by: Thomas Graf <tgraf@suug.ch>
2017-02-09Avoid trying to include <values.h> on AndroidFredrik Fornwall
The <values.h> header file is not present on Android, and the project builds there without it.
2017-02-02out_curses: use xcalloc instead of a fixed bufferNachiketa Prachanda
In put_line(), replace the fixed onstack buffer with a xcalloc-ed buffer. This fixes a bmon crash with terminal size larger than 2048 bytes. The crash be reproduced with $ stty cols 2100 $ bmon .... Signed-off-by: Nachiketa Prachanda <nchkta@gmail.com>
2016-12-134.0 releasev4.0Thomas Graf
Signed-off-by: Thomas Graf <tgraf@suug.ch>
2016-12-13netlink: Add rx_nohandler link stat counterTobias Klauser
Hook up the device rx nohandler stat counter available in the upcoming libnl 3.2.29, added in libnl commit 5040fc8a4994 ("lib/route: add rx_nohandler link stats field"). Also add a compatibility define, so older libnl version will still work fine. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2016-11-28Merge pull request #51 from L00Cyph3r/patch-1Thomas Graf
Added CentOS installation steps
2016-11-28Added CentOS installation stepsL00Cyph3r
Works on my CentOS 6.8 box
2016-11-25Merge pull request #46 from zorun/monotonic_clockThomas Graf
Use a monotonic clock instead of a realtime clock
2016-11-12Use a monotonic clock instead of a realtime clockBaptiste Jonglez
Using a realtime clock is a bad idea: it is affected by any kind of time change, which can happen when the administrator modifies the system time, or more simply when a laptop suspends to RAM and then wakes up from sleep. With the current approach of using a realtime clock: - if the system time jumps forward (e.g. when resuming after a suspend-to-RAM), bmon would take 100% CPU and display random graph data extremely fast, until it "catches up" with the new time. - if the system time jumps backwards, bmon would freeze until *time* "catches up" to the point it was before. bmon then (incorrectly) displays a spike in the graph, because lots of packets have been sent/received since the last update. Instead of using gettimeofday(), switch to clock_gettime() with CLOCK_MONOTONIC on systems that support it. OS X does not provide clock_gettime(), so this commit also adds a Mach-specific implementation. This change has been tested on Linux 4.1 with glibc and musl, and on FreeBSD 10.0-RELEASE-p12.
2016-10-18Merge pull request #49 from DoctorSher/masterThomas Graf
Flushed stdout after every group is printed in an iteration.
2016-10-17Flushed stdout after every group is printed in an iteration. This allows us ↵Adam Drescher
to redirect ascii based output to a file.
2016-10-07Merge pull request #48 from DoctorSher/masterThomas Graf
Added example to man page, switched format strings to single quotes.
2016-10-07Changed the long format string example to be one continuous string. While ↵Adam Drescher
this is less pretty than it was before, it allows the user to actually paste the format string directly into their bmon command to try it out. Before this change, the way the string was formatted you could not simply paste it in and run it (whether it had single or double quotes).
2016-10-07Replaced format string double quotes with single quotes to prevent the shell ↵Adam Drescher
from running our provided format placeholders.
2016-10-07Added a format string example to the man page. While the documentation is ↵Adam Drescher
clear, it is nice to see an example to get started. Single quotes are used to prevent the shell from running our bmon patterns as commands, and to prevent it from doing wildcard expansion for the interface string.
2016-08-05Merge pull request #44 from blastmaster/masterThomas Graf
Fix issue #43
2016-08-04Fix issue #43blastmaster
* Remove newline from put_line formatstring while drawing details.
2016-08-02Fix item selection after element subgroups have been removedThomas Graf
If the element currently selected is removed due to inactivity, the selection is fixed up to the previous element in the list. This step must be done after the entire element subgroup has been removed. Signed-off-by: Thomas Graf <tgraf@suug.ch>
2016-08-02Use DEFAULT_GROUP instead of hardcoded stringThomas Graf
Signed-off-by: Thomas Graf <tgraf@suug.ch>
2016-08-02dummy: Use default group as first group nameThomas Graf
Signed-off-by: Thomas Graf <tgraf@suug.ch>
2016-08-02Derive initial interface selection based on policyThomas Graf
So far, any output module with a selection capability defaulted to the first interface in the list as first pick. This uses the policy configuration instead and thus allows to select which interface to display first: Examples: bmon -p 'em1,*' bmon -p 'eth*,lo,*' The first rule that finds a matching interface is used and will trigger initial selection. Note that this is *ONLY* evaluated after the first read of the statistics so if a more preferred interface appears later, the selection will not be changed. Signed-off-by: Thomas Graf <tgraf@suug.ch>
2016-07-193.9 releasev3.9Thomas Graf
Signed-off-by: Thomas Graf <tgraf@suug.ch>
2016-07-19Merge branch 'blastmaster-master'Thomas Graf
2016-07-19fix make distcheck errorblastmaster
* add layout.h in include/Makefile.am
2016-07-19enabling colors for bmonblastmaster
This commit enables colors in bmon. It adds configuration options to let the user decide, which colors should be used. Therefor the graph_rx and graph_tx layouts are introduced and applied respectively. * Add graph_rx, graph_tx and layout_cfg fields. * Setting default colors if colorized output is enabled. * draw_table accept additional layout parameter and apply the given layout for the table graph. * Apply layouts for rx, tx graph and header and statusbar. * Add include/layout.h, which provides functions to parse, color and attribute strings and set the layout. * Adding a default layout-config example in examples/bmon.conf. [Edit: Based on original work by eri!, #PR23]
2016-04-28Merge pull request #39 from tklauser/gcc-6Thomas Graf
format: Add missing braces around 'if' clause
2016-04-28format: Add missing braces around 'if' clauseTobias Klauser
When compiling bmon with gcc 6.1 it complains with the following warning: out_format.c: In function ‘get_token’: out_format.c:134:10: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation] } else if (!strncasecmp(token+5, "txrate:", 7)) ^~ out_format.c:136:4: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’ return buf; ^~~~~~ Indeed, the 'return buf' should only be executed if it was snprintf()'ed to. Otherwise "unknown" should be returned. Fix this by adding braces. Also use the 'type' variable in strncasecmp() as in the other checks. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2016-04-20Merge pull request #38 from yamadapc/masterThomas Graf
Add OSX install instructions
2016-04-20Add OSX install instructionsyamadapc
I'm not sure if this is universal, but this worked for installing on El Capitan here.
2016-03-30Merge pull request #37 from Berzerker/patch-1Thomas Graf
Update Readme to include additional dependencies
2016-03-29Update Readme to include additional dependenciesBerzerker
pkg-config and dh-autoreconf are required packages for proper configuration
2016-03-29Add 'info' option to show additional info screen by defaultThomas Graf
Suggested-by: @Berzerker Signed-off-by: Thomas Graf <tgraf@suug.ch>
2016-03-28Merge pull request #36 from bsiegert/masterThomas Graf
NetBSD fixes (from pkgsrc)
2016-03-26Use uintmax_t cast for some printfs.Benny Siegert
Some of the BSDs have 32-bit, some 64-bit vars for this.
2016-03-26NetBSD does not have send or receive quotas.Benny Siegert
2016-01-29Check for presence of pkg-config in configureThomas Graf
Signed-off-by: Thomas Graf <tgraf@suug.ch>
2016-01-29curses: Add ability to reset statisticsThomas Graf
Press 'r' in curses mode to reset a statistic counter to start counting from 0 again. This does NOT reset the counter from the source itself but merely emulates a counter reset. If you restart bmon, the counter will be back to its total value. Signed-off-by: Thomas Graf <tgraf@suug.ch>
2016-01-25Merge pull request #32 from Chocobo1/travisThomas Graf
Fix TravisCI script
2016-01-26TravisCI: merge config for coverity scanChocobo1
2016-01-26TravisCI: fix script, add OSX buildsChocobo1
2015-12-16travis: Switch to trusty ubuntu distroThomas Graf
Signed-off-by: Thomas Graf <tgraf@suug.ch>
2015-12-16netlink: BUG() if we don't have parent informationThomas Graf
This would indicate that we hang a TC object to the tree root. Signed-off-by: Thomas Graf <tgraf@suug.ch>
2015-12-16netlink: Use ifindex of parent TC object when searching leaf qdiscsThomas Graf
The qdisc cache is host wide, the parent classid is not unique so the ifindex of the parent tc object must be set in the filter otherwise a leaf qdisc with an identical parent id in another device can be mistaken. This also converts the class_cache to be passed up through the stack to make clear it is not system wide but specific to the ifindex we are currently handling. Signed-off-by: Thomas Graf <tgraf@suug.ch>