mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-20 07:47:31 -07:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
1272 commits 211 branches 424 tags 634 MiB
Commit graph

1272 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julius Volz d4374a9265 More efficient JSON query result format. 
This depends on https://github.com/prometheus/client_golang/pull/51.

For vectors, the result format looks like this:

```json
{
   "version": 1,
   "type" : "vector",
   "value" : [
      {
         "timestamp" : 1421765411.045,
         "value" : "65.475000",
         "metric" : {
            "quantile" : "0.5",
            "instance" : "http://localhost:9090/metrics",
            "job" : "prometheus",
            "__name__" : "http_request_duration_microseconds",
            "handler" : "/static/",
            "method" : "get",
            "code" : "304"
         }
      },
      {
         "timestamp" : 1421765411.045,
         "value" : "5826.339000",
         "metric" : {
            "quantile" : "0.9",
            "instance" : "http://localhost:9090/metrics",
            "job" : "prometheus",
            "__name__" : "http_request_duration_microseconds",
            "handler" : "prometheus",
            "method" : "get",
            "code" : "200"
         }
      },
      /* ... */
   ]
}
```

For matrices, it looks like this:

```json
{
   "version": 1,
   "type" : "matrix",
   "value" : [
      {
         "metric" : {
            "quantile" : "0.99",
            "instance" : "http://localhost:9090/metrics",
            "job" : "prometheus",
            "__name__" : "http_request_duration_microseconds",
            "handler" : "/static/",
            "method" : "get",
            "code" : "200"
         },
         "values" : [
            [
               1421765547.659,
               "29162.953000"
            ],
            [
               1421765548.659,
               "29162.953000"
            ],
            [
               1421765549.659,
               "29162.953000"
            ],
            /* ... */
         ]
      }
   ]
}
```
 2015-01-26 13:06:22 +01:00
juliusv f7e3da5488 Merge pull request #468 from brian-brazil/fix-multi-graph 
Keep total counter outside out loop.
 2015-01-26 12:28:49 +01:00
Brian Brazil 2b07cd3875 Keep total counter outside out loop. 
This was causing only the last expression to be graphed.
 2015-01-26 10:51:38 +00:00
juliusv f071850e41 Merge pull request #465 from brian-brazil/more-consoles 
Add consoles for haproxy and cloudwatch.
 2015-01-25 18:00:40 +01:00
Brian Brazil e3c375b9b0 Add consoles for haproxy and cloudwatch. 
Only display jobs in the LHS if they're present.
 2015-01-25 16:56:14 +00:00
Björn Rabenstein 6181a90953 Merge pull request #464 from prometheus/beorn7/release 
Prometheus version 0.9.0.
 2015-01-23 16:21:43 +01:00
Bjoern Rabenstein 6b03b8bc56 Prometheus version 0.9.0. 2015-01-23 16:13:01 +01:00
juliusv 815503e0bb Merge pull request #461 from brian-brazil/delta-deriv 
Remove 2nd argument from delta. Add a deriv() function.
 2015-01-23 16:07:43 +01:00
Brian Brazil a31730e88b Make 2nd arg to delta optional. Add a deriv() function. 
The 2nd isCounter argument to delta is ugly, make it optional as the first step
of deprecating it. This will makes delta only ever applied to gauges.

Add a deriv function to calculate the least squares
slope of a gauge. This is more useful for prediction than delta,
as it isn't as heavily influenced by outliers at the boundaries.
 2015-01-23 14:50:27 +00:00
juliusv 01f2bc4ee7 Merge pull request #463 from prometheus/beorn7/release 
Change autogenerated protobuf code.
 2015-01-23 14:54:23 +01:00
Bjoern Rabenstein cf28c2efbb Change autogenerated protobuf code. 2015-01-23 14:44:30 +01:00
juliusv 5f5e4d76bd Merge pull request #462 from brian-brazil/godeps-format 
Exclude Godeps from make format
 2015-01-22 18:15:16 +01:00
Brian Brazil e4b4cac212 Exclude Godeps from make format 2015-01-22 17:12:19 +00:00
Bjoern Rabenstein f5d6187bba Prometheus version 0.9.0rc5. 2015-01-22 15:27:50 +01:00
juliusv 351a1eb96b Merge pull request #457 from brian-brazil/bootstrap3 
Adjust for bootstrap3. Remove long lists from LHS menu.
 2015-01-22 15:24:58 +01:00
Brian Brazil 2d8bfa0ced Adjust for bootstrap3. Remove long lists from LHS menu. 
Put in a table on the node page instead.
 2015-01-22 14:23:22 +00:00
Björn Rabenstein 727cfd7b60 Merge pull request #460 from prometheus/beorn7/license-cleanup 
Update CONTRIBUTING.md.
 2015-01-22 15:10:51 +01:00
Björn Rabenstein f541390dfb Merge pull request #459 from prometheus/beorn7/fix-deadlock 
Remove a deadlock during shutdown.
 2015-01-22 15:10:08 +01:00
Bjoern Rabenstein 87d19b94fc Update CONTRIBUTING.md. 2015-01-22 15:07:20 +01:00
Bjoern Rabenstein 2c8fdcbc23 Remove a deadlock during shutdown. 
If queries are still running when the shutdown is initiated, they will
finish _during_ the shutdown. In that case, they might request chunk
eviction upon unpinning their pinned chunks. That might completely
fill the evict request queue _after_ draining it during storage
shutdown. If that ever happens (which is the case if there are _many_
queries still running during shutdown), the affected queries will be
stuck while keeping a fingerprint locked. The checkpointing can then
not process that fingerprint (or one that shares the same lock). And
then we are deadlocked.
 2015-01-22 14:42:15 +01:00
Björn Rabenstein edc91cbabb Merge pull request #456 from prometheus/beorn7/license-cleanup 
Clean up license issues.
 2015-01-22 14:32:37 +01:00
Bjoern Rabenstein 5483521c48 Tweak AUTHORS. 2015-01-22 14:12:26 +01:00
juliusv a22968dba9 Merge pull request #458 from prometheus/fix-input-alignment-safari 
Add floats to align inputs, and clear the float on the parent.
 2015-01-22 14:01:12 +01:00
Stuart Nelson 8ada6360ef Add floats to align inputs, and clear the float on the parent. 2015-01-22 13:27:35 +01:00
Bjoern Rabenstein 5859b74f1b Clean up license issues. 
- Move CONTRIBUTORS.md to the more common AUTHORS.
- Added the required NOTICE file.
- Changed "Prometheus Team" to "The Prometheus Authors".
- Reverted the erroneous changes to the Apache License.
 2015-01-21 20:07:45 +01:00
Björn Rabenstein 39d20140c8 Merge pull request #452 from prometheus/beorn7/client_golang-adjustments 
Adjust to new client_golang API.
 2015-01-21 19:09:49 +01:00
Bjoern Rabenstein b09453af1d Adjust to new client_golang API. 2015-01-21 15:42:25 +01:00
juliusv cefa3c7900 Add build status badge to README.md title. 2015-01-20 17:21:04 +01:00
Julius Volz 4133020de1 Align graph controls with graph edge. 2015-01-20 16:43:23 +01:00
Julius Volz 25148e55c6 Prometheus version 0.9.0rc4. 2015-01-20 15:15:37 +01:00
juliusv 0b1029a7ea Merge pull request #443 from prometheus/bootstrap3 
Bootstrap3 conversion
 2015-01-19 16:20:46 +01:00
Björn Rabenstein e6a1ac8f12 Merge pull request #450 from prometheus/beorn7/double-start-protection 
Add double-start protection.
 2015-01-19 14:32:46 +01:00
Bjoern Rabenstein f298af5756 Use named returns in flock.New. 2015-01-19 14:31:16 +01:00
Julius Volz 12a99ab5b4 Some more UI/JS fixes/cleanups. 2015-01-19 14:27:07 +01:00
Julius Volz 013c22ca01 Adjust input group margins for more equal spacing. 2015-01-19 14:15:37 +01:00
juliusv ebcd32c04e Merge pull request #448 from prometheus/rework-dockerfile 
Rework dockerfile
 2015-01-19 13:58:47 +01:00
Julius Volz 170da9460d Focus/typeahead fix. 2015-01-19 13:33:56 +01:00
Julius Volz d96d4933d9 Complete Bootstrap 3 conversion. 
- use the autocomplete plugin from
  https://github.com/bassjobsen/Bootstrap-3-Typeahead
- use native Bootstrap tabs
- make everything look much nicer (hopefully)
- other minor fixes/additions
 2015-01-19 01:29:30 +01:00
Johannes 'fish' Ziemke 8a7289ce55 Use golang base image and not make 
Instead of using make to install all dependencies, this uses the golang
base image. This way those common base layers can be shared across other
golang based images.
This also stops using the Makefile to install the dependencies because
we would have to install all dependencies everytime something changes.

Change-Id: I5e143cc4ec3e5c9027ec4912be12297e704ffff5
 2015-01-14 17:54:08 +01:00
Bjoern Rabenstein baca6faa1c Add double-start protection. 
This mimics the locking leveldb is performing anyway. Advantages of
doing it separately:

- Should we ever replace the leveldb implementation by one without
  double-start protection, we are still good.

- In contrast to leveldb, the new code creates a meaningful error
  message.
 2015-01-14 17:13:42 +01:00
Julius Volz ff5eeb49fa Fix datepicker timezone issues. 2015-01-14 15:09:58 +01:00
Björn Rabenstein 7ca29308e6 Merge pull request #449 from prometheus/beorn7/fix-partitioning-by-outcome 
Adjust the partitioning by outcome.
 2015-01-13 18:48:54 +01:00
Bjoern Rabenstein 3b4e5e8be6 Improve help string. 2015-01-13 18:47:51 +01:00
Bjoern Rabenstein ae70eac97d Adjust the partitioning by outcome. 2015-01-13 18:34:56 +01:00
Stuart Nelson 97ad5d3d1b Update jquery and jquery-ui. 2015-01-12 16:37:25 +01:00
Stuart Nelson 5cd8030c37 Include bootstrap.js.min 2015-01-12 16:37:13 +01:00
Johannes 'fish' Ziemke 7b8fd9c7a5 Read version from VERSION file 
Change-Id: Idfbe2dbe6cb8cd90c6c728dca7d10ff580c7b9d6
 2015-01-12 15:05:36 +01:00
Stuart Nelson 8d7581d8c4 Add datetimepicker css. 2015-01-12 14:26:09 +01:00
Stuart Nelson 0529e3fcfa Use datetimepicker. 2015-01-12 14:18:28 +01:00
juliusv e0a90d3da5 Merge pull request #446 from prometheus/fix-dockerfile 
Installing gcc as rule_checker and procfs dependency
 2015-01-11 22:31:45 +01:00