mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-18 11:34:05 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity
12717 commits 249 branches 440 tags 659 MiB
Commit graph

12717 commits

This branch
This branch
All branches
Author SHA1 Message Date
juliusv 0d6c958847 Merge pull request #507 from prometheus/i686-build 
Fix Go download path for i686 architecture.
 2015-02-05 16:48:18 +01:00
Julius Volz d9ff2f7edb Fix Go download path for FreeBSD. 2015-02-05 16:35:53 +01:00
Julius Volz 753113f21a Fix Go download path for x86-based architectures. 
This fixes https://github.com/prometheus/prometheus/issues/503.
 2015-02-05 16:35:48 +01:00
Julius Volz 82613527f3 Remove unnecessary float64() conversion in round(). 2015-02-05 15:14:05 +01:00
juliusv 982923f0c4 Merge pull request #502 from mmikulicic/floor_ceil 
Add floor, ceil and round functions. Closes #402
 2015-02-04 17:23:27 +01:00
Marko Mikulicic 8fdacbdf17 Add floor, ceil and round functions. Closes #402 2015-02-04 17:20:56 +01:00
juliusv 9e6b3bcefa Merge pull request #498 from fabxc/feature/query_timeout 
Implement query timeouts
 2015-02-03 13:51:47 +01:00
Fabian Reinartz fa1e90003b Query timeout added. 
This is related to #454. Queries now timeout after a duration set by
the -query.timeout flag. The TotalEvalTimer is now started/stopped
inside any of the ast.Eval* functions.
 2015-02-03 08:04:27 +01:00
juliusv 199a94b619 Merge pull request #501 from prometheus/fix-d3-version 
Fix Rickshaw/D3 version mismatch.
 2015-02-03 00:29:43 +01:00
Julius Volz b3978fe869 Fix Rickshaw/D3 version mismatch. 
When Rickshaw was updated to 1.5.1 in
fd43daf82e,
the Rickshaw upstream package now contained 3 different D3 files:

d3.min.js
d3.v2.js
d3.v3.js

For details on why that is, see
https://groups.google.com/forum/#!topic/d3-js/lXQgKA7mtEw

For the 1.5.1 Rickshaw to work properly (being able to format dates with
D3 without causing a JS error), it needs d3.v2.js or d3.v3.js, not the
d3.min.js one. I chose to update us to d3.v3.js now, since that is the
most recent and minified version, and I didn't see any problems with it
(also, the current Rickshaw examples are using that D3 version).

Currently, displaying graphs with a range >14d is broken. This fixes
that.
 2015-02-02 23:41:36 +01:00
Björn Rabenstein 63a79821fc Merge pull request #499 from prometheus/beorn7/makefile 
Improve comments about embedding.
 2015-02-02 13:37:51 +01:00
Bjoern Rabenstein f568bbc19f Improve comments about embedding. 2015-02-02 12:37:39 +01:00
juliusv 3012de7f5e Merge pull request #497 from prometheus/remove-persist-error-labels 
Remove labels on persist error counter.
 2015-02-01 14:04:21 +01:00
Julius Volz 9412b296d5 Remove labels on persist error counter. 
This fixes https://github.com/prometheus/prometheus/issues/496
 2015-02-01 14:03:34 +01:00
juliusv 522e4cdd3a Merge pull request #495 from fabxc/master 
Use https:// GOURL
 2015-01-31 23:25:11 +01:00
Fabian Reinartz bd4d04f371 Use https:// GOURL 2015-01-31 23:17:56 +01:00
Björn Rabenstein 75422f5306 Merge pull request #492 from prometheus/beorn7/makefile 
Ignore GOBIN in Makefiles.
 2015-01-31 00:40:41 +01:00
Bjoern Rabenstein 5f4acea7e9 Ignore GOBIN in Makefiles. 2015-01-30 16:52:43 +01:00
juliusv dc610f1eef Merge pull request #491 from brian-brazil/but-wait-theres-more 
Add cassandra console.
 2015-01-30 12:47:23 +01:00
Brian Brazil 7d2648804d Add cassandra console. 
Add a template for standard up/total, cpu and memory via standard exports.
 2015-01-30 11:36:14 +00:00
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