Commit Graph

9 Commits (59d4c539d1fddbc8cfa94c7b1e67359b5230c788)

Author SHA1 Message Date
Fabian Reinartz 87918f3097 Merge branch 'master' into dev-2.0
7 years ago
Max Leonard Inden 1c96fbb992
Expose current Prometheus config via /status/config
7 years ago
Brian Brazil e5f94145b8 Drop series for federation if latest sample is stale.
8 years ago
Fabian Reinartz 8c768f2ca3 web: Fix federation for instance label
8 years ago
Brian Brazil 8cd5aff8fe Send instance="" with federation if instance not set.
8 years ago
Brian Brazil dbb65846f1 Add unittest for federation external_labels behaviour
8 years ago
beorn7 717dd8adac web: add more federation test scenarios
8 years ago
beorn7 784a8ad7c5 web: Inline httptest.NewRequest because it only exists in Go1.7+
8 years ago
beorn7 39c4915401 federation: Collapse time series of the same name
8 years ago