Commit Graph

717 Commits (f0ba860bdb320e631078370cbf9e99ec8de343e7)

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
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
Matt Bostock 78715e4182 Alerts template: remove silence table header
8 years ago
Harmen afc5873b0e don't store empty values in the URL
8 years ago
Julius Volz 3bfec97d46 Make the storage interface higher-level.
8 years ago
beorn7 1bb077b5ef Merge branch 'release-1.0' into beorn7/release
8 years ago
beorn7 4ff4857112 Recreate assets
8 years ago
Brian Brazil 56151e57ba Update example console templates to new HTTP API.
8 years ago
Brian Brazil 9e58070c04 Merge pull request #1820 from prometheus/console-api
8 years ago
Brian Brazil d458ecd4b9 Update example console templates to new HTTP API.
8 years ago
Dmitry Vorobev 273e457da4 web: return status code and error message for config resource
8 years ago
Fabian Reinartz 59d26e8536 web: add -web.route-prefix flag
9 years ago
Fabian Reinartz 62af249d06 Merge pull request #1761 from prometheus/fabxc-legacyapi
9 years ago
Fabian Reinartz 425736a377 *: remove last remainers of non-second metrics
9 years ago
Fabian Reinartz 97f62c021e api: drop legacy API
9 years ago
Brian Brazil 4dbe689632 Do our own date parsing in console template graph controls.
9 years ago
Fabian Reinartz 25135c3691 web: round last scrape timestamp to milliseconds
9 years ago
David Gstir 2dd80225a4 Fix JS XHR requests in prom_console.js on IE11
9 years ago
Julius Volz 194a486c60 Merge pull request #1660 from alileza/add_http_errorlog
9 years ago
Ali Reza 624717e801 Log HTTP server errors using common/log
9 years ago
Roman Vynar 9d616952b3
Added missed pathPrefix to Status sub-menus
9 years ago
beorn7 93460fb853 Remove a spurious "w" from `_base.html`
9 years ago
Bjoern Rabenstein 52a133d4d2 Make assets without debug settings
9 years ago
beorn7 da8cb10b43 Partition the status tab into items in a dropdown
9 years ago
Fabian Reinartz 54de6afd22 Merge pull request #1625 from prometheus/series-api-time-bounds
9 years ago
Julius Volz 0c1e7a5b00 Support time range in /api/v1/series endpoint.
9 years ago
Steve Durrheimer 399d5c6375
Make version informations consistent between prometheus components
9 years ago
Julius Volz c78bd13a2b Include date and time in graph hover detail.
9 years ago
Julius Volz c0b430b8e5 Improve before-relabeling label tooltips.
9 years ago
Jonathan Boulle 38098f8c95 Add missing license headers
9 years ago
beorn7 4b574e8a61 Switch chunk encoding to type 2 where it was hardcoded type 1 before
9 years ago
beorn7 836f1db04c Improve MetricsForLabelMatchers
9 years ago
beorn7 d77d625ad3 Merge branch 'master' into beorn7/storage6
9 years ago
Fabian Reinartz f2e359962c Sort exported targets
9 years ago
beorn7 f7fc542db6 Merge branch 'master' into beorn7/storage4
9 years ago
Fabian Reinartz 1ede7b9d72 Consolidate TargetStatus into Target.
9 years ago
beorn7 1e13f89039 Return SamplePair istead of *SamplePair consistently
9 years ago
Fabian Reinartz 37c709f917 Fix global config YAML issues
9 years ago
Fabian Reinartz 915a7c09a8 Adjust labels on status page
9 years ago
Tobias Schmidt 211cb10f13 Use https://prometheus.io
9 years ago
beorn7 a7408bfb47 Unify duration parsing
9 years ago
Julius Volz 1ae23bf5e9 Handle OPTIONS HTTP requests correctly.
9 years ago
Fabian Reinartz b0adfea8d5 Fix swapped constants, improve instrumentation
9 years ago
Fabian Reinartz 8a67110041 Revert autocomplete changes
9 years ago
Fabian Reinartz 37d80c4b25 Fix premature rule evaluation
9 years ago
Fabian Reinartz bf6abac8f4 Send resolved notifications
9 years ago
Fabian Reinartz 52e5224f5a Refactor rules/ package
9 years ago
Fabian Reinartz b35e25a082 Don't federate stale samples
9 years ago
Fabian Reinartz e0f70ed5ca Update common/{expfmt,model}
9 years ago
Fabian Reinartz 29a69eecb8 Do not panic in Consul SD creation
9 years ago
Tobias Schmidt 7a6a0630d1 Merge pull request #1213 from prometheus/fix-wrong-http-status-codes
9 years ago
Tobias Schmidt 6c49edfce2 Merge pull request #1211 from prometheus/default-time-parameter
9 years ago
Julius Volz bce5202354 Minor fixups to web/ui/README.md
9 years ago
Tobias Schmidt bf84faa010 Return HTTP server error codes for execution errors
9 years ago
Fabian Reinartz 7cbd31f7b6 Merge pull request #1212 from prometheus/uidev
9 years ago
Tobias Schmidt 50079a85a1 Make time parameter optional in v1 query API
9 years ago
Fabian Reinartz 69e6ac735e Document convenient development of UI files.
9 years ago
Sam Starling 1901875595 Tidy up .js files based on static analysis from jshint
9 years ago
Fabian Reinartz a542cc8609 Remove -web.use-local-assets
9 years ago
Fabian Reinartz 57ca7108aa Enable debug generation of go-bindata, rename blob/ to ui/
9 years ago
Fabian Reinartz 33aab4169c Anchor regexes in vector matching
9 years ago
Julius Volz a635f5451e Don't autocomplete metrics in range specifications.
9 years ago
Tobias Schmidt ee600cf949 Format web/blob/files.go after generation
9 years ago
Julius Volz c27400de21 Recompile web assets for autocomplete change.
9 years ago
Julius Volz 15c58c0f3e Enable autocomplete anywhere in expression.
9 years ago
Julius Volz 0088aa4d45 Merge pull request #1132 from prometheus/fix-quoting-and-escaping
9 years ago
Julius Volz 46c5260761 Support escape sequences in strings and add raw strings.
9 years ago
Roy Miloh 189416cb34 Remove duplicated bootstrap js on the graph template, it's already included on the base template.
9 years ago
Fabian Reinartz e3b6ec9784 Switch to common/log
9 years ago
Julius Volz 3008a35c04 HTML-escape string return values in web UI.
9 years ago
Julius Volz dac26cef71 Rename global "labels" config option to "external_labels".
9 years ago
Fabian Reinartz 398bbf906b Switch to common/route package
9 years ago
Julius Volz 0179bbfe03 Fix / -> /graph redirect when using a path prefix.
9 years ago
Björn Rabenstein cf12e890a6 Merge pull request #1098 from prometheus/fix-direct-access-of-protobuf-fields
9 years ago
beorn7 ca63c05b4e Fix creation of protobuf fields
9 years ago
Fabian Reinartz 171f50706a Fix unkeyed field errors.
9 years ago
Fabian Reinartz ac9554539c Merge pull request #1092 from prometheus/makefile
9 years ago
Fabian Reinartz 92ffeadb7b Move assets generation to top level make file
9 years ago
Fabian Reinartz d85cee0277 Remove compression from web interface
9 years ago
Fabian Reinartz f8a25f6af7 Apply HTTP handler compression everywhere
9 years ago
Fabian Reinartz 896928ad00 Fix redirect path
9 years ago
Fabian Reinartz d7b21f2fdb Merge pull request #1039 from prometheus/startpage
9 years ago
Fabian Reinartz 87b1d47e2b Change UI start page
9 years ago
Fabian Reinartz 9bbd9264e2 Add global labels to federation
9 years ago
Julius Volz da2499d5a5 Add POST handler for /debug to fix CPU profiling.
9 years ago
Julius Volz 995d3b831d Fix most golint warnings.
9 years ago
Fabian Reinartz d6b8da8d43 Switch promql types to common/model
9 years ago
Fabian Reinartz d6d88f8950 Add missing license headers
9 years ago
Fabian Reinartz 1535ef1457 Replace metric.SamplePair with model.SamplePair
9 years ago
Fabian Reinartz 438e232c9b Fix grouping of import blocks
9 years ago
Fabian Reinartz 47aa0d536c Use common/expfmt in federation
9 years ago
Fabian Reinartz 306e8468a0 Switch from client_golang/model to common/model
9 years ago
Julius Volz 274e9d6955 Exit when web server encounters a startup error
9 years ago
Julius Volz e88007306c Remove broken alert silencing links.
9 years ago
Brian Brazil eb82a4b948 web: Support multiple names for console graphs.
9 years ago
Brian Brazil a8605825a0 Rollback, meant to send a PR
9 years ago
Brian Brazil 1ad449d233 web: Support multiple names for console graphs.
9 years ago
Jan Berktold fa929a8345 Change /reload to /-/reload & and fix channel type
9 years ago
Jan Berktold 2bf7048dbb Add reload handler to web
9 years ago
Dan Williams 0441518a71 Add IDs to H2 tags to allow anchored linking
9 years ago
Julius Volz c5c7f92960 Fix /debug/pprof endpoint with new web router.
9 years ago
Fabian Reinartz 62b4e89b39 Restore legacy API scalar format
10 years ago
Brian Brazil 87b9813be4 Merge pull request #883 from brian-brazil/fix-menu
10 years ago
Brian Brazil 7b5a29fc8f web: Fix regression in .Path
10 years ago
Fabian Reinartz 9e599976c4 web/js: fix display error for vectors in console
10 years ago
Fabian Reinartz 75ba840d88 web/js: adjust Javascript to new response format
10 years ago
Fabian Reinartz 3d67d75935 promql: implement JSON array format for scalar and string
10 years ago
Fabian Reinartz 77e8983221 promql: add MarshalJSON method for SamplePair
10 years ago
Julius Volz 0f57b403a9 Add tests for "globalURL" template function.
10 years ago
Julius Volz fcff35b43e Consolidate external reachability flags into one.
10 years ago
Fabian Reinartz 8f904d6a54 api/v1: fix response format tests
10 years ago
Fabian Reinartz b36fa7ad61 api/v1: fix Content-Type in response
10 years ago
Fabian Reinartz 4db3eeb054 web: generate embedded assets.
10 years ago
Julius Volz cf2a7a7ca9 Use v1 API for querying.
10 years ago
Julius Volz 9607b8bbdb Merge pull request #840 from prometheus/fix-scrape-errors-ui
10 years ago
Julius Volz bc1c789bab Disallow cross-origin DELETE and POST requests.
10 years ago
Julius Volz c7039c3a73 Fix blown-up scrape error display in web UI.
10 years ago
Julius Volz 535a7f2640 Update web/blog/files.go with new web content.
10 years ago
Julius Volz bbc8b8490e Switch human-readable times to UTC.
10 years ago
Julius Volz d868264bb8 Improve UI of /alerts page.
10 years ago
Julius Volz d7ea0397d4 Use templates.TemplateExpander for all page templates.
10 years ago
Fabian Reinartz 53b9d5917d web: improve target URL handling and display.
10 years ago
Fabian Reinartz 39a8254963 web: add basic federation support.
10 years ago
Fabian Reinartz 1eff186555 Merge pull request #810 from prometheus/fabxc/lmatch
10 years ago
Fabian Reinartz 5b91ea9b36 storage: improve label matching and allow unset matching.
10 years ago
Fabian Reinartz 94cd321be1 promql: error if all label matchers are empty.
10 years ago
Fabian Reinartz 119801027f web: expose a version information endpoint
10 years ago
Fabian Reinartz 39edc2df7a version: move version information into separate package.
10 years ago
Fabian Reinartz 85d7c7640a web: remove flags, refactor handlers
10 years ago
Brian Brazil 27ef54263e Web: Format files.go when it is built.
10 years ago
Julius Volz b9b20fd80e Always show selected range, regardless of returned data.
10 years ago
Julius Volz 395a0b3b11 Merge pull request #799 from prometheus/multiline-expr-input
10 years ago
Julius Volz 8bb578c1fe Change expression input field to multi-line textarea.
10 years ago
Fabian Reinartz 8d304d95e5 make: do not call go-bindata on building.
10 years ago
Fabian Reinartz 70e0be6295 Merge pull request #783 from prometheus/fabxc/api-v1-ext
10 years ago
Fabian Reinartz 7bb7e565a4 web/api: add GET and DELETE /series endpoints
10 years ago
Sindre Myren a081c9436b Building without a Makefile (on Windows)
10 years ago
Fabian Reinartz 7be94ce962 web/api: improve errors, add tests
10 years ago
Fabian Reinartz 75b0b7420e web/api: replace /metrics/names with /label/:name/values endpoint.
10 years ago
Fabian Reinartz ae01a5366d Merge pull request #774 from prometheus/fabxc/api-v1
10 years ago
Fabian Reinartz 5b713911e3 web/api: enable running API legacy and v1 in parallel
10 years ago