mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-17 11:04:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
10024 commits 248 branches 440 tags 658 MiB
Commit graph

10024 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julius Volz 9d7fa930ce Merge pull request #831 from prometheus/fix-time-utc 
Switch human-readable times to UTC.
 2015-06-23 21:26:56 +02:00
Julius Volz bbc8b8490e Switch human-readable times to UTC. 
This fixes https://github.com/prometheus/prometheus/issues/829
 2015-06-23 21:26:05 +02:00
Fabian Reinartz 7ec15956e4 config: show original input on String() 2015-06-23 19:40:44 +02:00
Julius Volz cc18191b5e Merge pull request #826 from prometheus/alerting-ui-improvements 
Use TemplateExpander for main pages, improve alerting UI
 2015-06-23 19:03:14 +02:00
Julius Volz d868264bb8 Improve UI of /alerts page. 
Changes to the UI:
- "Active Since" timestamps are now human-readable.
- Alerting rules are now pretty-printed better.
- Labels are no longer just strings, but alert bubbles (like we do on
  the status page for base labels).
- Alert states and target health states are now capitalized in the
  presentation layer rather than at the source.
 2015-06-23 18:48:45 +02:00
Fabian Reinartz 23e77450ff main: cleanup initialization of remote storage. 2015-06-23 18:24:48 +02:00
Julius Volz d7ea0397d4 Use templates.TemplateExpander for all page templates. 
This will allow us to use all of our shiny templating functions in the
main page templates as well.
 2015-06-23 17:53:06 +02:00
Björn Rabenstein 7d0850571d Merge pull request #825 from prometheus/beorn7/doc 
Minor doc fixes.
 2015-06-23 17:07:48 +02:00
beorn7 8c196c1028 Minor doc fixes. 2015-06-23 17:07:18 +02:00
Fabian Reinartz e18bc94980 Merge pull request #786 from prometheus/fabxc/federate 
web: add basic federation support
 2015-06-23 14:17:28 +02:00
Fabian Reinartz 53b9d5917d web: improve target URL handling and display. 2015-06-23 13:45:15 +02:00
Fabian Reinartz 6bfb4549a6 storage: add LastSamplePairForFingerprint method 2015-06-23 13:45:15 +02:00
Fabian Reinartz 39a8254963 web: add basic federation support. 
This commit adds a federation handler on /federate. It accepts `match[]`
query parameters containing vector selectors. Their intersection determines
the in-memory metrics that are returned in the same way as the
/metrics endpoint does (modulo sorting).
 2015-06-23 13:45:15 +02:00
Fabian Reinartz dc7d27ab9a retrieval: add honor label handling and parametrized querying. 
This commit adds the honor_labels and params arguments to the scrape
config. This allows to specify query parameters used by the scrapers
and handling scraped labels with precedence.
 2015-06-23 13:45:14 +02:00
Fabian Reinartz 37dea6a251 Merge pull request #824 from prometheus/fabxc/gitignore 
git: ignore promtool, be less strict about config files.
 2015-06-23 12:08:15 +02:00
Fabian Reinartz 6885ec8ef9 git: ignore promtool, be less strict about config files. 2015-06-23 11:53:00 +02:00
Fabian Reinartz 07347aa1d9 Merge pull request #823 from prometheus/fabxc/rdme 
general README update
 2015-06-23 08:37:49 +02:00
Fabian Reinartz 024139be00 readme: remove tools that are no longer required 2015-06-23 00:40:44 +02:00
Björn Rabenstein 618a9d15f2 Merge pull request #821 from prometheus/beorn7/fix 
Increment dirty counter only if setDirty(true) is called.
 2015-06-22 18:19:28 +02:00
beorn7 9016917d1c Increment dirty counter only if setDirty(true) is called. 
Currently, we increment the counter even if setDirty(false) is called,
which sets the storage clean.
 2015-06-22 18:12:55 +02:00
Fabian Reinartz ccbc801d19 Merge pull request #816 from prometheus/fabxc/promctl 
Create promtool command
 2015-06-22 16:40:09 +02:00
Fabian Reinartz d27e45cc74 make: add promtool to build and tarball targets. 2015-06-22 16:09:37 +02:00
Fabian Reinartz 890c1a7e74 cmd/promtool: add promtool command. 
The promtool command should bundle multiple commands that help
in maintaining a running Prometheus server.
 2015-06-22 16:06:18 +02:00
Fabian Reinartz 1eff186555 Merge pull request #810 from prometheus/fabxc/lmatch 
Match empty labels.
 2015-06-22 15:45:50 +02:00
Fabian Reinartz 5b91ea9b36 storage: improve label matching and allow unset matching. 
Matching of empty labels now also matches metrics where the label
was not explicitly set to the empty string.
 2015-06-22 15:33:44 +02:00
Fabian Reinartz 46df1fd5ea storage/local: add benchmark for label matching. 2015-06-22 15:33:44 +02:00
Fabian Reinartz 94cd321be1 promql: error if all label matchers are empty. 2015-06-22 15:33:44 +02:00
Julius Volz 6d99e3b3f7 Merge pull request #819 from sdurrheimer/master 
Fix Dockerfile with the recent changes
 2015-06-21 20:29:50 +02:00
Steve Durrheimer 166365f4f0 Fix Dockerfile with the recent changes 2015-06-21 19:53:09 +02:00
Fabian Reinartz 1b5ceb570a util/cli: create CLI utility package 2015-06-18 21:28:03 +02:00
Julius Volz 3ef44a9c9e Merge pull request #817 from prometheus/fix-consoles-link-to-prometheus-root 
Fix consoles "Prometheus" link to point to /
 2015-06-18 19:27:16 +02:00
Johannes 'fish' Ziemke 4d1711804a Fix consoles "Prometheus" link to point to / 2015-06-18 19:25:19 +02:00
Julius Volz b4dfbf89a8 Merge pull request #815 from prometheus/fabxc/fix-date 
cmd/prometheus: fix version output
 2015-06-18 13:54:57 +02:00
Fabian Reinartz f97db8d4e5 cmd/prometheus: fix version output 2015-06-18 12:53:00 +02:00
Fabian Reinartz 459d18cf18 Merge pull request #812 from Marmelatze/consul_services 
Use Consul ServiceAddress instead of Address when set
 2015-06-17 20:10:52 +02:00
Florian Pfitzer 0ac7e7217e Use Consul ServiceAddress instead of Address when set 2015-06-17 15:39:42 +02:00
Fabian Reinartz 2bf7e1ac98 Merge pull request #811 from prometheus/fabxc/version 
Move version info to its own package and add version endpoint.
 2015-06-17 14:58:39 +02:00
Fabian Reinartz 119801027f web: expose a version information endpoint 2015-06-17 14:49:31 +02:00
Brian Brazil a79cffcc44 Merge pull request #784 from brian-brazil/serverset 
Add basic support for Zookeeper Serversets for SD
 2015-06-17 10:54:16 +01:00
Fabian Reinartz 39edc2df7a version: move version information into separate package. 
Version information is determined at build-time and thus there is
no need to pass it down from main. In its own package it can
be used from various other packages.
 2015-06-16 14:48:29 +02:00
Brian Brazil 4d895242f9 Add support for Zookeeper Serversets for SD. 
It can discover an entire tree of serversets, or just one.
 2015-06-16 11:02:08 +01:00
Julius Volz 95bd64c770 Merge pull request #806 from metcalfc/fix_609 
Handle building without git.
 2015-06-15 21:38:05 +02:00
Chad Metcalf af52579189 Handle building without git. 
Resolves #609 by removing two dependencies on git.
  - Use the Makefile to find the current directory.
  - In the case of building from an archive fall back to fixed REV
and BRANCH values.
 2015-06-15 12:21:29 -07:00
Fabian Reinartz 330ed7b9f2 Merge pull request #809 from prometheus/update-make-format 
Update file exclusion list for `make format`.
 2015-06-15 21:04:28 +02:00
Fabian Reinartz 7b302f1a59 Merge pull request #808 from prometheus/fabxc/ref-main 
refactor main, flag handling, and web package
 2015-06-15 19:01:47 +02:00
Fabian Reinartz 31325c1fd0 make: adjust to new main location. 2015-06-15 19:01:06 +02:00
Fabian Reinartz 85d7c7640a web: remove flags, refactor handlers 2015-06-15 19:01:06 +02:00
Fabian Reinartz a0b3aaa551 notification: remove flags 2015-06-15 19:01:06 +02:00
Fabian Reinartz b105e26f4d storage: remove global flags 2015-06-15 19:01:06 +02:00
Fabian Reinartz fe301d7946 promql: remove global flags 2015-06-15 19:01:06 +02:00