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: 87bfe2c74724
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 340f3067722e
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Nov 25, 2017

  1. munin: 2.0.33 -> 2.0.34 

    (cherry picked from commit e36962a)
    @orbekk @bjornfor
    orbekk authored and bjornfor committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    d29f871 View commit details
    Browse the repository at this point in the history

  2. munin-node: add patch to preserve environment variables 

    (cherry picked from commit c164d83)
    @orbekk @bjornfor
    orbekk authored and bjornfor committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    586e2aa View commit details
    Browse the repository at this point in the history

  3. munin-node: patch to configure plugin-conf.d 

    Add a new patch (adding_sconfdir_munin-node.patch) to be able to
configure the location of plugin-conf.d (otherwise it has to be
configured at build time).  This patch is very similar to the
existing 'adding_servicedir_munin-node.patch'.

(cherry picked from commit a2dc37c)
    @orbekk @bjornfor
    orbekk authored and bjornfor committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    feb2733 View commit details
    Browse the repository at this point in the history

  4. nixos/munin: fix broken plugin wrappers 

    The munin-node service used wrapProgram to inject environment variables.
This doesn't work because munin plugins depend on argv[0], which is
overwritten when the executable is a script with a shebang line (example
below).

This commit removes the wrappers and instead passes the required
environment variables to munin-node.

Eliminating the wrappers resulted in some broken plugins, e.g., meminfo
and hddtemp_smartctl. That was fixed with the per-plugin configuration.

Example:

  The plugin if_eth0 is a symlink to /.../plugins/if_, which uses $0
  to determine that it should monitor traffic on the eth0 interface.

  if_ is a wrapped program, and runs `exec -a "$0" .if_-wrapped`

  .if_-wrapped has a "#!/nix/.../bash" line, which results in bash
  changing $0, and as a result the plugin thinks my interface
  is called "-wrapped".

(cherry picked from commit bd3e49a)
    @orbekk @bjornfor
    orbekk authored and bjornfor committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    340f306 View commit details
    Browse the repository at this point in the history