nixos/munin: New options (and some bugfixes) for service configuration by ToxicFrog · Pull Request #51980 · NixOS/nixpkgs

ToxicFrog · 2018-12-14T03:02:07Z

Motivation for this change

The old Munin configuration had some outright bugs (wrong fonts used for graph generation, documentation links out of date) and was missing a lot of useful knobs. These changes fix those bugs, and add options for plugin configuration, loading extra plugins, disabling builtin plugins, and applying custom styles to the HTML that Munin generates.

Things done

ToxicFrog · 2018-12-14T14:50:19Z

On further testing, the extraAutoPlugins option doesn't work reliably due to the way Munin searches for plugins. I'll see about fixing that this evening.

nixos/modules/services/monitoring/munin.nix

florianjacob · 2018-12-14T23:54:05Z

nixos/tests/munin.nix disables a plugin via ignore_file ^apc_nis$, it would make sense to switch that over to the new module option. Regarding previous ignore_file way vs. deleting the plugins like your option does, will that make any difference for munin? There is no other way for plugins to be enabled than linking them to /etc/munin/plugins, right?

Overall, this gives the munin the necessary portion of care, and shrinks my extraConfig to 1/8th. Did not test extraAutoPlugins, though.

ToxicFrog · 2018-12-15T02:20:42Z

I've updated tests/munin.nix to use the new disabledPlugins setting, and it seems to work.

florianjacob · 2018-12-15T09:12:58Z

@GrahamcOfBorg build nixosTests.munin

ToxicFrog · 2018-12-15T20:04:11Z

Made a small tweak to the CSS commit (so that the example code doesn't look hideous on warning/critical graphs) and added a new commit to bump the Munin version to the latest stable release (and fix a small bug in the build).

FRidh · 2018-12-31T12:36:55Z

@GrahamcOfBorg build nixosTests.munin

ToxicFrog · 2019-01-28T15:52:15Z

Is there anything else I need to do here (sync and resolve conflicts?) or is it just waiting for a maintainer to merge it?

florianjacob · 2019-01-28T16:02:29Z

@FRidh do you have time for a review, or can recommend someone else?

nixos/modules/services/monitoring/munin.nix

infinisil · 2019-01-28T19:28:46Z

I can agree with everything in this PR, but d2de4ccab1551fc04d206fa1ab967d7e09e4665a is a bit of an oddball. I've never seen an option do such auto-patching in the hopes that it works, but I guess it can't hurt to try it. Are you using those options yourself and have found those patches to be enough for your stuff?

ToxicFrog · 2019-01-30T23:27:47Z

I am using those options, yes, and I found that to be sufficient. I have a checkout of munin-contrib that I point extraAutoPlugins at, and while hardcoded /bin/ and /sbin/ paths aren't really used in the mainline munin plugins, they are extremely common in munin-contrib (either directly, or by manually setting PATH=/bin/:/usr/bin/:/sbin/:/usr/sbin/ at the start of the file or similar).

This quick and dirty patch probably doesn't catch everything, but it's sufficient to get the plugins I wanted working and it doesn't seem to break anything that wasn't already not working.

That said, I think the right approach here is to have a separate munin-contrib Nix package and apply these fixes as part of the build process, and/or try to get patches upstreamed to remove hardcoded executable paths from contrib. This was just much faster to do, since I was already working in this file.

I don't feel particularly strongly about internAndFixPlugins; if you think it's too gross and/or dangerous to be part of the options, I can apply it to my checkout of munin-contrib in place and remove the autopatching behaviour from extraPlugins and extraAutoPlugins.

infinisil · 2019-02-03T16:48:37Z

Alright I think it's fine to stay. When my other comment is addressed and the merge conflict fixed this is fine to merge.

Since this module was written, Munin has moved their documentation from munin-monitoring.org/wiki to guide.munin-monitoring.org. Most of the links were broken, and the ones that weren't went to "please use the new site" pages.

This lets you specify additional plugin-specific configuration to go in plugin-conf.d, and complements the extraConfig and extraGlobalConfig options.

This is just a set of globs to remove from the active plugins directory after autoconfiguration is complete. I also removed the hard-coded disabling of "diskstats", since it seems to work just fine now.

munin-graph is hardcoded to use DejaVu Mono for the graph legends; if it can't find it, there's no guarantee it finds a monospaced font at all, and if it can't find a monospaced font the legends come out badly misformatted.

extraAutoPlugins lets you list plugins and plugin directories to be autoconfigured, and extraPlugins lets you enable plugins on a one-by-one basis. This can be used to enable plugins from contrib (although you'll need to download and check out contrib yourself, then point these options at it), or plugins you've written yourself.

This permits custom styling of the generated HTML without needing to build your own Munin package from source. Also comes with an example that works as a passable dark theme for Munin.

Some options were missing their types.

munin_update relies on a stats file that exists, but isn't found in the default location on NixOS; the appropriate plugin configuration is added. munin_stats relies on munin-cron writing a logfile, which the NixOS build of munin does not. (This is probably fixable in the munin package, but I don't have time to dig into that right now.)

Also creates the RELEASE file in preBuild so that munin knows its own version number at runtime.

ToxicFrog · 2019-02-05T01:19:33Z

Rebased against latest master, conflicts resolved.

domenkozar · 2019-02-05T06:41:44Z

@GrahamcOfBorg build tests.munin

infinisil · 2019-02-05T13:21:26Z

@GrahamcOfBorg test munin

Edit: Ah that's the same apparently

ToxicFrog requested a review from infinisil as a code owner December 14, 2018 03:02

ToxicFrog mentioned this pull request Dec 14, 2018

Munin: ability to use plugins from munin-contrib #17895

Open

GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 14, 2018

ToxicFrog force-pushed the munin-plugins branch from 5535333 to e9e90ce Compare December 14, 2018 11:03

GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 14, 2018

florianjacob reviewed Dec 14, 2018

View reviewed changes

nixos/modules/services/monitoring/munin.nix Outdated Show resolved Hide resolved

ToxicFrog force-pushed the munin-plugins branch 2 times, most recently from b0c2e64 to 4a263ad Compare December 15, 2018 02:16

ToxicFrog force-pushed the munin-plugins branch from 4a263ad to 6c5ff52 Compare December 15, 2018 20:03

infinisil requested changes Jan 28, 2019

View reviewed changes

nixos/modules/services/monitoring/munin.nix Outdated Show resolved Hide resolved

ToxicFrog force-pushed the munin-plugins branch from 6c5ff52 to 4bdd075 Compare February 5, 2019 01:06

GrahamcOfBorg added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 5, 2019

infinisil approved these changes Feb 5, 2019

View reviewed changes

ToxicFrog added 4 commits February 4, 2019 20:17

nixos/munin: fix documentation links

c02564e

Since this module was written, Munin has moved their documentation from munin-monitoring.org/wiki to guide.munin-monitoring.org. Most of the links were broken, and the ones that weren't went to "please use the new site" pages.

nixos/munin: add extraPluginConfig option

c74abf7

This lets you specify additional plugin-specific configuration to go in plugin-conf.d, and complements the extraConfig and extraGlobalConfig options.

nixos/munin: add disabledPlugins option

0c3208a

This is just a set of globs to remove from the active plugins directory after autoconfiguration is complete. I also removed the hard-coded disabling of "diskstats", since it seems to work just fine now.

nixos/munin: require DejaVu fonts if enabled

b5b82b2

munin-graph is hardcoded to use DejaVu Mono for the graph legends; if it can't find it, there's no guarantee it finds a monospaced font at all, and if it can't find a monospaced font the legends come out badly misformatted.

ToxicFrog added 5 commits February 4, 2019 20:17

nixos/munin: add extraCSS option

c4437fe

This permits custom styling of the generated HTML without needing to build your own Munin package from source. Also comes with an example that works as a passable dark theme for Munin.

nixos/munin: add types to Munin options

e7c1449

Some options were missing their types.

munin: 2.0.37 -> 2.0.43

85cdd06

Also creates the RELEASE file in preBuild so that munin knows its own version number at runtime.

ToxicFrog force-pushed the munin-plugins branch from 4bdd075 to 85cdd06 Compare February 5, 2019 01:18

GrahamcOfBorg removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 5, 2019

GrahamcOfBorg requested review from bjornfor and domenkozar February 5, 2019 01:30

infinisil merged commit dfce20e into NixOS:master Feb 5, 2019

flokli mentioned this pull request Dec 4, 2019

nixos/tests/munin: port to python #74935

Merged

7 tasks

Janik-Haag added the 12.first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023

Uh oh!

Conversation

ToxicFrog commented Dec 14, 2018

Motivation for this change

Things done

Uh oh!

ToxicFrog commented Dec 14, 2018

Uh oh!

Uh oh!

florianjacob commented Dec 14, 2018

Uh oh!

ToxicFrog commented Dec 15, 2018

Uh oh!

florianjacob commented Dec 15, 2018

Uh oh!

ToxicFrog commented Dec 15, 2018

Uh oh!

FRidh commented Dec 31, 2018

Uh oh!

ToxicFrog commented Jan 28, 2019

Uh oh!

florianjacob commented Jan 28, 2019

Uh oh!

Uh oh!

infinisil commented Jan 28, 2019

Uh oh!

ToxicFrog commented Jan 30, 2019

Uh oh!

infinisil commented Feb 3, 2019

Uh oh!

ToxicFrog commented Feb 5, 2019

Uh oh!

domenkozar commented Feb 5, 2019

Uh oh!

infinisil commented Feb 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

infinisil commented Feb 5, 2019 •

edited

Loading