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

Commits on Mar 6, 2020

  1. Copy the full SHA
    0ac24cc 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]
    mmilata committed Mar 6, 2020
    Copy the full SHA
    87f87fb 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.
    mmilata committed Mar 6, 2020
    Copy the full SHA
    2a080ac 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.
    mmilata committed Mar 6, 2020
    Copy the full SHA
    3b5cf35 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.
    mmilata committed Mar 6, 2020
    Copy the full SHA
    e7ed790 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #81854 from mmilata/prometheus-exporters-fixes

    nixos/prometheus-*-exporters: minor fixes
    WilliButz committed Mar 6, 2020
    Copy the full SHA
    ff3c06a View commit details
    Browse the repository at this point in the history