Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 140a648e46f9
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: dfce20e4e3b6
Choose a head ref
  • 10 commits
  • 3 files changed
  • 2 contributors

Commits on Feb 5, 2019

  1. nixos/munin: fix documentation links

    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.
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    c02564e View commit details
    Browse the repository at this point in the history
  2. nixos/munin: add extraPluginConfig option

    This lets you specify additional plugin-specific configuration to go in
    plugin-conf.d, and complements the extraConfig and extraGlobalConfig
    options.
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    c74abf7 View commit details
    Browse the repository at this point in the history
  3. nixos/munin: add disabledPlugins option

    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.
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    0c3208a View commit details
    Browse the repository at this point in the history
  4. nixos/munin: require DejaVu fonts if enabled

    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 committed Feb 5, 2019
    Copy the full SHA
    b5b82b2 View commit details
    Browse the repository at this point in the history
  5. nixos/munin: add extraPlugins and extraAutoPlugins options [#17895]

    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.
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    6c90785 View commit details
    Browse the repository at this point in the history
  6. nixos/munin: add extraCSS option

    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.
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    c4437fe View commit details
    Browse the repository at this point in the history
  7. nixos/munin: add types to Munin options

    Some options were missing their types.
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    e7c1449 View commit details
    Browse the repository at this point in the history
  8. nixos/munin: enable munin_update and disable munin_stats

    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.)
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    ace4855 View commit details
    Browse the repository at this point in the history
  9. munin: 2.0.37 -> 2.0.43

    Also creates the RELEASE file in preBuild so that munin knows its own
    version number at runtime.
    ToxicFrog committed Feb 5, 2019
    Copy the full SHA
    85cdd06 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #51980 from ToxicFrog/munin-plugins

    nixos/munin: New options (and some bugfixes) for service configuration
    infinisil committed Feb 5, 2019
    Copy the full SHA
    dfce20e View commit details
    Browse the repository at this point in the history