mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-05 05:04:04 -08:00
Code Issues Actions 22 Packages Projects Releases Wiki Activity
7110 commits 263 branches 434 tags 663 MiB
Commit graph

7110 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Fabian Reinartz de66e32a4d cmd/prometheus: create new main package. 2015-06-15 19:01:06 +02:00
Julius Volz f10effceb1 Update file exclusion list for make format. 2015-06-15 16:31:35 +02:00
Brian Brazil 689ef7f678 Merge pull request #803 from prometheus/relabel-scrapes 
Allow ingested metrics to be relabeled.
 2015-06-15 12:05:31 +01:00
Fabian Reinartz 5da5ea3ee2 Merge pull request #804 from prometheus/blob-fmt 
Web: Format files.go when it is built.
 2015-06-13 17:39:25 +02:00
Brian Brazil 27ef54263e Web: Format files.go when it is built. 
This will avoid unrelated changes appearing
when you do a make fmt
 2015-06-13 15:27:08 +01:00
Brian Brazil 0dbae36d36 Allow ingested metrics to be relabeled. 
The main purpose of this is to allow for blacklisting
of expensive metrics as a tactical option.
It could also find uses for renaming and removing labels
from federation.
 2015-06-13 15:18:27 +01:00
Brian Brazil 58ceae82bc Revert "Allow ingested metrics to be relabeled." 
This reverts commit f2f26ca08f.

Was accidentally pushed to master instead of a branch for PR.
 2015-06-12 22:12:26 +01:00
Brian Brazil f2f26ca08f Allow ingested metrics to be relabeled. 
The main purpose of this is to allow for blacklisting
of expensive metrics as a tactical option.
It could also find uses for renaming and removing labels
from federation.
 2015-06-12 22:06:30 +01:00
Julius Volz 5e50addc87 Merge pull request #801 from sdurrheimer/master 
Fix Dockerfile with recent embed-static.sh/go-bindata change
 2015-06-12 18:22:49 +02:00
Steve Durrheimer f61ffb4fc0 Fix Dockerfile with recent embed-static.sh/go-bindata change 2015-06-12 18:19:25 +02:00
Julius Volz 3c6c80d179 Merge pull request #800 from prometheus/pad-data-range 
Always show selected range, regardless of returned data.
 2015-06-12 18:03:44 +02:00
Julius Volz b9b20fd80e Always show selected range, regardless of returned data. 2015-06-12 17:22:06 +02:00
Julius Volz 395a0b3b11 Merge pull request #799 from prometheus/multiline-expr-input 
Change expression input field to multi-line textarea.
 2015-06-12 17:03:54 +02:00
Julius Volz 8bb578c1fe Change expression input field to multi-line textarea. 
Also, rearrange and clean up some things to make this work.
The textarea starts as a single line, but auto-expands when entering
multiple lines (e.g. via Shift+Enter). Pressing just "Enter" still
executes the expression.
 2015-06-12 16:59:38 +02:00