702 Commits (f1db699dffcdba6b27d81f9089d627635b888015)

Author	SHA1	Message	Date
Julius Volz	8022fc1aa3	Fix display of raw target labels (again) (#3437) ... I already fixed this once in 7be94d6643, but it seems it got broken again when merging other fixes from 1.x into 2.0.	7 years ago
Tom Wilkie	746752b946	Merge external labels in order.	7 years ago
Tom Wilkie	b22485bef0	Remove spurious test import.	7 years ago
Tom Wilkie	ee011d906d	Port remote read server to 2.0.	7 years ago
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.	7 years ago
Takashi Kokubun	bd52950ce8	Fix invalid syntax in graph.css (#3309)	7 years ago
Fabian Reinartz	53875da7fb	Merge pull request #3286 from prometheus/dev-2.0 ... Dev 2.0	7 years ago
BasPH	a91d3bcb83	Add UI warning for time drift >30 seconds (#3276) ... * Add UI warning for time drift >30 seconds * Yellow time drift warning & better warning message * Set warning threshold to 30 sec * Include changed assets	7 years ago
Fabian Reinartz	269b5cf936	Merge pull request #3245 from jlevesy/use-require-web ... Imports benbjohnson/testing and use it in web package	7 years ago
Brian Brazil	8740fcc657	Use panic in goroutine in test, not t.Fatalf	7 years ago
Fabian Reinartz	abf7c975c9	Merge branch 'master' into dev-2.0	7 years ago
beorn7	f20e6a0ae4	Only respond to API requests once the server is ready	7 years ago
Marc Sluiter	6a633eece1	Added go-conntrack for monitoring http connections (#3241) ... Added metrics for in- and outgoing traffic with go-conntrack.	7 years ago
Julien Levesy	26a067b23d	use testutil assertion helpers in web package testsuite	7 years ago
Fabian Reinartz	7a3261aa99	Merge pull request #3240 from Gouthamve/fix-admin-api ... web/api: Fix typo which broke the 2.0 admin APIs.	7 years ago
Fabian Reinartz	2d0b8e8b94	Merge branch 'master' into dev-2.0	7 years ago
Goutham Veeramachaneni	35aaa2002d	web/api: Add tests for v2 admin API ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	7 years ago
Julius Volz	f7e8348a88	Re-add contexts to storage.Storage.Querier() (#3230) ... * Re-add contexts to storage.Storage.Querier() These are needed when replacing the storage by a multi-tenant implementation where the tenant is stored in the context. The 1.x query interfaces already had contexts, but they got lost in 2.x. * Convert promql.Engine to use native contexts	7 years ago
Goutham Veeramachaneni	d70f850a18	web/api: Fix typo which broke the 2.0 admin APIs. ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	7 years ago
Tom Wilkie	639d5c6f98	Merge pull request #3023 from tomwilkie/2945-remote-read-server ... Implement remote read server in Prometheus.	7 years ago
beorn7	16c95ae8e7	Merge branch 'release-1.7'	7 years ago
Fabian Reinartz	7b02bfee0a	web: start web handler while TSDB is starting up	7 years ago
beorn7	dd381356a5	Tweak floating point number rendering	7 years ago
beorn7	61b6311504	Merge branch 'fix_ui_graph_decimal_axis' of git://github.com/yamatoya/prometheus into yamatoya-fix_ui_graph_decimal_axis	7 years ago
Takahito Yamatoya	b1151bdabc	ui changed, limit the number of digits for the larger units is 5	7 years ago
Krasi Georgiev	b4b0999e7f	add prefix to the api when prometheus started with custom web.external-url ... Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>	7 years ago
Takahito Yamatoya	1eac566d09	add ; , and change from B to G, and change from K to k, and add all the prefixes	7 years ago
Tom Wilkie	bbc9671d50	Get profile handlers working again after #3054 and #3146. ... Ensures the pprod endpoints deal with path-prefixes correctly; adds a test so we don't break it again.	7 years ago
beorn7	e7aab2791a	Forward-merge bug fixes frem branch 'release-1.7'	7 years ago
beorn7	7a8e340c1a	Merge branch 'fix_web_ui_utc' of git://github.com/yamatoya/prometheus into yamatoya-fix_web_ui_utc	7 years ago
Takahito Yamatoya	5d707d3aa3	#2439 library version update JQuery / JQuery.Selection / JQuery.hotkey (#3183)	7 years ago
Takahito Yamatoya	ff038a4a39	bug fix	7 years ago
Takahito Yamatoya	7a3c348f83	fix decimal y-axis	7 years ago
Tom Wilkie	758d64ffd9	s/EncodReadResponse/EncodeReadResponse/	7 years ago
Tom Wilkie	febed48703	Implement remote read server in Prometheus.	7 years ago
Takahito Yamatoya	738a51bea6	#2371 fix to display utc date at datetime picker	7 years ago
Goutham Veeramachaneni	3f0267c548	Merge branch 'dev-2.0' into go-kit/log ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	7 years ago
beorn7	84211bd2df	Foward-merge bug fixes and cherry-picks from 'release-1.7'	7 years ago
beorn7	a3fd7dd335	Backport the templating fix from master ... The original fix is in commit 5f5d77848e	7 years ago
Fabian Reinartz	e746282772	Merge branch 'master' into dev-2.0	7 years ago
Fabian Reinartz	d21f149745	*: migrate to go-kit/log	7 years ago
Fabian Reinartz	27bdddbf51	web: fix profile paths	7 years ago
Fabian Reinartz	87918f3097	Merge branch 'master' into dev-2.0	7 years ago
Matt Bostock	d31c068ae4	api.go: Fix typo in comment (#3122)	7 years ago
Richard Hartmann	aa3fb1e7c4	Point help to docs, not main Prometheus website ... No matter how we refactor docs, `/docs/` will stay the prefix, so there's not long-term risk in changing this. One we version docs, we should probably try and keep link & version in sync.	7 years ago
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.	7 years ago
maximecharron	41884f0283	Fix double redirect if there is a route-prefix (#3091)	7 years ago
Max Inden	3101606756	Merge pull request #2711 from mxinden/api-config ... Expose current Prometheus config via /status/config	7 years ago
Max Leonard Inden	1c96fbb992	Expose current Prometheus config via /status/config ... This PR adds the `/status/config` endpoint which exposes the currently loaded Prometheus config. This is the same config that is displayed on `/config` in the UI in YAML format. The response payload looks like such: ``` { "status": "success", "data": { "yaml": <CONFIG> } } ```	7 years ago
Karsten Weiss	5f5d77848e	Fix 'predefined escaper "html" disallowed in template' in `/targets` (#3046) (#3050) ... Issue #3046 is triggered by html/template changes in go1.9. See https://tip.golang.org/pkg/html/template. Quote: // To ease migration to Go 1.9 and beyond, "html" and "urlquery" will // continue to be allowed as the last command in a pipeline. However, if the // pipeline occurs in an unquoted attribute value context, "html" is // disallowed. Avoid using "html" and "urlquery" entirely in new templates. The commit also includes a trivial whitespace fix.	7 years ago
Fabian Reinartz	921c6ebb3b	Merge branch 'dev-2.0' into mergemaster	7 years ago
Fabian Reinartz	25f3e1c424	Merge branch 'master' into mergemaster	7 years ago
Fabian Reinartz	0af43695de	web: log error missages on serving	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
emluque	ff54c5c11a	2831 Add Healthy and Ready endpoints	7 years ago
beorn7	3bb0667607	Merge branch 'release-1.7'	7 years ago
Martín Ferrari	64cfe2e7f5	Add PATH_PREFIX to redirectToMigratedURL ... Old grafana versions use this format, and it breaks with prometheus instances not mounted in the root directory.	7 years ago
Fabian Reinartz	dba7586671	Merge branch 'master' into dev-2.0	7 years ago
Fabian Reinartz	16464c3a33	Merge pull request #2910 from prometheus/adminapi ... Admin API	7 years ago
Fabian Reinartz	32226e30f5	Guard reload and quit endpoints by flag	7 years ago
Alexey Palazhchenko	b6f89a1982	Parse custom step parameter correctly. (#2928) ... Backport of 6a767b736b. Refs #2827, #2861.	7 years ago
Fabian Reinartz	45ac064669	web: disable Amin APIs by default	7 years ago
Fabian Reinartz	ccf9e62972	*: add admin grpc API	7 years ago
Julius Volz	13006feb1e	Fix alert label display in /alerts UI	8 years ago
Goutham Veeramachaneni	e1fc9dc78d	Move /rules to new format (#2901) ... Fixes #2891 Signed-off-by: Goutham Veeramachaneni <goutham@boomerangcommerce.com>	8 years ago
Alin Sinpalean	38de290d5f	Console graph color scheme support (#2900) ... Add a colorScheme parameter to PromConsole.Graph, to allow using custom colors in console graphs.	8 years ago
Fabian Reinartz	ca2b68889b	Merge branch 'master' into dev-2.0	8 years ago
Julius Volz	7be94d6643	Fix display of before-relabeling labels	8 years ago
Alexey Palazhchenko	6a767b736b	Parse custom step parameter correctly. (#2861) ... Fixes #2827.	8 years ago
Goutham Veeramachaneni	37e7b69f56	Merge remote-tracking branch 'upstream/dev-2.0' into rulegroups ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	67dc73fd59	Flag changes for 2.0 ... Fixes: prometheus/prometheus#2087 Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	d407bd150c	Consolidate the duration params in CLI ... * All CLI params moved to model.Duration Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Goutham Veeramachaneni	5ff283a7b7	Reflect the grouping in the UI ... Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>	8 years ago
Frederic Branczyk	9063f8dedd	web: fix double prefix	8 years ago
Fabian Reinartz	669075c6b9	Merge branch 'master' into dev-2.0	8 years ago
Brian Brazil	d66799d7f3	Show gaps in graphs. (#2766) ... Fixes #345	8 years ago
Fabian Reinartz	4c31061251	Merge branch 'master' into dev-2.0	8 years ago
Brian Brazil	e5f94145b8	Drop series for federation if latest sample is stale.	8 years ago
Brian Brazil	220e78b9c3	Consider a series stale after 4.1 intervals with no data. ... To cover the cases where stale markers may not be available, we need to infer the interval and mark series stale based on that. As we're lacking stale markers this is less accurate, however it should be good enough for these cases. We need 4 intervals as if say we had data at t=0 and t=10, coming via federation. The next data point should be at t=20 however it could take up to t=30 for it actually to be ingested, t=40 for it to be scraped via federation and t=50 for it to be ingested. We then add 10% on to that for slack, as we do elsewhere.	8 years ago
Brian Brazil	c02c25d5ba	Allow peeking back further in buffer.	8 years ago
conorbroderick	9c953064c3	check if result is a scalar in order to display correct number of returned time series	8 years ago
Frederic Branczyk	ad22606a3d	web: prefix redirect with ExternalURL path	8 years ago
Frederic Branczyk	45df5c2daf	Merge branch 'release-1.6'	8 years ago
conorbroderick	9287a01bbf	Fixed fixed yaxis of stacked graph being cut off	8 years ago
Fabian Reinartz	06c2b76cd4	Merge branch 'master' into uptsdb	8 years ago
Julius Volz	ac203ef0ee	Add externalURL template function (#2716) ... This allows users to e.g. add links back to the generating Prometheus right in their alert templates.	8 years ago
Fabian Reinartz	6e804b3497	Merge branch 'master' into dev-2.0	8 years ago
Fabian Reinartz	9a9211845e	ui: fix alert template	8 years ago
Tom Wilkie	4d9b917d11	Instrument Prometheus with OpenTracing (#2554) ... * Use request.Context() instead of a global map of contexts. * Add some basic opentracing instrumentation on the query path. * Remove tracehandler endpoint.	8 years ago
Fabian Reinartz	73b8ff0ddc	Merge branch 'master' into dev-2.0	8 years ago
David Symonds	04ad889751	Preserve Alertmanager URLs as *url.URL. ... Render a nicer link in the web UI.	8 years ago
Conor Broderick	9eb1a5d6bf	Handle invalid query in graph UI (#2652)	8 years ago
Conor Broderick	ee62807b62	Added min/max to graph to accomodate for constant time series (#2612) ... Added min/max to graph to accommodate constant time series	8 years ago
Conor Broderick	c72692fd75	Fixed issue of partially hidden y-axis values on graph (#2589)	8 years ago
Julius Volz	beeb0b55c0	Merge pull request #2572 from weaveworks/2571-propagate-api-error ... Add promql.ErrStorage, which the API propagates as a 500.	8 years ago
Tom Wilkie	f0e8a5f37c	Add promql.ErrStorage, which is interpreted by the API as a 500.	8 years ago
Brian Brazil	26bedc9e00	Revert use of buildVersion in console templates. (#2579) ... This function isn't available in console templates, so go back to pre-#2468 state to get things working again.	8 years ago
Alexey Palazhchenko	17f15d024a	Small fixes. (#2578) ... Fix typos. Simplify with gofmt -s	8 years ago
Fabian Reinartz	8c768f2ca3	web: Fix federation for instance label	8 years ago
Fabian Reinartz	8ffc851147	Merge branch 'master' into dev-2.0	8 years ago
Fabian Reinartz	bbcf20ba01	web: deduplicate series in federation	8 years ago
Fabian Reinartz	f56644e3ae	api/v1: deduplicate selected series	8 years ago
Conor Broderick	dafae52efa	Display total number of returned elements on console (#2532) ... Display total number of returned elements on console	8 years ago
Julius Volz	947c83be3b	Sort targets by instance within a job ... Fixes https://github.com/prometheus/prometheus/issues/2536	8 years ago
Brian Brazil	8cd5aff8fe	Send instance="" with federation if instance not set. ... This is needed for federating non-instance level metrics, so they don't end up with the instance label of the prometheus target. Also sort external labels, so label output order is consistent.	8 years ago
Brian Brazil	d42e01b07c	Sort labelnames for federation. ... This makes unittests with multiple labels possible, and may be needed for performance with the new ingestion text parser.	8 years ago
Brian Brazil	dbb65846f1	Add unittest for federation external_labels behaviour	8 years ago
Fabian Reinartz	397f001ac5	Merge branch 'master' into dev-2.0	8 years ago
Julius Volz	107c33545b	Don't truncate build version	8 years ago
Fabian Reinartz	c389193b37	Merge branch 'master' into dev-2.0	8 years ago
Bplotka	1823ae8bc4	Fixed int64 overflow for timestamp in v1/api parseDuration and parseTime (#2501) ... * Fixed int64 overflow for timestamp in v1/api parseDuration and parseTime This led to unexpected results on wrong query with "(...)&start=148966367200.372&end=1489667272.372" That query is wrong because of `start > end` but actually internal int64 overflow caused start to be something around MinInt64 (huge negative value) and was passing validation. BTW: Not sure if negative timestamp makes sense even.. But model.Earliest is actually MinInt64, can someone explain me why? Signed-off-by: Bartek Plotka <bwplotka@gmail.com> * Added missing trailing periods on comments. Signed-off-by: Bartek Plotka <bwplotka@gmail.com> * MOved to only `<` and `>`. Removed equal. Signed-off-by: Bartek Plotka <bwplotka@gmail.com>	8 years ago
Fabian Reinartz	de1e4322d7	Merge pull request #2474 from Gouthamve/custom-timeouts-1399 ... Support Custom Timeout for Queries	8 years ago
Erdem Agaoglu	90625b0400	Use revision as cachebuster	8 years ago
Goutham Veeramachaneni	4b0270290b	Fix comments to match convention	8 years ago
Goutham Veeramachaneni	c6b329c55b	Support Custom Timeouts for Queries	8 years ago
Goutham Veeramachaneni	6634984a38	Comments and Typo Fixes	8 years ago
Erdem Agaoglu	241da87f7f	Adding version to names of static files ... to prevent browsers using old files in local caches after an upgrade.	8 years ago
Fabian Reinartz	9304179ef7	Merge branch 'master' into dev-2.0	8 years ago
Derek Marcotte	0a7fb56b16	Expose PromConsole.Graph.buildQueryUrl, refactor dispatch to use (#2461) ... Expose buildQueryUrl, refactor dispatch to use buildQueryUrl will allow users to execute queries over the range of an existing graph. This will be helpful to select data series they wish to annotate the graph with, for example.	8 years ago
Julius Volz	7e14533b32	Merge pull request #2396 from lightpriest/fuzzy-fix-lookup ... Fix fuzzy search lookup issues	8 years ago
Derek Marcotte	74a3b1051a	Add rickshawGraph proerty to the Graph object. (#2438) ... Add rickshawGraph property to the Graph object. This allows further changes to be made to the graph, for example, annotations.	8 years ago
Or Cohen	93d20d2d2b	Improve fuzzy search ... The fuzzy library didn't try to find a "best match", but settled on the first fuzzy match that exists. This patch includes a modified version of the fuzzy library, which recursivley tries on the rest of the search string to find a better match. If found, returns that one. Another small modification is that if a pattern fully matches, it skips the lookup entirley and returns the highest score possible for that match.	8 years ago
Or Cohen	81d37a04aa	Fix autocomplete misses certain queries ... For some of the queries, the fuzzy lookup was not filtering properly. The problem is due to the "replace" beind made on the query itself. It accidently removes only the first underscore. This patch changes it so that it removes all of the whitespaces, letting the fuzzy algorithm do its magic, also fixing this problem. Originally, the underscore were replaced by a space for this specific reason, to let the user type a space and have the lookup treat it as the word break. Fixes #2380	8 years ago
Fabian Reinartz	87bea50b85	web: fix /targets for new label types	8 years ago
Fabian Reinartz	1d3cdd0d67	Merge branch 'master' into dev-2.0-rebase	8 years ago
Fabian Reinartz	d80a3de235	pkg/textparse: add documentation	8 years ago
Fabian Reinartz	157e698958	web/api: fix min/max timestamps to valid range	8 years ago
Frederic Branczyk	bd92571bdd	web/api: make target and alertmanager api responses consistent	8 years ago
Frederic Branczyk	389c6d0043	web/api: add alertmanager api	8 years ago
beorn7	767c0709b1	Retrieval: Avoid copying Target ... retreival.Target contains a mutex. It was copied in the Targets() call. This potentially can wreak a lot of havoc. It might even have caused the issues reported as #2266 and #2262 .	8 years ago
Fabian Reinartz	c9f4aea8e2	Merge pull request #2305 from alicebob/favicon ... Add a favicon to the web GUI	8 years ago
Fabian Reinartz	bc20d93f0a	storage: rename iterator value getters to At()	8 years ago
Fabian Reinartz	61bd698143	web: implement federation for new storage	8 years ago
Fabian Reinartz	28f547bcc7	api/v1: fix tests, restore series queries	8 years ago
Fabian Reinartz	f8fc1f5bb2	*: migrate ingestion to new batch Appender	8 years ago
Ed Schouten	b3a39ccd8a	Use lexicographic order to sort alerts by name. ... Right now the /alerts page of Prometheus sorts alerts by severity (firing, pending, inactive). Once multiple alerts have the same severity, their order seems to correlate to how they are placed in the configuration files, but not always. Looking at the code, we make use of sort.Sort(), which is documented not to provide a stable sort. The Less() function also only takes the alert state into account. This change extends the Less() function to provide a lexicographic order on both the alert state and the name. This means I can finally find the alerts I'm looking for without using my browser's search feature.	8 years ago
Harmen	135d32ea22	make assets	8 years ago
Harmen	dfa4f79bcd	add favicon	8 years ago
Fabian Reinartz	5817cb5bde	*: migrate from model.* to promql.* types	8 years ago
Brian Brazil	bed4635802	Use irate consistently in console template examples. (#2296) ... I must have forgotten my 'g' when switching these.	8 years ago
Brian Brazil	2e3b42ad6c	Correctly handle the end time being 0 in the URL. (#2290)	8 years ago
Fabian Reinartz	9ecea36ef9	Merge pull request #2259 from prometheus/federationerr ... web: don't return federation errors over HTTP	8 years ago
Fabian Reinartz	cef2e04aa3	web: add error counter for federation responses	8 years ago
Fabian Reinartz	0ea0a19848	Merge pull request #2240 from agaoglu/read-timeout ... Set read-timeout for http.Server	8 years ago
Fabian Reinartz	9d68e81b32	web: don't return federation errors over HTTP ... We are writing federation responses streaming. So after the first byte we wrote, the status header is fixed. We cannot return an HTTP error for intermediate error but should just abort and log instead.	8 years ago
Erdem Agaoglu	e487477a17	LimitListener to limit max number of connections ... This also drops tcp keep-alive in ListenAndServe but it's no longer necessary since we now close idle connections long before that.	8 years ago
Morten Siebuhr	c5b17263a6	web: Display current working directory on status-page	8 years ago
Frederic Branczyk	33b583d50e	web/api: add targets endpoint	8 years ago
Frederic Branczyk	8f8cea4fbd	retrieval: refactor TargetManager to return flat list of Targets	8 years ago