1. 12 Mar, 2017 1 commit
  2. 08 Mar, 2017 1 commit
  3. 07 Mar, 2017 2 commits
  4. 06 Mar, 2017 6 commits
  5. 03 Mar, 2017 2 commits
  6. 02 Mar, 2017 2 commits
  7. 01 Mar, 2017 1 commit
  8. 28 Feb, 2017 2 commits
  9. 27 Feb, 2017 2 commits
    • Julius Volz's avatar
      Merge pull request #2452 from prometheus/swappable-post · 07491c9f
      Julius Volz authored
      notifier: Allow swapping out HTTP Doer
      07491c9f
    • Julius Volz's avatar
      notifier: Allow swapping out HTTP Doer · f152ac5e
      Julius Volz authored
      We need to be able to modify the HTTP POST in Weave Cortex to add
      multitenancy information to a notification. Since we only really need a
      special header in the end, the other option would be to just allow
      passing in headers to the notifier. But swapping out the whole Doer is
      more general and allows others to swap out the network-talky bits of the
      notifier for their own use. Doing this via contexts here wouldn't work
      well, due to the decoupled flow of data in the notifier.
      
      There was no existing interface containing the ctxhttp.Post() or
      ctxhttp.Do() methods, so I settled on just using Do() as a swappable
      function directly (and with a more minimal signature than Post).
      f152ac5e
  10. 23 Feb, 2017 2 commits
  11. 21 Feb, 2017 1 commit
  12. 20 Feb, 2017 4 commits
  13. 18 Feb, 2017 1 commit
  14. 17 Feb, 2017 4 commits
  15. 16 Feb, 2017 2 commits
    • Jeremy Meulemans's avatar
      Adding gauge for number of open head chunks. · f70b52d0
      Jeremy Meulemans authored
      Fixes #1710
      f70b52d0
    • Stephen Soltesz's avatar
      Fix kubernetes host:port relabel regex. · 3f29324e
      Stephen Soltesz authored
      This change corrects a bug introduced by PR
      https://github.com/prometheus/prometheus/pull/2427
      
      The regex uses three groups: the hostname, an optional port, and the
      prefered port from a kubernetes annotation.
      
      Previously, the second group should have been ignored if a :port was not
      present in the input. However, making the port group optional with the
      "?" had the unintended side-effect of allowing the hostname regex "(.+)"
      to match greedily, which included the ":port" patterns up to the ";"
      separating the hostname from the kubernetes port annotation.
      
      This change updates the regex for the hostname to match any non-":"
      characters. This forces the regex to stop if a ":port" is present and
      allow the second group to match the optional port.
      3f29324e
  16. 15 Feb, 2017 2 commits
    • Tobias Schmidt's avatar
      Merge pull request #2427 from stephen-soltesz/master · 0436e982
      Tobias Schmidt authored
      Kubernetes port annotations - match addresses with or without declared ports
      0436e982
    • Stephen Soltesz's avatar
      Match addresses with or without declared ports. · 0b1790ee
      Stephen Soltesz authored
      This change updates port relabeling for pod and service discovery so the
      relabeling regex matches addresses with or without declared ports. As
      well, this change uses a consistent style in the replacement pattern
      for the two expressions.
      
      Previously, for both services or pods that did not have declared ports, the
      relabel config regex would fail to match:
      
          __meta_kubernetes_service_annotation_prometheus_io_port
          regex: (.+)(?::\d+);(\d+)
      
          __meta_kubernetes_pod_annotation_prometheus_io_port
          regex: (.+):(?:\d+);(\d+)
      
      Both regexes expected a <host>:<port> pattern.
      
      The new regex matches addresses with or without declared ports by making
      the :<port> pattern optional.
      
          __meta_kubernetes_service_annotation_prometheus_io_port
          __meta_kubernetes_pod_annotation_prometheus_io_port
          regex: (.+)(?::\d+)?;(\d+)
      0b1790ee
  17. 14 Feb, 2017 5 commits