Commit Graph

517 Commits (0451d6d31be29c86d2cad7c84c2632936580a0f7)

Author SHA1 Message Date
Fabian Reinartz 06c2b76cd4 Merge branch 'master' into uptsdb
8 years ago
Julius Volz ac203ef0ee Add externalURL template function (#2716)
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)
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.
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)
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
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)
8 years ago
Alexey Palazhchenko 17f15d024a Small fixes. (#2578)
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)
8 years ago
Julius Volz 947c83be3b Sort targets by instance within a job
8 years ago
Brian Brazil 8cd5aff8fe Send instance="" with federation if instance not set.
8 years ago
Brian Brazil d42e01b07c Sort labelnames for federation.
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)
8 years ago
Fabian Reinartz de1e4322d7 Merge pull request #2474 from Gouthamve/custom-timeouts-1399
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
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)
8 years ago
Julius Volz 7e14533b32 Merge pull request #2396 from lightpriest/fuzzy-fix-lookup
8 years ago
Derek Marcotte 74a3b1051a Add rickshawGraph proerty to the Graph object. (#2438)
8 years ago
Or Cohen 93d20d2d2b Improve fuzzy search
8 years ago
Or Cohen 81d37a04aa Fix autocomplete misses certain queries
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
8 years ago
Fabian Reinartz c9f4aea8e2 Merge pull request #2305 from alicebob/favicon
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