Commit Graph

756 Commits (8cac9cbe1d70246c684b43ba870593d2f28d7ac2)

Author SHA1 Message Date
David Kaltschmidt af75ce02c1 Review feedback
7 years ago
David Kaltschmidt c93e54d240 Adds execution timer stats to the range query
7 years ago
Krasi Georgiev e2f4850fea Refactor main.go with oklog/pkg/group actors pattern
7 years ago
Alexey Miroshkin 8c681f4a6c Provide POST endpoint for query+query_range (#3322)
7 years ago
Julius Volz 8022fc1aa3
Fix display of raw target labels (again) (#3437)
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)
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
7 years ago
BasPH a91d3bcb83 Add UI warning for time drift >30 seconds (#3276)
7 years ago
Fabian Reinartz 269b5cf936 Merge pull request #3245 from jlevesy/use-require-web
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)
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
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
7 years ago
Julius Volz f7e8348a88 Re-add contexts to storage.Storage.Querier() (#3230)
7 years ago
Goutham Veeramachaneni d70f850a18
web/api: Fix typo which broke the 2.0 admin APIs.
7 years ago
Tom Wilkie 639d5c6f98 Merge pull request #3023 from tomwilkie/2945-remote-read-server
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
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.
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
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
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
7 years ago
Mark Adams 77c816b309 Fix pprof endpoints when -web.route-prefix or -web.external-url is used (#3054)
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
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
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
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
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)
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
7 years ago
Goutham Veeramachaneni e1fc9dc78d Move /rules to new format (#2901)
7 years ago
Alin Sinpalean 38de290d5f Console graph color scheme support (#2900)
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)
8 years ago
Goutham Veeramachaneni 37e7b69f56
Merge remote-tracking branch 'upstream/dev-2.0' into rulegroups
8 years ago
Goutham Veeramachaneni 67dc73fd59
Flag changes for 2.0
8 years ago
Goutham Veeramachaneni d407bd150c Consolidate the duration params in CLI
8 years ago
Goutham Veeramachaneni 5ff283a7b7
Reflect the grouping in the UI
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)
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.
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)
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
Fabian Reinartz f8fc1f5bb2 *: migrate ingestion to new batch Appender
8 years ago
Ed Schouten b3a39ccd8a Use lexicographic order to sort alerts by name.
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)
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
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
8 years ago
Fabian Reinartz 9d68e81b32 web: don't return federation errors over HTTP
8 years ago
Erdem Agaoglu e487477a17 LimitListener to limit max number of connections
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
Erdem Agaoglu 9986b28380 Set read-timeout for http.Server
8 years ago
Fabian Reinartz d4deb8bbf2 web: show discovered Alertmanagers in UI
8 years ago
Martín Ferrari 4298d91a9c Update bindata.go
8 years ago
Martín Ferrari fe83ea511f Replace handlebars with the simpler and saner mustache library.
8 years ago
Martín Ferrari 0a6972b6a3 Replace datetimepicker library with a more maintained version.
8 years ago
Brian Brazil 79f8514c9c Point user to POST if they try to GET /-/reload (#2172)
8 years ago
Fabian Reinartz 30af47535d Merge remote-tracking branch 'origin/release-1.2'
8 years ago
Anders Daljord Morken 5c025a2f41 query_range: Validate that start comes before end
8 years ago
beorn7 5b16d6bd6e Merge branch 'release-1.2'
8 years ago
beorn7 f0acde7721 Regenerate assets after cherry-pick
8 years ago
Stuart Olivera 223a22457f ui: don’t consider aborted requests complete
8 years ago
beorn7 569a1d78eb Regenerate bindata after merge
8 years ago
beorn7 7e4d005ee1 Merge branch 'release-1.2'
8 years ago
tattsun 68e20bd9ac ISSUE-2109 ui: fix decode query params bug
8 years ago
Or Cohen 50f8e35c54 Add fuzzy search to /graph textarea (#2081)
8 years ago
Fabian Reinartz 630b96c5f3 Merge pull request #2079 from prometheus/fabxc-storage
8 years ago
Fabian Reinartz 8fa18d564a storage: enhance Querier interface usage
8 years ago
Stuart Olivera b76d59e68b ui: don’t consider aborted requests complete
8 years ago
Matthias Rampke 4f96d28e60 Always show instance label on target page. (#2062)
8 years ago
Julius Volz 4f79072fd1 Update common/route vendoring for contextFn errors
8 years ago
Julius Volz f92532f254 api: Consolidate web API contexts
8 years ago
Julius Volz c187308366 storage: Contextify storage interfaces.
8 years ago
Julius Volz ed5a0f0abe promql: Allow per-query contexts.
8 years ago
Bora Tunca 2e9de70267 generate assets
8 years ago
Bora Tunca 44377dc458 Add backward compatibility to old query format
8 years ago
beorn7 1f2785ebb7 Merge branch 'release-1.1'
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
beorn7 39c4915401 federation: Collapse time series of the same name
8 years ago
beorn7 094a098ce6 Revert "Revert the /graph changes."
8 years ago
beorn7 aa43d34a86 Revert the /graph changes.
8 years ago
Anders Daljord Morken e9885ecb94 Bugfix: Avoid divide-by-zero panic on query_range?step=0
8 years ago
Fabian Reinartz df22684b5b web/ui: fix job link
8 years ago
Fabian Reinartz cfe5c5fa15 Merge branch 'master' of https://github.com/cambridge-university-press/prometheus into cambridge-university-press-master
8 years ago
Bora Tunca 12bcc92311 Generate bindata.go
8 years ago
Bora Tunca 445fac56e0 Refactor graph.js
8 years ago
Bora Tunca 3e18d86d8a Use query parameters in the url
8 years ago
Bora Tunca 3da825fc76 Point to correct place for GraphLinkForExpression
8 years ago
Julius Volz d770783777 Neurotic cleanups to graph.js
8 years ago
Fabian Reinartz 70490fe568 Merge pull request #1805 from prometheus/higher-level-storage-interface
8 years ago
Harmen 7b4a67f651 make assets build
8 years ago
Harmen 0b883e24ba Add a 'Remove Graph' link to the 'Graph' screen
8 years ago
Andrew Hemming 7ebcd678ea Added HTML link for each job name
8 years ago
Tobias Schmidt 5416518178 Fix go fmt of ui/bindata.go
8 years ago
Harmen a1443280b4 make assets build
8 years ago
Harmen 512b3f8d95 Friendlier message when there are no alerting rules
8 years ago