Skip to content
Snippets Groups Projects
  1. Dec 19, 2017
    • beorn7's avatar
      Fix definition of maintainer · d49cecb1
      beorn7 authored
      d49cecb1
    • beorn7's avatar
      Updated according to code review comments · a89d4e83
      beorn7 authored
      Please pay special attention to this commit as I mostly react to my
      own comments (while also trying to incorporate results from wider
      discussions).
      
      In approximate order if importance:
      
      - As per discussion, I made acceptance of new team mebers depend on a
        supermajority vote (while given special emphasis on the desire to
        reach consensus).
      
      - As per discussion, I made maintainership independent from team
        membership, albeit explicitly called out as an exception. (I also
        mentioned the possible graduation path in the FAQ to illustrate how
        such an exception could look like.)
      
      - Changes in maintainership are now by lazy consensus, but have to be
        announced on the dev list. That saves us the explicit mention of a
        conflict-resolving vote, as that's part of our definition of lazy
        consensus. Thanks to maintainership being independent from team
        membership, everything a rogue maintainer has done, can be reverted,
        so there is no need to become any more formal about changes in
        maintainership.
      
      - Clarified that there are no “abstain” votes (which is relevant for
        the multi-option votes to determine majority).
      
      - Fixed “at least half the votes” to “more than half”.
      
      - Numerous typography (mostly Oxford comma and “proper quotes”) and
        spelling fixes (mostly favour -> favor, as we in general use
        American spelling).
      a89d4e83
  2. Dec 07, 2017
  3. Dec 06, 2017
  4. Dec 05, 2017
  5. Dec 04, 2017
  6. Jul 10, 2017
  7. Jul 07, 2017
  8. Jul 06, 2017
  9. Jul 05, 2017
  10. Jul 04, 2017
  11. Jun 23, 2017
    • Tobias Schmidt's avatar
      Merge pull request #2865 from mattbostock/add_marathon_port_ordinal_label · 43075d02
      Tobias Schmidt authored
      Marathon SD: Set port index label
      43075d02
    • Matt Bostock's avatar
      Marathon SD: Set port index label · ab4d6495
      Matt Bostock authored
      The changes [1][] to Marathon service discovery to support multiple
      ports mean that Prometheus now attempts to scrape all ports belonging to
      a Marathon service.
      
      You can use port definition or port mapping labels to filter out which
      ports to scrape but that requires service owners to update their
      Marathon configuration.
      
      To allow for a smoother migration path, add a
      `__meta_marathon_port_index` label, whose value is set to the port's
      sequential index integer. For example, PORT0 has the value `0`, PORT1
      has the value `1`, and so on.
      
      This allows you to support scraping both the first available port (the
      previous behaviour) in addition to ports with a `metrics` label.
      
      For example, here's the relabel configuration we might use with
      this patch:
      
          - action: keep
            source_labels: ['__meta_marathon_port_definition_label_metrics', '__meta_marathon_port_mapping_label_metrics', '__meta_marathon_port_index']
            # Keep if port mapping or definition has a 'metrics' label with any
            # non-empty value, or if no 'metrics' port label exists but this is the
            # service's first available port
            regex: ([^;]+;;[^;]+|;[^;]+;[^;]+|;;0)
      
      This assumes that the Marathon API returns the ports in sorted order
      (matching PORT0, PORT1, etc), which it appears that it does.
      
      [1]: https://github.com/prometheus/prometheus/pull/2506
      ab4d6495
  12. Jun 19, 2017
  13. Jun 17, 2017
  14. Jun 16, 2017
Loading