prometheus

Commit Graph

Author	SHA1	Message	Date
Julius Volz	c187308366	storage: Contextify storage interfaces. This is based on https://github.com/prometheus/prometheus/pull/1997. This adds contexts to the relevant Storage methods and already passes PromQL's new per-query context into the storage's query methods. The immediate motivation supporting multi-tenancy in Frankenstein, but this could also be used by Prometheus's normal local storage to support cancellations and timeouts at some point.	8 years ago
Julius Volz	ed5a0f0abe	promql: Allow per-query contexts. For Weaveworks' Frankenstein, we need to support multitenancy. In Frankenstein, we initially solved this without modifying the promql package at all: we constructed a new promql.Engine for every query and injected a storage implementation into that engine which would be primed to only collect data for a given user. This is problematic to upstream, however. Prometheus assumes that there is only one engine: the query concurrency gate is part of the engine, and the engine contains one central cancellable context to shut down all queries. Also, creating a new engine for every query seems like overkill. Thus, we want to be able to pass per-query contexts into a single engine. This change gets rid of the promql.Engine's built-in base context and allows passing in a per-query context instead. Central cancellation of all queries is still possible by deriving all passed-in contexts from one central one, but this is now the responsibility of the caller. The central query context is now created in main() and passed into the relevant components (web handler / API, rule manager). In a next step, the per-query context would have to be passed to the storage implementation, so that the storage can implement multi-tenancy or other features based on the contextual information.	8 years ago
Julius Volz	c9c2663a54	Merge pull request #2004 from redbaron/no-false-sharing Avoid having contended mutexes on same cacheline	8 years ago
Maxim Ivanov	bdc53098fc	Avoid having contended mutexes on same cacheline CPUs have to serialise write access to a single cache line effectively reducing level of possible parallelism. Placing mutexes on different cache lines avoids this problem. Most gains will be seen on NUMA servers where CPU interconnect traffic is especially expensive Before: go test . -run none -bench BenchmarkFingerprintLocker BenchmarkFingerprintLockerParallel-4 2000000 932 ns/op BenchmarkFingerprintLockerSerial-4 30000000 49.6 ns/op After: go test . -run none -bench BenchmarkFingerprintLocker BenchmarkFingerprintLockerParallel-4 3000000 569 ns/op BenchmarkFingerprintLockerSerial-4 30000000 51.0 ns/op	8 years ago
Julius Volz	5f5a78e807	Merge pull request #1974 from prometheus/disable-local-storage Allow disabling local storage.	8 years ago
Julius Volz	06199268b5	Merge pull request #2003 from mattbostock/remove_json_from_accept Scrape: Remove JSON from Accept request header	8 years ago
Matt Bostock	4fc619b605	Scrape: Remove JSON from Accept request header JSON is no longer supported as an exposition format [1] [2] [3]. Remove it from the `Accept` header added to requests when scraping targets. [1]: https://github.com/prometheus/prometheus/blob/master/CHANGELOG.md#100--2016-07-18 [2]: https://prometheus.io/docs/instrumenting/exposition_formats/#historical-versions [3]: https://docs.google.com/document/d/1ZjyKiKxZV83VI9ZKAXRGKaUKK2BIWCT7oiGBKDBpjEY/edit?usp=sharing	8 years ago
Julius Volz	a9b96be3fd	Merge pull request #2002 from grandbora/graphPageUrlClientSideMigration Graph page url client side migration	8 years ago
Bora Tunca	2e9de70267	generate assets	8 years ago
Bora Tunca	44377dc458	Add backward compatibility to old query format	8 years ago
Brian Brazil	5ac89fbc1f	Merge pull request #1985 from tommyulfsparre/resync Resync state after ZooKeeper failure	8 years ago
Tobias Schmidt	874cb44bb6	Merge pull request #1996 from ton31337/Fix/allow_numbers_as_first_letter Allow number to be the first letter as well for `job_name`	8 years ago
beorn7	1f2785ebb7	Merge branch 'release-1.1'	8 years ago
Björn Rabenstein	ac374aa674	Merge pull request #2001 from prometheus/beorn7/release Cut v1.1.3	8 years ago
beorn7	f4656acd1f	Cut v1.1.3	8 years ago
Donatas Abraitis	1aa8898b66	Allow number to be the first letter as well for `job_name`	8 years ago
Tobias Schmidt	304f971e3e	Merge pull request #1769 from gottwald/gce-discovery GCE discovery	8 years ago
Ingo Gottwald	3b546d061f	Add support for GCE discovery	8 years ago
Ingo Gottwald	fefcd6eef2	Add deps for google cloud support	8 years ago
Tobias Schmidt	4b850970a2	Merge pull request #1999 from prometheus/print-promu Add promu installation logging to Makefile	8 years ago
Julius Volz	099adab253	Merge pull request #1987 from tomwilkie/1982-die-grpc-die Switch back to protos over HTTP, instead of grpc.	8 years ago
Julius Volz	92d60ba4c0	Add promu installation logging to Makefile Due to bad GitHub connectivity, "make" frequently got stuck at the promu step for me, and I was thinking that "format" was taking a long time because the promu step wasn't logged. All other Makefile targets have log statements...	8 years ago
Tom Wilkie	d83879210c	Switch back to protos over HTTP, instead of GRPC. My aim is to support the new grpc generic write path in Frankenstein. On the surface this seems easy - however I've hit a number of problems that make me think it might be better to not use grpc just yet. The explanation of the problems requires a little background. At weave, traffic to frankenstein need to go through a couple of services first, for SSL and to be authenticated. So traffic goes: internet -> frontend -> authfe -> frankenstein - The frontend is Nginx, and adds/removes SSL. Its done this way for legacy reasons, so the certs can be managed in one place, although eventually we imagine we'll merge it with authfe. All traffic from frontend is sent to authfe. - Authfe checks the auth tokens / cookie etc and then picks the service to forward the RPC to. - Frankenstein accepts the reads and does the right thing with them. First problem I hit was Nginx won't proxy http2 requests - it can accept them, but all calls downstream are http1 (see https://trac.nginx.org/nginx/ticket/923). This wasn't such a big deal, so it now looks like: internet --(grpc/http2)--> frontend --(grpc/http1)--> authfe --(grpc/http1)--> frankenstein Next problem was golang grpc server won't accept http1 requests (see https://groups.google.com/forum/#!topic/grpc-io/JnjCYGPMUms). It is possible to link a grpc server in with a normal go http mux, as long as the mux server is serving over SSL, as the golang http client & server won't do http2 over anything other than an SSL connection. This would require making all our service to service comms SSL. So I had a go a writing a grpc http1 server, and got pretty far. But is was a bit of a mess. So finally I thought I'd make a separate grpc frontend for this, running in parallel with the frontend/authfe combo on a different port - and first up I'd need a grpc reverse proxy. Ideally we'd have some nice, generic reverse proxy that only knew about a map from service names -> downstream service, and didn't need to decode & re-encode every request as it went through. It seems like this can't be done with golang's grpc library - see https://github.com/mwitkow/grpc-proxy/issues/1. And then I was surprised to find you can't do grpc from browsers! See http://www.grpc.io/faq/ - not important to us, but I'm starting to question why we decided to use grpc in the first place? It would seem we could have most of the benefits of grpc with protos over HTTP, and this wouldn't preclude moving to grpc when its a bit more mature? In fact, the grcp FAQ even admits as much: > Why is gRPC better than any binary blob over HTTP/2? > This is largely what gRPC is on the wire.	8 years ago
Tom Wilkie	e0989fde89	Remove grpc vendoring.	8 years ago
Tom Wilkie	bcd43e82c6	Add go_import_path to travis so it works on a fork. (#1995 )	8 years ago
Tobias Schmidt	3eef95962b	Merge pull request #1965 from prometheus/beorn7/federation federation: Collapse time series of the same name	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
Fabian Reinartz	737ae60cea	Merge pull request #1993 from prometheus/grobie/include-go-report Link to goreport from README	8 years ago
Fabian Reinartz	4f7e6e8bf0	Merge pull request #1994 from prometheus/grobie/fix-small-issues Fix low hanging code issues	8 years ago
Tobias Schmidt	29ced0090f	Fix common english misspellings	8 years ago
Tobias Schmidt	e2c12dcdb5	Add missing error check in persistence test	8 years ago
Tobias Schmidt	27074863b4	Print url.URLs correctly in tests	8 years ago
Tobias Schmidt	8f3b62bfe4	Simplify struct initialization	8 years ago
Tobias Schmidt	b41a240c36	Link to goreport from README	8 years ago
beorn7	39c4915401	federation: Collapse time series of the same name This will avoid duplicate MetricFamilies, thereby shrinking the size of the federation payload and also creating legal text format. Also, add unit tests for federation. They were also needed for the previous state of the code, but were missing.	8 years ago
Julius Volz	b24e5d63bc	Add noop local storage engine. This adds a flag -storage.local.engine which allows turning off local storage in Prometheus. Instead of adding if-conditions and nil checks to all parts of Prometheus that deal with Prometheus's local storage (including the web interface), disabling local storage simply means replacing the normal local storage with a noop version that throws samples away and returns empty query results. We also don't add the noop storage to the fanout appender to decrease internal overhead. Instead of returning empty results, an alternate behavior could be to return errors on any query that point out that the local storage is disabled. Not sure which one is more preferable, so I went with the empty result option for now.	8 years ago
Tobias Schmidt	03855679a1	Merge pull request #1984 from mattbostock/1983_add_minute PromQL: Add minute() function	8 years ago
Matt Bostock	a0201036fa	PromQL: Add tests for time/date funcs with arg Add tests for the date and time functions where an argument is specified. Suggested by @grobie: https://github.com/prometheus/prometheus/pull/1984#issuecomment-246508286 `1136239445` is the reference time used by Go: https://golang.org/src/time/format.go	8 years ago
Matt Bostock	9628eb5998	PromQL: Add minute() function Returns the minutes from the current time in UTC. Related to the `hour()` function. Fixes #1983.	8 years ago
Björn Rabenstein	3fd992d2d1	Merge pull request #1979 from prometheus/fabxc-patch-1-1 storage: fix Querier interface documentation	8 years ago
Fabian Reinartz	22296dcb85	storage: clarify sample/matcher relation in docs	8 years ago
Fabian Reinartz	cc6f988a5e	storage: fix Querier interface documentation	8 years ago
Julius Volz	815cb57af3	Merge pull request #1975 from prometheus/storage-test storage: fix struct alignment issue in test	8 years ago
Fabian Reinartz	7bd7e63f97	storage: fix struct alignment issue in test The uint64 `numCalls` ends up being not word-aligned on certain architectures, which makes atomic reads/writes panic.	8 years ago
Björn Rabenstein	7e28b4509d	Merge pull request #1960 from nghialv/master Fix typo	8 years ago
Steve Durrheimer	1e26b96baa	Merge pull request #1973 from prometheus/release-1.1 CircleCI improvement from release-1.1	8 years ago
Steve Durrheimer	07babe586e	Merge pull request #1969 from prometheus/sdurrheimer-circle-use-base-image-for-tests Use golang-builder base image for tests in CircleCI	8 years ago
Steve Durrheimer	0ebdd9c3e9	Use golang-builder base image for tests in CircleCI	8 years ago
Ulfsparre, Tommy	3730255392	remove deleted zookeeper nodes	8 years ago

1 2 3 4 5 ...

3318 Commits (dc0ad8ee341fd7533e0fca6888fa862be33ffc26) All Branches Search

3318 Commits (dc0ad8ee341fd7533e0fca6888fa862be33ffc26)

All Branches