mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-21 08:17:36 -07:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
624 commits 210 branches 425 tags 635 MiB
Commit graph

624 commits

This branch
This branch
All branches
Author SHA1 Message Date
juliusv f817106d6a Merge pull request #134 from prometheus/fix/set-job-label-from-targets-api 
Set job label for targets registered through the API
 2013-04-12 07:28:27 -07:00
juliusv f89d4c2cac Merge pull request #128 from prometheus/feature/convert-host-relative-links 
Convert addresses pointing to localhost in status.
 2013-04-12 07:27:30 -07:00
Johannes 'fish' Ziemke 14407a076a Convert addresses pointing to localhost in status. 
Until now, targets pointing to localhost in the status view are linked to localhost, so you can't follow those links by clicking on them.
This change converts the links to point to the hostname of the prometheus server.

Before:
<a href="http://localhost:9090/metrics.json">http://localhost:9090/metrics.json</a>

After:
<a href="http://hostname-of-prometheus-server:9090/metrics.json">http://localhost:9090/metrics.json</a>
 2013-04-12 15:14:04 +02:00
Bernerd Schaefer 8af0bbb3a0 Set job label for targets registered through the API 
This is set when jobs are statically registered (see
retrieval/targetmanager.go#L92), and should be set here, too.
 2013-04-12 14:50:44 +02:00
Bernerd Schaefer 442a6d2b11 Use $ instead of jQuery 2013-04-12 13:43:53 +02:00
Bernerd Schaefer 953334a4f7 Reformat and add semicolons to graph.js 2013-04-12 13:41:53 +02:00
juliusv 63ac59d2d3 Merge pull request #131 from bernerdschaefer/cross-origin-metrics 
Set CORS Headers on API requests
 2013-04-12 03:07:30 -07:00
Bernerd Schaefer 43dc377bee Flip x_label when it would render off-page 2013-04-12 11:59:49 +02:00
Bernerd Schaefer 461e02d2b8 Flip hover detail to prevent going off the screen 2013-04-12 10:39:37 +02:00
Bernerd Schaefer 8c9597cb39 Render legend in a similar style to labels 2013-04-12 10:39:15 +02:00
Bernerd Schaefer a7ec43189a Hovering over legend items highlights series in graph 2013-04-12 09:34:12 +02:00
Bernerd Schaefer 564633ecbc Render graph labels vertically 
This helps to make the timeseries with many labels fit on the screen.
 2013-04-12 09:34:12 +02:00
juliusv 926d03d2bd Merge pull request #124 from prometheus/julius-lowercase-ops 
Also allow lower-cased aggregation ops.
 2013-04-11 09:31:24 -07:00
Julius Volz 1bc83e1b65 Also allow lower-cased aggregation ops. 2013-04-11 18:25:22 +02:00
Matt T. Proud 2d70e75c52 Merge pull request #132 from prometheus/julius-leveldb-sorting 
Make LevelDB sample keys fixed-length to ensure correct sort-order.
 2013-04-11 09:25:02 -07:00
Julius Volz fd554e8b89 Make LevelDB sample keys fixed-length to ensure correct sort-order. 2013-04-11 18:17:44 +02:00
juliusv f9c291120f Merge pull request #123 from prometheus/julius-propagate-rule-errors 
Propagate more errors during rule evaluation.
 2013-04-11 06:38:33 -07:00
Bernerd Schaefer 5e9447996b Set CORS Headers on API requests 
By setting Access-Control headers, the Prometheus metrics API can be
accessed by cross-origin javascript applications (e.g., an external
dashboard pulling Prometheus metrics).
 2013-04-11 14:51:42 +02:00
juliusv 2310f549dd Merge pull request #130 from prometheus/julius-threadsafe-parser 
Make expression parser goroutine-safe.
 2013-04-10 16:37:20 -07:00
Julius Volz 9a81b9838f Make expression parser goroutine-safe. 
See https://github.com/prometheus/prometheus/issues/127
 2013-04-10 19:17:28 +02:00
juliusv dd4f326680 Merge pull request #126 from prometheus/julius-sort-functions 
Add sort() and sort_desc() expression language functions.
 2013-04-10 09:47:00 -07:00
Julius Volz 6cb3c51d24 Add sort() and sort_desc() expression language functions. 2013-04-10 18:05:45 +02:00
Johannes 'fish' Ziemke 8fba639706 Fix path to expression browser js. 2013-04-10 13:09:32 +02:00
Johannes 'fish' Ziemke adeabca230 Minor UI fixes. 
- Fix path to spinner
- Fix color for unvisited links
- Include necessary jqueryui images
 2013-04-09 15:23:37 +02:00
Johannes 'fish' Ziemke 08e37f48dd Merge pull request #122 from prometheus/feature/make-self-contained 
Feature/make self contained
 2013-04-09 05:11:30 -07:00
Julius Volz c4d0969c00 Propagate more errors during rule evaluation. 2013-04-09 13:47:20 +02:00
Johannes 'fish' Ziemke 8417d3e8d1 Add MANIFEST listing 3rd party libs and versions. 2013-04-09 13:31:56 +02:00
Johannes 'fish' Ziemke e43d7d5771 Make Prometheus self-contained. 
This includes all external resources instead of hotlinking them.
 2013-04-09 12:15:05 +02:00
Johannes 'fish' Ziemke 17f622bd6e Take Path fragment from URL instead of whole URL. 
This also makes better error handling in case a asset couldn't be found in the files map.
 2013-04-09 12:12:24 +02:00
Johannes 'fish' Ziemke bf197baaf9 Depend on all static and template files. 2013-04-09 12:11:19 +02:00
Matt T. Proud 6146116e2f Merge pull request #115 from prometheus/fix/storage/nil-behaviors 
Validate diskFrontier domain for series candidate.
 2013-04-09 03:08:29 -07:00
Matt T. Proud a55602df4a Validate diskFrontier domain for series candidate. 
It is the case with the benchmark tool that we thought that we
generated multiple series and saved them to the disk as such, when
in reality, we overwrote the fields of the outgoing metrics via
Go map reference behavior.  This was accidental.  In the course of
diagnosing this, a few errors were found:

1. ``newSeriesFrontier`` should check to see if the candidate fingerprint is within the given domain of the ``diskFrontier``.  If not, as the contract in the docstring stipulates, a ``nil`` ``seriesFrontier`` should be emitted.

2. In the interests of aiding debugging, the raw LevelDB ``levigoIterator`` type now includes a helpful forensics ``String()`` method.

This work produced additional cleanups:

1. ``Close() error`` with the storage stack is technically incorrect, since nowhere in the bowels of it does an error actually occur.  The interface has been simplified to remove this for now.
 2013-04-09 11:47:16 +02:00
juliusv e254c0bc33 Merge pull request #121 from prometheus/julius-fix-fingerprint-comparison 
Fix fingerprint construction and comparison bugs
 2013-04-09 02:44:13 -07:00
Julius Volz ebe05d1b83 Fix logic bug in fingerprint Less() comparison. 
Seems like just using String() is the easiest way of doing this.
 2013-04-09 11:43:12 +02:00
Julius Volz 0230dbf305 Fix off-by-one bug in NewFingerprintFromMetric(). 2013-04-09 02:36:38 +02:00
Johannes 'fish' Ziemke ca2a31c48b Merge pull request #118 from prometheus/feature/navigation 
Add navigation bar to web ui
 2013-04-05 05:17:06 -07:00
Johannes 'fish' Ziemke c108a9978d Merge branch 'master' of github.com:prometheus/prometheus into feature/navigation 
Conflicts:
	web/web.go
 2013-04-05 14:16:33 +02:00
Matt T. Proud d79c932a8e Merge pull request #120 from prometheus/feature/storage/compaction 
Spin up curator run in the tests.
 2013-04-05 04:55:59 -07:00
Matt T. Proud c3e3460ca6 Spin up curator run in the tests. 
After this commit, we'll need to add validations that it does the
desired work, which we presently know that it doesn't.  Given the
changes I made with a plethora of renamings, I want to commit this
now before it gets even larger.
 2013-04-05 13:55:11 +02:00
Johannes 'fish' Ziemke 0f775a4178 Use Sprintf instead of string concatenation. 2013-04-05 13:41:52 +02:00
Johannes 'fish' Ziemke 1c091a9723 Use client_golang.exp for automatic telemetry. 2013-04-05 13:24:50 +02:00
Johannes 'fish' Ziemke 3aead8468c Fix typo. 2013-04-04 19:19:58 +02:00
Johannes 'fish' Ziemke 84d17b4d97 Replace YieldExporter() with Handler() 2013-04-04 19:08:20 +02:00
Johannes 'fish' Ziemke 1cb4c819e1 Remove cruft. 2013-04-04 19:02:29 +02:00
Johannes 'fish' Ziemke 1a3fb459e0 Add navigation menu to all pages + change routes. 
To achieve that, this PR
- converts static/index.html ("console") and graph to templates
- moved the handlebars template to separated file to avoid escaping issues

Route changes:
/status -> /
/static -> /console
/static/graph.html -> /graph
 2013-04-04 16:36:53 +02:00
Matt T. Proud 461da0b3a8 Merge pull request #117 from prometheus/feature/storage/compaction 
Spin up storage layers for made fixtures.
 2013-04-03 04:41:52 -07:00
Matt T. Proud d0ad6cbeaa Spin up storage layers for made fixtures. 2013-04-03 12:09:05 +02:00
Matt T. Proud 25fa3af0e4 Merge pull request #116 from prometheus/refactor/dependencies/update-client-api 
Update to use new default handler.
 2013-04-02 06:58:23 -07:00
Matt T. Proud 7764682c7c Update to use new default handler. 2013-04-02 15:20:30 +02:00
Matt T. Proud 2116c7ff8c Merge pull request #112 from prometheus/julius-allow-oneletter-metrics 
Allow single-letter identifiers (metric and label names).
 2013-03-28 10:39:40 -07:00