Commit Graph

4042 Commits (ced935e2d2bcb253f11e233862fde40c1b0f64a1)
 

Author SHA1 Message Date
Björn Rabenstein df4bc3e407 Merge pull request #3170 from tomwilkie/1.7-2969-negative-shards
7 years ago
Tom Wilkie f66f882d08 Merge pull request #3160 from bboreham/remote-keepalive
7 years ago
Tom Wilkie 4f8efdbd59 Prevent number of remote write shards from going negative.
7 years ago
Ben Kochie 1ab0bbb2c2 Merge pull request #3125 from prometheus/bjk/staticcheck
7 years ago
Björn Rabenstein 4d8e7ca185 Merge pull request #3159 from mattbostock/1.7_marathon_sd_cherrypick
7 years ago
Matt Bostock e758260986 Marathon SD: Set port index label
7 years ago
Bryan Boreham 9d6b945e41 Default HTTP keep-alive ON for remote read/write
7 years ago
Bryan Boreham e0a4d18301 Allow http keep-alive setting to be overridden in config
7 years ago
Tobias Schmidt 8bee283f8a Merge pull request #2895 from jamiemoore/ec2_discovery_rolearn
7 years ago
Jamie Moore 7a135e0a1b Add the ability to assume a role for ec2 discovery
7 years ago
Fabian Reinartz 9b4c3d4254 Merge pull request #3146 from prometheus/fixprofpath
7 years ago
Fabian Reinartz 64c7c56df8 Merge pull request #3147 from dvrkps/patch-1
7 years ago
Davor Kapsa bb853abf24 travis: add 1.x to go versions
7 years ago
Fabian Reinartz 27bdddbf51 web: fix profile paths
7 years ago
Fabian Reinartz 6ab652e3dc Merge pull request #3144 from wgliang/master
7 years ago
Fabian Reinartz a0280cc489 Merge pull request #3142 from prometheus/fish/fix-k8s-ingress-type
7 years ago
wangguoliang 7e6c6020ff should use time.Since instead of time.Now().Sub
7 years ago
Johannes 'fish' Ziemke 75aec7d970 k8s: Use versioned struct for ingress discovery
7 years ago
Johannes 'fish' Ziemke 70f3d1e9f9 k8s: Support discovery of ingresses (#3111)
7 years ago
Tobias Schmidt 29fff1eca4 Merge pull request #2966 from alkalinecoffee/consul-node-metadata
7 years ago
Tobias Schmidt d0a02703a2 Merge pull request #3105 from sak0/dev
7 years ago
CuiHaozhi b1c18bf29b discovery openstack: support discovery hosts, add rule option.
7 years ago
Julius Volz aa5cdcb11e Remove extra space in log output
7 years ago
gdmello 35c952e344 Added logging for remote storage adapter (#3106)
7 years ago
Lynn Lin 1bf25dc1b2 fix issues reported by gofmt and spelling typo (#3127)
7 years ago
Ben Kochie 59aca4138b Fix staticcheck issues.
7 years ago
Ben Kochie 0fcfe3209f Add staticcheck to build.
7 years ago
Richard Hartmann 923be6a418 Merge pull request #3113 from prometheus/RichiH-patch-1
7 years ago
Richard Hartmann aa3fb1e7c4 Point help to docs, not main Prometheus website
7 years ago
Tobias Schmidt d6a0f46baf Fix formatting of GitHub issue template
7 years ago
Tobias Schmidt 57a9de4a9a Merge pull request #3076 from Colstuwjx/fix/nil-target-group
7 years ago
Mark Adams 77c816b309 Fix pprof endpoints when -web.route-prefix or -web.external-url is used (#3054)
7 years ago
Colstuwjx 2b49df2c61 Fix target group foreach nil bug, directly return err.
7 years ago
Tobias Schmidt 32a951ec89 Add a big notice header to the github issue template header (#3103)
7 years ago
Brian Brazil 2354c2544b Set timestamp for date functions (#3070)
7 years ago
Max Inden 3101606756 Merge pull request #2711 from mxinden/api-config
7 years ago
Fabian Reinartz 7d8cd4e6bf Merge pull request #3057 from sak0/dev
7 years ago
Max Leonard Inden 1c96fbb992
Expose current Prometheus config via /status/config
7 years ago
Karsten Weiss 5f5d77848e Fix 'predefined escaper "html" disallowed in template' in `/targets` (#3046) (#3050)
7 years ago
CuiHaozhi 31b6f8b04c discovery openstack: handle instances without ip
7 years ago
Björn Rabenstein f1067f4cf9 Merge pull request #3051 from prometheus/beorn7/web
7 years ago
beorn7 6cf62fe8ba Update web/ui/bindata.go
7 years ago
Roman Khavronenko 245b8a0b37 Allow to collapse jobs at `/targets` page (#2628)
7 years ago
Pablo Andres Fuente c79a4db812 Adding tests for util/httputil/client (#3002)
7 years ago
Tobias Schmidt 1ea9ab601e Merge pull request #2997 from emluque/2831-Healthy_Ready_Endpoints
7 years ago
emluque ff54c5c11a 2831 Add Healthy and Ready endpoints
7 years ago
Brian Brazil 4c8173acac Use timestamp of a sample in deriv() to avoid FP issues (#2958)
7 years ago
Yuki Ito 1bf3b91ae0 Make sure that url for remote_read/write is not nil (#3024)
7 years ago
Fabian Reinartz 62047e5c97 Merge pull request #2980 from Gouthamve/contrib.md
7 years ago
Tom Wilkie e1c77cdfd4 Merge pull request #2991 from tomwilkie/2990-remote-config
7 years ago