RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-29 10:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,447 Commits 243 Branches 444 Tags 653 MiB
5bea942d8e
Commit Graph

1447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Björn Rabenstein
6f825a7eb4 Merge pull request #487 from prometheus/simplify-web-makefile 
Simplify web/blob build
 2015-01-30 10:49:26 +01:00
Tobias Schmidt
edadba3b25 Merge web/blob/Makefile into web/Makefile 
While the recent commit 7e5745f solved the issue of having an
independent blob-stamp file, which was possible to become out of
sync with the necessary web/blob/files.go file, this change further
simplifies the setup by merging the two Makefile.
The only purpose of web/Makefile was to call targets in
web/blob/Makefile. As all dependencies for blob/files.go are
outside of the blob/ directory, the separation isn't logically
necessary.
 2015-01-29 19:12:32 -05:00
Björn Rabenstein
5f27629985 Merge pull request #489 from prometheus/beorn7/get-some-todos-done 
Beorn7/get some todos done
 2015-01-29 17:00:57 +01:00
Bjoern Rabenstein
26e22e6ad6 Fix rule manager shutdown. 2015-01-29 15:05:10 +01:00
Bjoern Rabenstein
3948e2a7f8 Move lost files to an "orphaned" directory. 
Previously, those were simply deleted. The orphaned files can now be
used for forensics if needed.
 2015-01-29 14:52:12 +01:00
Bjoern Rabenstein
c24bfdf701 Move crash related code into separate file. 
persistence.go is way too long anyway, and a lot of code is just crash
recovery, which is not important to understand the normal operation.

Also, remove unused `exists` function.
 2015-01-29 13:13:16 +01:00
Bjoern Rabenstein
ab386d1f5d Declare storage.local.index-cache-size.* default values as tweaked. 2015-01-29 13:04:54 +01:00
Bjoern Rabenstein
73f6dc4d44 Make KeyValueStore.Delete report if the key to delete was found. 
Previously, it would return an error instead. Now we can distinguish
the cases 'error while deleting known key' vs. 'key not in index'
without testing for leveldb-internal kinds of errors.
 2015-01-29 12:57:50 +01:00
juliusv
4e0d2f9820 Merge pull request #486 from prometheus/docker-fix-console-path 
Set console paths correctly
 2015-01-28 19:56:12 +01:00
Johannes 'fish' Ziemke
44b5843518 Set console paths correctly 2015-01-28 19:52:32 +01:00
Björn Rabenstein
861ba15f38 Merge pull request #475 from mssola/master 
Fixed the link of the Travis build status image.
 2015-01-27 14:55:14 +01:00
Miquel Sabaté
822738e5b8 Fixed the link of the Travis build status image. 2015-01-27 14:43:46 +01:00
juliusv
f5a0f7fa18 Merge pull request #472 from prometheus/beorn7/release 
Cut release 0.10.0.
 2015-01-26 15:54:01 +01:00
Bjoern Rabenstein
a804cacc87 Also update VERSION file. 2015-01-26 15:52:34 +01:00
Bjoern Rabenstein
5ef1385ce2 Cut release 0.10.0. 2015-01-26 15:35:57 +01:00
Björn Rabenstein
855f20a4d3 Merge pull request #470 from prometheus/beorn7/slim-static-assets 
Slim down the files we embed into the binary.
 2015-01-26 15:24:15 +01:00
juliusv
50351b78f7 Merge pull request #471 from prometheus/beorn7/update-help-link 
Update help link.
 2015-01-26 15:22:45 +01:00
Bjoern Rabenstein
05ba9ab2f3 Also update prom.lib. 2015-01-26 15:21:21 +01:00
Bjoern Rabenstein
3fc354c4ce Update help link. 2015-01-26 15:18:43 +01:00
Bjoern Rabenstein
7e5745fe0e Slim down the files we embed into the binary. 
- Use only the minified versions of bootstrap.

- Do not embed non-minified bootstrap files and bootstrap map files.

- Simplify the 'blob-stamp' Makefile contraption.
 2015-01-26 15:10:27 +01:00
Björn Rabenstein
23f9279b9d Merge pull request #469 from prometheus/beorn7/persistence 
Remove check that did not check anything.
 2015-01-26 14:16:25 +01:00
Bjoern Rabenstein
2c8d324ca4 Remove check that did not check anything. 2015-01-26 13:48:24 +01:00
juliusv
34d0f99ded Merge pull request #467 from brian-brazil/more-consoles 
Fix to show graphs.
 2015-01-26 13:24:34 +01:00
juliusv
4d3a51353c Merge pull request #466 from prometheus/change-json 
More efficient JSON format.
 2015-01-26 13:13:28 +01:00
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
Brian Brazil
f2f80a7064 Fix to show graphs. 2015-01-26 10:03:13 +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