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: 14105fd257cf
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 2f2e2971d6cc
Choose a head ref
  • 14 commits
  • 4 files changed
  • 3 contributors

Commits on Mar 25, 2019

  1. Add prometheus2 configuration to the prometheus modules

    As the configuration for the exporters and alertmanager is unchanged
    between the two major versions this patch tries to minimize
    duplication while at the same time as there's no upgrade path from 1.x
    to 2.x, it allows running the two services in parallel. See also #56037
    azazel75 authored and jbgi committed Mar 25, 2019
    Copy the full SHA
    11b8972 View commit details
    Browse the repository at this point in the history
  2. Make it pass a minimal test

    azazel75 authored and jbgi committed Mar 25, 2019
    Copy the full SHA
    1b6ce80 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    e17b464 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    bfbae97 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    5ae2592 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    0333d87 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2019

  1. nixos/prometheus: use ExecStart instead of a shell script

    This uses fewer lines of code and one less process.
    basvandijk authored and jbgi committed Apr 8, 2019
    Copy the full SHA
    a59c929 View commit details
    Browse the repository at this point in the history
  2. nixos/prometheus: get rid of empty arguments

    Previously the prometheus.service file looked like:
    
      ExecStart=/nix/store/wjkhfw3xgkmavz1akkqir99w4lbqhak7-prometheus-1.8.2-bin/bin/prometheus -storage.local.path=/var/lib/prometheus/metrics \
        -config.file=/nix/store/zsnvzw51mk3n1cxjd0351bj39k1j6j27-prometheus.yml-check-config-checked \
        -web.listen-address=0.0.0.0:9090 \
        -alertmanager.notification-queue-capacity=10000 \
        -alertmanager.timeout=10s \
         \
    
      Restart=always
    
    Now it's:
    
      ExecStart=/nix/store/wjkhfw3xgkmavz1akkqir99w4lbqhak7-prometheus-1.8.2-bin/bin/prometheus \
        -storage.local.path=/var/lib/prometheus/metrics \
        -config.file=/nix/store/zsnvzw51mk3n1cxjd0351bj39k1j6j27-prometheus.yml-check-config-checked \
        -web.listen-address=0.0.0.0:9090 \
        -alertmanager.notification-queue-capacity=10000 \
        -alertmanager.timeout=10s
      Restart=always
    basvandijk authored and jbgi committed Apr 8, 2019
    Copy the full SHA
    7cf27fe View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    3949700 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    eed84d1 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    29d7d8f View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2019

  1. nixos/prometheus: add back the option services.prometheus.dataDir

    This is to ensure more backwards compatibility. Note this is not 100%
    backwards compatible because we now require dataDir to begin with /var/lib/.
    basvandijk committed Apr 9, 2019
    Copy the full SHA
    c95179b View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    b423b73 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #58255 from jbgi/prometheus2

    Add Prometheus 2 service in parallel with 1.x version (continuation)
    basvandijk committed Apr 9, 2019
    Copy the full SHA
    2f2e297 View commit details
    Browse the repository at this point in the history