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: 5c3564790af3
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9db4062c6c4d
Choose a head ref
  • 6 commits
  • 15 files changed
  • 2 contributors

Commits on Mar 6, 2020

  1. nixos/prometheus-*-exporter: escape shell args 

    (cherry picked from commit 0ac24cc)
    @mmilata @WilliButz
    mmilata authored and WilliButz committed Mar 6, 2020
    Copy the full SHA
    c3bb46e View commit details
    Browse the repository at this point in the history

  2. nixos/prometheus-snmp-exporter: update log options 

    The allowed values have changed in bd3319d.

0.15:
      --log.level="info"        Only log messages with the given severity or above. Valid levels: [debug, info, warn, error, fatal]
      --log.format="logger:stderr"
                                Set the log target and format. Example: "logger:syslog?appname=bob&local=7" or "logger:stdout?json=true"

0.17:
      --log.level=info          Only log messages with the given severity or above. One of: [debug, info, warn, error]
      --log.format=logfmt       Output format of log messages. One of: [logfmt, json]

(cherry picked from commit 87f87fb)
    @mmilata @WilliButz
    mmilata authored and WilliButz committed Mar 6, 2020
    Copy the full SHA
    6673c4f View commit details
    Browse the repository at this point in the history

  3. nixos/prometheus-snmp-exporter: fix assertion 

    The assertion was printed when user explicitly defined only the
configurationPath option.

(cherry picked from commit 2a080ac)
    @mmilata @WilliButz
    mmilata authored and WilliButz committed Mar 6, 2020
    Copy the full SHA
    bddb172 View commit details
    Browse the repository at this point in the history

  4. nixos/prometheus-mail-exporter: fix assertion 

    The assertion was printed when user explicitly defined only the
configFile option.

(cherry picked from commit 3b5cf35)
    @mmilata @WilliButz
    mmilata authored and WilliButz committed Mar 6, 2020
    Copy the full SHA
    f382c70 View commit details
    Browse the repository at this point in the history

  5. nixos/prometheus-mail-exporter: misc fixes 

     - Fix misspelled option. mkRenamedOptionModule is not used because the
   option hasn't really worked before.
 - Add missing cfg.telemetryPath arg to ExecStart.
 - Fix mkdir invocation in test.

(cherry picked from commit e7ed790)
    @mmilata @WilliButz
    mmilata authored and WilliButz committed Mar 6, 2020
    Copy the full SHA
    ebb7ec3 View commit details
    Browse the repository at this point in the history

  6. nixos/tests/prometheus-exporters: increase memory for rspamd 

    Before this, the test failed because rspamd did invoke the oom-killer.

(cherry picked from commit 0d832ee)
    @WilliButz
    WilliButz committed Mar 6, 2020
    Copy the full SHA
    9db4062 View commit details
    Browse the repository at this point in the history