mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-08-19 05:31:01 +02:00
Code Issues Projects Releases Wiki Activity
13,248 Commits 289 Branches 479 Tags
Commit Graph

383 Commits

Author SHA1 Message Date
Krasi Georgiev
97f0461e29 refactor the config reloading execution 2018-01-17 12:02:13 +00:00
Krasi Georgiev
5260c650ec use the config hash for the map lookup 2018-01-16 11:10:54 +00:00
Krasi Georgiev
8369826808 comment to rethink the map reference for the notifier discovery 2018-01-16 09:47:53 +00:00
Krasi Georgiev
d12e6f29fc discovery manager ApplyConfig now takes a direct ServiceDiscoveryConfig so that it can be used for the notify manager 
reimplement the service discovery for the notify manager

Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2018-01-15 13:39:44 +00:00
Brian Brazil
ecc24b554d
Hide block duration flags. (#3618) 
Users are starting to use these mistakenly thinking they'll help
with issues, and thus causing some confusion.
Thus hide them and make it clear that they're only there for testing
reasons.
 2017-12-24 12:13:48 +00:00
Krasi Georgiev
587dec9eb9 rebased and resolved conflicts with the new Discovery GUI page 
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
 2017-12-18 20:10:03 +00:00
Krasi Georgiev
1ec76d1950 rearange the contexts variables and logic 
split the groupsMerge function to set and get
other small nits
 2017-12-18 17:23:47 +00:00
Krasi Georgiev
6ff1d5c51e add the scrape manager config reloader 
handle errors with invalid scrape config
 2017-12-18 17:23:47 +00:00
Krasi Georgiev
b0d4f6ee08 resolved merge confilc in main.go 2017-12-18 17:23:46 +00:00
Krasi Georgiev
c5cb0d2910 simplify naming and API. 2017-12-18 17:22:50 +00:00
Krasi Georgiev
9c61f0e8a0 scrape pool doesn't rely on context as Stop() needs to be blocking to prevent Scrape loops trying to write to a closed TSDB storage. 2017-12-18 17:22:49 +00:00
Krasi Georgiev
e405e2f1ea refactored discovery 2017-12-18 17:22:49 +00:00
pasquier-s
2440696961 Log file descriptor limits at startup (#3567) 
Fixes #3564
 2017-12-11 13:01:53 +00:00
Brian Brazil
b97f4cf48c Add metrics for rule group interval and last duration. 2017-12-04 11:44:38 +00:00
Goutham Veeramachaneni
823b7f90b3
Use the files globbed files and not the files in cfg 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-11-30 17:08:34 +05:30
Fabian Reinartz
62461379b7 rules: decouple notifier packages 
The dependency on the notifier packages caused a transitive dependency
on discovery and with that all client libraries our service discovery
uses.
 2017-11-27 16:38:14 +01:00
Fabian Reinartz
4d964a0a0d rules: make glob expansion a concern of main 2017-11-24 08:22:57 +01:00
Fabian Reinartz
bd9f7460eb rules: remove config package dependency 2017-11-24 07:57:54 +01:00
Fabian Reinartz
2d0e3746ac rules: remove dependency on promql.Engine 2017-11-24 07:57:54 +01:00
Krasi Georgiev
e2f4850fea Refactor main.go with oklog/pkg/group actors pattern 2017-11-11 12:33:15 +00:00
Thibault Chataigner
fc4406201e Tsdb StartTime : Use a simplier way to compute StartTime 2017-10-25 17:41:00 +02:00
Julius Volz
099df0c5f0 Migrate "golang.org/x/net/context" -> "context" (#3333) 
In some places, where ctxhttp or gRPC are concerned, we still need to use the
old contexts.
 2017-10-24 21:21:42 -07:00
Julius Volz
9d43176ab3 Remove unused printVersion variable (#3335) 
Kingpin now automatically does this via --version.
 2017-10-23 08:50:13 +01:00
Julius Volz
82c5b98496 Capitalize Prometheus in startup message (#3332) 
Hey, branding :)
 2017-10-23 08:49:28 +01:00
Thibault Chataigner
bf4a279a91 Remote storage reads based on oldest timestamp in primary storage (#3129) 
Currently all read queries are simply pushed to remote read clients.
This is fine, except for remote storage for wich it unefficient and
make query slower even if remote read is unnecessary.
So we need instead to compare the oldest timestamp in primary/local
storage with the query range lower boundary. If the oldest timestamp
is older than the mint parameter, then there is no need for remote read.
This is an optionnal behavior per remote read client.

Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com>
 2017-10-18 12:08:14 +01:00
Julius Volz
5f715f5733 Fix typo in flag description (#3302) 2017-10-16 23:00:05 +01:00
Mathieu Pasquet
38afa507bb Provide better errors messages in commandline 
Instead or only printing the help message, which is not always helpful.
For example, when upgrading from prometheus v1, the retention time value
format has changed and now only accepts one unit (e.g. "15d") where it
previously allowed more complex strings (e.g. "360h0m0s").

This commit provides the error message as an explanation for the parsing
failure.
 2017-10-09 16:25:50 +02:00
Marc Sluiter
6a633eece1 Added go-conntrack for monitoring http connections (#3241) 
Added metrics for in- and outgoing traffic with go-conntrack.
 2017-10-06 11:22:19 +01:00
Fabian Reinartz
2d0b8e8b94 Merge branch 'master' into dev-2.0 2017-10-05 13:09:18 +02:00
Fabian Reinartz
7b02bfee0a web: start web handler while TSDB is starting up 2017-09-20 15:03:19 +02:00
Goutham Veeramachaneni
f5aed810f9 logging: Port to common/promlog 
Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-09-15 12:40:50 +05:30
Fabian Reinartz
d21f149745 *: migrate to go-kit/log 2017-09-08 22:01:51 +05:30
Fabian Reinartz
c70379e1c7 Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0 2017-09-04 13:10:50 +02:00
Fabian Reinartz
fffe51fb03 Add mutex and block profiling via envvar 2017-09-04 13:10:32 +02:00
Ben Kochie
59aca4138b Fix staticcheck issues. 2017-08-28 17:29:01 +02:00
Matt Bostock
64973f5c65 cmd/prometheus: Fix capitalisation in log line (#3123) 
Change 'Ready' to 'ready'.
 2017-08-28 11:03:25 +01:00
Mark Adams
77c816b309 Fix pprof endpoints when -web.route-prefix or -web.external-url is used (#3054) 
Whenever a route prefix is applied, the router prepends the prefix to
the URL path on the request. For most handlers, this is not an issue
because the request's path is only used for routing and is not actually
needed by the handler itself. However, Prometheus delegates the handling
of the /debug/* endpoints to the http.DefaultServeMux which has it's own
routing logic that depends on the url.Path. As a result, whenever a
prefix is applied, the prefixed URL is passed to the DefaultServeMux
which has no awareness of the prefix and returns a 404.

This change fixes the issue by creating a new serveDebug handler which
routes requests /debug/* requests to appropriate net/http/pprof handler
and removing the net/http/pprof import in cmd/prometheus since it is no
longer necessary.

Fixes #2183.
 2017-08-23 00:00:56 +01:00
Fabian Reinartz
25f3e1c424 Merge branch 'master' into mergemaster 2017-08-10 17:04:25 +02:00
KalivarapuReshma
686050d816 Change -config.file to --config.file in Readme and error message 2017-08-08 12:49:35 +05:30
emluque
ff54c5c11a 2831 Add Healthy and Ready endpoints 2017-08-07 17:34:04 -03:00
Fabian Reinartz
4d3d8ee229 Merge pull request #2850 from tomwilkie/dev-2.0-remote 
Remote APIs for v2
 2017-08-03 13:39:09 +02:00
Julius Volz
cc50aa2c6b main: Consistently end flag descriptions with periods. (#2977) 2017-07-20 23:48:35 +02:00
Tom Wilkie
2dda5775e3 Initial port of remote storage to v2. 2017-07-12 12:27:57 +01:00
Fabian Reinartz
32226e30f5 Guard reload and quit endpoints by flag 2017-07-11 14:25:07 +02:00
Fabian Reinartz
45ac064669 web: disable Amin APIs by default 2017-07-10 09:29:41 +02:00
Fabian Reinartz
ccf9e62972 *: add admin grpc API 2017-07-10 09:14:14 +02:00
Fabian Reinartz
be32afd6df cmd/prometheus: add back tsdb.no-lockfile flag 2017-06-22 15:02:10 +02:00
Fabian Reinartz
867b8d108f cmd/prometheus: cleanup 2017-06-21 11:38:13 +02:00
Fabian Reinartz
34ab7a885a cmd/prometheus: switch to kingpin 2017-06-20 17:38:01 +02:00
Goutham Veeramachaneni
67dc73fd59
Flag changes for 2.0 
Fixes: prometheus/prometheus#2087

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
 2017-06-16 20:21:41 +05:30